diff options
author | Wolfgang Denk <wd@denx.de> | 2008-12-16 17:16:34 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-12-16 17:16:34 +0100 |
commit | 7f202217356f19e519e6ec57a29de9af73067037 (patch) | |
tree | 1c3fe822cc37bf4df09ac9ece94c8a71ab9a25d0 /board/xilinx/ppc405-generic/u-boot-rom.lds | |
parent | 6cdadcb3f1b6eac4a1c4256acaa1438413f95351 (diff) | |
parent | 584eedab66d0828f2d571a24b10526c4e65f547b (diff) | |
download | u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.zip u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.gz u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.bz2 |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'board/xilinx/ppc405-generic/u-boot-rom.lds')
-rw-r--r-- | board/xilinx/ppc405-generic/u-boot-rom.lds | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/xilinx/ppc405-generic/u-boot-rom.lds b/board/xilinx/ppc405-generic/u-boot-rom.lds index d2bac9f..d094006 100644 --- a/board/xilinx/ppc405-generic/u-boot-rom.lds +++ b/board/xilinx/ppc405-generic/u-boot-rom.lds @@ -137,7 +137,7 @@ SECTIONS *(COMMON) } - ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your confguration: CFG_MONITOR_BASE, CFG_MONITOR_LEN and TEXT_BASE may need to be modified."); + ppcenv_assert = ASSERT(. < 0xFFFFB000, ".bss section too big, overlaps .ppcenv section. Please update your configuration: CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_LEN and TEXT_BASE may need to be modified."); _end = . ; PROVIDE (end = .); |