diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-06 01:15:17 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-06 01:15:17 +0200 |
| commit | d86a0a6f7fe433787edf06aecba9fd6abfecab48 (patch) | |
| tree | 005ba8a000e7bdcab42c1df6339bf7e51dcda2ca /board/apollon/mem.h | |
| parent | a524e112b424c6843800ea2f19d3a8cf01d0aa94 (diff) | |
| parent | f492dd636fbbae529e17533995bc6e5813c007f6 (diff) | |
| download | u-boot-d86a0a6f7fe433787edf06aecba9fd6abfecab48.zip u-boot-d86a0a6f7fe433787edf06aecba9fd6abfecab48.tar.gz u-boot-d86a0a6f7fe433787edf06aecba9fd6abfecab48.tar.bz2 | |
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Conflicts:
board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/exbitgen/flash.c
board/ml2/serial.c
board/xilinx/ml300/serial.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/apollon/mem.h')
| -rw-r--r-- | board/apollon/mem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/apollon/mem.h b/board/apollon/mem.h index 5bc96fa..d4636f4 100644 --- a/board/apollon/mem.h +++ b/board/apollon/mem.h @@ -67,7 +67,7 @@ # define APOLLON_24XX_GPMC_CONFIG7_0 (0x00000e40|(APOLLON_CS0_BASE >> 24)) /* CS1: Ethernet */ -# define APOLLON_24XX_GPMC_CONFIG1_1 0x00011200 +# define APOLLON_24XX_GPMC_CONFIG1_1 0x00011203 # define APOLLON_24XX_GPMC_CONFIG2_1 0x001F1F01 # define APOLLON_24XX_GPMC_CONFIG3_1 0x00080803 # define APOLLON_24XX_GPMC_CONFIG4_1 0x1C0b1C0a |