diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-01-21 18:38:51 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-01-21 18:38:51 -0600 |
| commit | be4880ebe4355e8782be4af4b337a1b98dffcbe3 (patch) | |
| tree | 8b699181073305221b95f338a2d9107ab1bbfa3f /board/xilinx/ppc405-generic/u-boot-rom.lds | |
| parent | 633639587e3596f0dbf5e6247dd3faf80b1d9063 (diff) | |
| parent | 72d15e705bc3983884105cb7755c7ba80e74a0a5 (diff) | |
| download | u-boot-imx-be4880ebe4355e8782be4af4b337a1b98dffcbe3.zip u-boot-imx-be4880ebe4355e8782be4af4b337a1b98dffcbe3.tar.gz u-boot-imx-be4880ebe4355e8782be4af4b337a1b98dffcbe3.tar.bz2 | |
Merge branch 'master' into next
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 = .); |