summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-04-13 19:43:25 +1000
committerGraeme Russ <graeme.russ@gmail.com>2011-04-13 19:43:25 +1000
commite413554f9df28b383eeb8e8e5de35848b15d74aa (patch)
tree6f86b15ba0caf2689fcca93ba6d56b6c279f783e /arch
parentec8016c856af29de2f2ca6c3692929423673bf66 (diff)
downloadblackbird-obmc-uboot-e413554f9df28b383eeb8e8e5de35848b15d74aa.tar.gz
blackbird-obmc-uboot-e413554f9df28b383eeb8e8e5de35848b15d74aa.zip
eNET: Remove config.mk
By including <config.h> in the ld script, CONFIG_SYS_MONITOR_LEN (defined in the boards config file) can be used in lieu of FLASH_SIZE (defined in the board specific config.mk) As this is the last remaining entry in the board specific config.mk, this file can now be removed Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/cpu/u-boot.lds5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/i386/cpu/u-boot.lds b/arch/i386/cpu/u-boot.lds
index 98a548d62e..55974228b5 100644
--- a/arch/i386/cpu/u-boot.lds
+++ b/arch/i386/cpu/u-boot.lds
@@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
+#include <config.h>
OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
OUTPUT_ARCH(i386)
ENTRY(_start)
@@ -89,8 +90,8 @@ SECTIONS
* Reset Vector at the end of the Flash ROM
*/
. = START_16;
- .start16 : AT (CONFIG_SYS_TEXT_BASE + (FLASH_SIZE - RESET_SEG_SIZE + START_16)) { KEEP(*(.start16)); }
+ .start16 : AT (CONFIG_SYS_TEXT_BASE + (CONFIG_SYS_MONITOR_LEN - RESET_SEG_SIZE + START_16)) { KEEP(*(.start16)); }
. = RESET_VEC_LOC;
- .resetvec : AT (CONFIG_SYS_TEXT_BASE + (FLASH_SIZE - RESET_SEG_SIZE + RESET_VEC_LOC)) { KEEP(*(.resetvec)); }
+ .resetvec : AT (CONFIG_SYS_TEXT_BASE + (CONFIG_SYS_MONITOR_LEN - RESET_SEG_SIZE + RESET_VEC_LOC)) { KEEP(*(.resetvec)); }
}
OpenPOWER on IntegriCloud