diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 07:18:01 (GMT) |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /doc/README.cmi | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'doc/README.cmi')
| -rw-r--r-- | doc/README.cmi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/README.cmi b/doc/README.cmi index 884854d..0edd50a 100644 --- a/doc/README.cmi +++ b/doc/README.cmi @@ -35,17 +35,17 @@ Memory Map: Memory Map after relocation: - 0x0000 0000 CFG_SDRAM_BASE + 0x0000 0000 CONFIG_SYS_SDRAM_BASE : 0x000F 9FFF : : - 0x0100 0000 CFG_IMMR (Internal memory map base adress) + 0x0100 0000 CONFIG_SYS_IMMR (Internal memory map base adress) : 0x0130 7FFF : : - 0x0200 0000 CFG_FLASH_BASE + 0x0200 0000 CONFIG_SYS_FLASH_BASE : 0x027C FFFF : |