diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-18 23:43:37 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-18 23:48:15 +0200 |
| commit | c8d76eaf606096eddbe62b8a86545f5116f5189c (patch) | |
| tree | a38043189a96b391d421d83aa875eac662d3f01f /include | |
| parent | 1ba91ba23396005ef7b42381cc21f0baf78d0d60 (diff) | |
| download | talos-obmc-uboot-c8d76eaf606096eddbe62b8a86545f5116f5189c.tar.gz talos-obmc-uboot-c8d76eaf606096eddbe62b8a86545f5116f5189c.zip | |
Rename TEXT_BASE: fix merge conflicts
Commit 14d0a02a "Rename TEXT_BASE into CONFIG_SYS_TEXT_BASE" missed a
few places, especially for boards that were added inbetween. Fix the
remaining issues.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/a4m072.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index 6dcebe6f44..24a04ebefb 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -37,6 +37,8 @@ #define CONFIG_A4M072 1 /* ... on A4M072 board */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_MISC_INIT_R #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ @@ -125,7 +127,7 @@ #define CONFIG_CMD_PCI #endif -#if (TEXT_BASE == 0xFE000000) /* Boot low with 32 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFE000000) /* Boot low with 32 MB Flash */ #define CONFIG_SYS_LOWBOOT 1 #define CONFIG_SYS_LOWBOOT32 1 #endif @@ -238,7 +240,7 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) # define CONFIG_SYS_RAMBOOT 1 #endif |
