diff options
author | Wolfgang Denk <wd@denx.de> | 2010-10-07 21:51:12 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-10-18 22:07:10 +0200 |
commit | 14d0a02a168b36e87665b8d7f42fa3e88263d26d (patch) | |
tree | 576843229c10eb3e8836dc40a12d3f6f0c26a3ce /arch/microblaze | |
parent | d24f2d321d8e78e990d100000d8efc4845c78b1c (diff) | |
download | u-boot-imx-14d0a02a168b36e87665b8d7f42fa3e88263d26d.zip u-boot-imx-14d0a02a168b36e87665b8d7f42fa3e88263d26d.tar.gz u-boot-imx-14d0a02a168b36e87665b8d7f42fa3e88263d26d.tar.bz2 |
Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE
The change is currently needed to be able to remove the board
configuration scripting from the top level Makefile and replace it by
a simple, table driven script.
Moving this configuration setting into the "CONFIG_*" name space is
also desirable because it is needed if we ever should move forward to
a Kconfig driven configuration system.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/cpu/start.S | 4 | ||||
-rw-r--r-- | arch/microblaze/lib/board.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index 7f60434..98c248f 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -69,10 +69,10 @@ _start: shi r7, r0, 0x2 shi r6, r0, 0x6 /* - * Copy U-Boot code to TEXT_BASE + * Copy U-Boot code to CONFIG_SYS_TEXT_BASE * solve problem with sbrk_base */ -#if (CONFIG_SYS_RESET_ADDRESS != TEXT_BASE) +#if (CONFIG_SYS_RESET_ADDRESS != CONFIG_SYS_TEXT_BASE) addi r4, r0, __end addi r5, r0, __text_start rsub r4, r5, r4 /* size = __end - __text_start */ diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index 0ce040e..84267cd 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -122,7 +122,7 @@ void board_init (void) puts ("SDRAM :\n"); printf ("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF"); printf ("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF"); - printf ("\tU-Boot Start:0x%08x\n", TEXT_BASE); + printf ("\tU-Boot Start:0x%08x\n", CONFIG_SYS_TEXT_BASE); #if defined(CONFIG_CMD_FLASH) puts ("FLASH: "); |