diff options
Diffstat (limited to 'include')
348 files changed, 1323 insertions, 768 deletions
diff --git a/include/configs/A3000.h b/include/configs/A3000.h index 6d8870c..ffc58af 100644 --- a/include/configs/A3000.h +++ b/include/configs/A3000.h @@ -45,6 +45,7 @@ #define CONFIG_MPC8245 1 #define CONFIG_A3000 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 9600 @@ -135,7 +136,7 @@ #define CONFIG_SYS_EUMB_ADDR 0xFC000000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ @@ -170,7 +171,7 @@ * Definitions for initial stack pointer and data area */ -/* #define CONFIG_SYS_MONITOR_BASE TEXT_BASE */ +/* #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE */ /*#define CONFIG_SYS_GBL_DATA_SIZE 256*/ #define CONFIG_SYS_GBL_DATA_SIZE 128 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h index d8303f3..263dab2 100644 --- a/include/configs/ADCIOP.h +++ b/include/configs/ADCIOP.h @@ -36,6 +36,8 @@ #define CONFIG_IOP480 1 /* This is a IOP480 CPU */ #define CONFIG_ADCIOP 1 /* ...on a ADCIOP board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFD0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ diff --git a/include/configs/ADS860.h b/include/configs/ADS860.h index 688e77a..82ea172 100644 --- a/include/configs/ADS860.h +++ b/include/configs/ADS860.h @@ -20,6 +20,8 @@ /* Processor type */ #define CONFIG_MPC860 1 +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h index 6e2907e..095c7f0 100644 --- a/include/configs/AMX860.h +++ b/include/configs/AMX860.h @@ -36,6 +36,8 @@ #define CONFIG_MPC860 1 #define CONFIG_AMX860 1 +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #undef CONFIG_8xx_CONS_SMC1 /* Console is on SCC2 */ #undef CONFIG_8xx_CONS_SMC2 #define CONFIG_8xx_CONS_SCC2 1 diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index e707075..a8edafa 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -27,6 +27,13 @@ #define CONFIG_AP1000 1 /* ...on an AP1000 board */ +/* + * Start at bottom of RAM, but at an aliased address so that it looks + * like it's not in RAM. This is a bit of voodoo to allow it to be + * run from RAM instead of Flash. + */ +#define CONFIG_SYS_TEXT_BASE 0x08000000 + #define CONFIG_PCI 1 #define CONFIG_SYS_HUSH_PARSER 1 /* use "hush" command parser */ @@ -141,7 +148,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0x20000000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 * 1024) /* Reserve 196 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/APC405.h b/include/configs/APC405.h index cb3f80b..8179e1b 100644 --- a/include/configs/APC405.h +++ b/include/configs/APC405.h @@ -38,6 +38,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_APCG405 1 /* ...on a APC405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_BOARD_EARLY_INIT_R 1 #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/AR405.h b/include/configs/AR405.h index 568ce15..0725e6f 100644 --- a/include/configs/AR405.h +++ b/include/configs/AR405.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_AR405 1 /* ...on a AR405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_SYS_CLK_FREQ 33000000 /* external frequency to pll */ @@ -182,8 +184,8 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_MONITOR_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ /* diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h index 789f750..c8b9613 100644 --- a/include/configs/ASH405.h +++ b/include/configs/ASH405.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_ASH405 1 /* ...on a ASH405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h index 58f0c1f..b544a47 100644 --- a/include/configs/ATUM8548.h +++ b/include/configs/ATUM8548.h @@ -47,6 +47,10 @@ #define CONFIG_MPC85xx 1 /* MPC8540/60/55/41/48 */ #define CONFIG_MPC8548 1 /* MPC8548 specific */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xfff80000 +#endif + #define CONFIG_PCI 1 /* enable any pci type devices */ #define CONFIG_PCI1 1 /* PCI controller 1 */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ @@ -173,7 +177,7 @@ #define CONFIG_SYS_FLASH_WRITE_TOUT 8000 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER 1 #define CONFIG_SYS_FLASH_CFI 1 diff --git a/include/configs/Adder.h b/include/configs/Adder.h index e4d30a1..4d7c517 100644 --- a/include/configs/Adder.h +++ b/include/configs/Adder.h @@ -32,6 +32,8 @@ #define CONFIG_ADDER /* Analogue&Micro Adder board */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_BAUDRATE 38400 @@ -130,7 +132,7 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 KB for Monitor */ #ifdef CONFIG_BZIP2 #define CONFIG_SYS_MALLOC_LEN (2500 << 10) /* Reserve ~2.5 MB for malloc() */ diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h index 85b68be..7fba1b3 100644 --- a/include/configs/Alaska8220.h +++ b/include/configs/Alaska8220.h @@ -31,6 +31,8 @@ #define CONFIG_MPC8220 1 #define CONFIG_ALASKA8220 1 /* ... on Alaska board */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BAT_RW 1 /* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1 /* High BATs supported */ @@ -253,7 +255,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 diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h index 555145e..0cfd5d9 100644 --- a/include/configs/BAB7xx.h +++ b/include/configs/BAB7xx.h @@ -35,6 +35,8 @@ * (easy to change) */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + /* these hardware addresses are pretty bogus, please change them to suit your needs */ diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 44befe9..4fbcb7d 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -56,6 +56,16 @@ #define CONFIG_BC3450_FP 1 /* + enable FP O/P */ #undef CONFIG_BC3450_CRT /* + enable CRT O/P (Debug only!) */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFC000000 boot low (standard configuration with room for + * max 64 MByte Flash ROM) + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFC000000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -207,7 +217,7 @@ #define CONFIG_TIMESTAMP /* display image timestamps */ -#if (TEXT_BASE == 0xFC000000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFC000000) /* Boot low */ # define CONFIG_SYS_LOWBOOT 1 #endif @@ -324,7 +334,7 @@ /* * Flash configuration */ -#define CONFIG_SYS_FLASH_BASE TEXT_BASE /* 0xFC000000 */ +#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE /* 0xFC000000 */ /* use CFI flash driver if no module variant is spezified */ #define CONFIG_SYS_FLASH_CFI 1 /* Flash is CFI conformant */ @@ -386,7 +396,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 diff --git a/include/configs/BMW.h b/include/configs/BMW.h index 98f6396..134ad1f 100644 --- a/include/configs/BMW.h +++ b/include/configs/BMW.h @@ -45,6 +45,8 @@ #define CONFIG_MPC8245 1 #define CONFIG_BMW 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */ #define CONFIG_BCM570x 1 /* Use Broadcom BCM570x Ethernet Driver */ @@ -124,7 +126,7 @@ #define CONFIG_SYS_EUMB_ADDR 0xFC000000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (2048 << 10) /* Reserve 2MB for malloc() */ diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h index ad075b8..9d75616 100644 --- a/include/configs/CANBT.h +++ b/include/configs/CANBT.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_CANBT 1 /* ...on a CANBT board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_SYS_CLK_FREQ 25000000 /* external frequency to pll */ @@ -127,8 +129,8 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_MONITOR_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ /* diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index 764f71b..81f6391 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -75,6 +75,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_PPCHAMELEONEVB 1 /* ...on a PPChameleonEVB board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFB0000 /* Reserve 320 kB for Monitor */ + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h index 9c57acb..6438b72 100644 --- a/include/configs/CMS700.h +++ b/include/configs/CMS700.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_VOM405 1 /* ...on a VOM405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC8000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ @@ -207,8 +209,8 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_MONITOR_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (256 * 1024) #if (CONFIG_SYS_MONITOR_BASE < FLASH_BASE0_PRELIM) diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h index 6451263..f750500 100644 --- a/include/configs/CPC45.h +++ b/include/configs/CPC45.h @@ -45,6 +45,7 @@ #define CONFIG_MPC8245 1 #define CONFIG_CPC45 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 9600 @@ -126,7 +127,7 @@ #define CONFIG_SYS_EUMB_ADDR 0xFCE00000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index c6882fd..ba875ec 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -36,6 +36,8 @@ #define CONFIG_405GP 1 /* This is a PPC405 CPU */ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */ diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index da57b04..4a47c7a 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_CPCI405 1 /* ...on a CPCI405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ @@ -204,9 +206,9 @@ * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0 */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_FLASH_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ /* diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index d682d37..be3742f 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -39,6 +39,8 @@ #define CONFIG_CPCI405_VER2 1 /* ...version 2 */ #undef CONFIG_CPCI405_6U /* enable this for 6U boards */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h index 1c521f2..3e1b482 100644 --- a/include/configs/CPCI405AB.h +++ b/include/configs/CPCI405AB.h @@ -39,6 +39,8 @@ #define CONFIG_CPCI405_VER2 1 /* ...version 2 */ #define CONFIG_CPCI405AB 1 /* ...and special AB version */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h index c7b7931..342bcc3 100644 --- a/include/configs/CPCI405DT.h +++ b/include/configs/CPCI405DT.h @@ -38,6 +38,8 @@ #define CONFIG_CPCI405 1 /* ...on a CPCI405 board */ #define CONFIG_CPCI405_VER2 1 /* ...version 2 */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h index f2d51f7..68a27e6 100644 --- a/include/configs/CPCI750.h +++ b/include/configs/CPCI750.h @@ -57,6 +57,8 @@ #define CONFIG_CPCI750 1 /* this is an CPCI750 board */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BAUDRATE 9600 /* console baudrate = 9600 */ #define CONFIG_MV64360_ECC /* enable ECC support */ diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h index f114290..0f11a75 100644 --- a/include/configs/CPCIISER4.h +++ b/include/configs/CPCIISER4.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_CPCIISER4 1 /* ...on a CPCIISER4 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_SYS_CLK_FREQ 25000000 /* external frequency to pll */ diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h index 6d76d9f..3aa35c3 100644 --- a/include/configs/CPU86.h +++ b/include/configs/CPU86.h @@ -37,6 +37,12 @@ #define CONFIG_CPU86 1 /* ...on a CPU86 board */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#ifdef CONFIG_BOOT_ROM +#define CONFIG_SYS_TEXT_BASE 0xFF800000 +#else +#define CONFIG_SYS_TEXT_BASE 0xFF000000 +#endif + /* * select serial console configuration * @@ -304,7 +310,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_MAX_SIZE 0x08000000 /* max. 128 MB */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h index 83b010c..82b6411 100644 --- a/include/configs/CPU87.h +++ b/include/configs/CPU87.h @@ -38,6 +38,12 @@ #define CONFIG_PCI #define CONFIG_CPM2 1 /* Has a CPM2 */ +#ifdef CONFIG_BOOT_ROM +#define CONFIG_SYS_TEXT_BASE 0xFF800000 +#else +#define CONFIG_SYS_TEXT_BASE 0xFF000000 +#endif + /* * select serial console configuration * @@ -319,7 +325,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_MAX_SIZE 0x08000000 /* max. 128 MB */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index f6cd760..77b6a15 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -36,6 +36,13 @@ #define CONFIG_405GP 1 /* This is a PPC405 CPU */ #define CONFIG_4xx 1 /* ...member of PPC405 family */ + +/* + * Note: I make an "image" from U-Boot itself, which prefixes 0x40 + * bytes of header info, hence start address is thus shifted. + */ +#define CONFIG_SYS_TEXT_BASE 0xFFFD0040 + #define CONFIG_SYS_CLK_FREQ 25000000 #define CONFIG_BAUDRATE 9600 #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ @@ -159,7 +166,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFFC00000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 * 1024) /* Reserve 192 kB for Monitor */ diff --git a/include/configs/CU824.h b/include/configs/CU824.h index 4a3f2bc..4a7d870 100644 --- a/include/configs/CU824.h +++ b/include/configs/CU824.h @@ -45,6 +45,7 @@ #define CONFIG_MPC8240 1 #define CONFIG_CU824 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 9600 @@ -114,7 +115,7 @@ #define CONFIG_SYS_EUMB_ADDR 0xFCE00000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h index 21230e1..7ace011 100644 --- a/include/configs/DASA_SIM.h +++ b/include/configs/DASA_SIM.h @@ -36,6 +36,8 @@ #define CONFIG_IOP480 1 /* This is a IOP480 CPU */ #define CONFIG_DASA_SIM 1 /* ...on a DASA_SIM board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h index 910933a..3a20d02 100644 --- a/include/configs/DB64360.h +++ b/include/configs/DB64360.h @@ -120,6 +120,8 @@ if we use PCI it has its own MAC addr */ #define CONFIG_DB64360 1 /* this is an DB64360 board */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BAUDRATE 115200 /* console baudrate = 115000 */ /*ronen - we don't use the global CONFIG_ECC, since in the global ecc we initialize the DRAM for ECC in the phase we are relocating to it, which isn't so sufficient. diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h index 765eaaf..ef5277e 100644 --- a/include/configs/DB64460.h +++ b/include/configs/DB64460.h @@ -58,6 +58,8 @@ #define CONFIG_DB64460 1 /* this is an DB64460 board */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BAUDRATE 115200 /* console baudrate = 115000 */ /*ronen - we don't use the global CONFIG_ECC, since in the global ecc we initialize the DRAM for ECC in the phase we are relocating to it, which isn't so sufficient. diff --git a/include/configs/DP405.h b/include/configs/DP405.h index 5311dfb..3cdf3e8 100644 --- a/include/configs/DP405.h +++ b/include/configs/DP405.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_DP405 1 /* ...on a DP405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFD0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ @@ -157,8 +159,8 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_MONITOR_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (256 * 1024) #if (CONFIG_SYS_MONITOR_BASE < FLASH_BASE0_PRELIM) diff --git a/include/configs/DU405.h b/include/configs/DU405.h index 6ba9f13..d6c9f4b 100644 --- a/include/configs/DU405.h +++ b/include/configs/DU405.h @@ -36,6 +36,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_DU405 1 /* ...on a DU405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFD0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/DU440.h b/include/configs/DU440.h index 9c34994..baa54b4 100644 --- a/include/configs/DU440.h +++ b/include/configs/DU440.h @@ -37,6 +37,10 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_SYS_CLK_FREQ 33333400 /* external freq to pll */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 +#endif + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ #define CONFIG_LAST_STAGE_INIT 1 /* last_stage_init */ @@ -51,7 +55,7 @@ #define CONFIG_SYS_BOOT_BASE_ADDR 0xf0000000 #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */ #define CONFIG_SYS_FLASH_BASE 0xfc000000 /* start of FLASH */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND0_ADDR 0xd0000000 /* NAND Flash */ #define CONFIG_SYS_NAND1_ADDR 0xd0100000 /* NAND Flash */ #define CONFIG_SYS_OCM_BASE 0xe0010000 /* ocm */ diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h index 880cb4e..af57fb9 100644 --- a/include/configs/EB+MCF-EV123.h +++ b/include/configs/EB+MCF-EV123.h @@ -173,10 +173,10 @@ /* If M5282 port is fully implemented the monitor base will be behind * the vector table. */ -#if (TEXT_BASE != CONFIG_SYS_INT_FLASH_BASE) -#define CONFIG_SYS_MONITOR_BASE (TEXT_BASE + 0x400) +#if (CONFIG_SYS_TEXT_BASE != CONFIG_SYS_INT_FLASH_BASE) +#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400) #else -#define CONFIG_SYS_MONITOR_BASE (TEXT_BASE + 0x418) /* 24 Byte for CFM-Config */ +#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x418) /* 24 Byte for CFM-Config */ #endif #define CONFIG_SYS_MONITOR_LEN 0x20000 diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h index 84d27b6..1650e65 100644 --- a/include/configs/ELPPC.h +++ b/include/configs/ELPPC.h @@ -35,6 +35,8 @@ * (easy to change) */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + /* these hardware addresses are pretty bogus, please change them to suit your needs */ diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h index 0f56302..99d0eb1 100644 --- a/include/configs/ELPT860.h +++ b/include/configs/ELPT860.h @@ -47,6 +47,8 @@ #define CONFIG_MPC860T 1 #define CONFIG_ELPT860 1 /* ...on a LEOX's ELPT860 CPU board */ +#define CONFIG_SYS_TEXT_BASE 0x02000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h index e1c6096..6204229 100644 --- a/include/configs/EP88x.h +++ b/include/configs/EP88x.h @@ -30,6 +30,8 @@ #define CONFIG_EP88X /* Embedded Planet EP88x board */ +#define CONFIG_SYS_TEXT_BASE 0xFC000000 + #define CONFIG_BOARD_EARLY_INIT_F /* Call board_early_init_f */ /* Allow serial number (serial#) and MAC address (ethaddr) to be overwritten */ @@ -125,7 +127,7 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 KB for Monitor */ #ifdef CONFIG_BZIP2 #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve ~4 MB for malloc() */ diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h index da3b4ae..094db45 100644 --- a/include/configs/ERIC.h +++ b/include/configs/ERIC.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_ERIC 1 /* ...on a ERIC board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* run board_early_init_f() */ #define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */ diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h index 11a862e..1f0d2bb 100644 --- a/include/configs/ESTEEM192E.h +++ b/include/configs/ESTEEM192E.h @@ -36,6 +36,8 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_ESTEEM192E 1 /* ...on a EST ESTEEM192E */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_FLASH_16BIT 1 /* Rom 16 bit data bus */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h index c36f2bb1..366df3a 100644 --- a/include/configs/ETX094.h +++ b/include/configs/ETX094.h @@ -36,6 +36,8 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_ETX094 1 /* ...on a ETX_094 board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h index 0903536..ebc36bb 100644 --- a/include/configs/EVB64260.h +++ b/include/configs/EVB64260.h @@ -42,6 +42,8 @@ #define CONFIG_EVB64260 1 /* this is an EVB64260 board */ #define CONFIG_SYS_GT_6426x GT_64260 /* with a 64260 system controller */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BAUDRATE 38400 /* console baudrate = 38400 */ #undef CONFIG_ECC /* enable ECC support */ diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h index 4d08243..880a7a8 100644 --- a/include/configs/EXBITGEN.h +++ b/include/configs/EXBITGEN.h @@ -165,7 +165,7 @@ #define CONFIG_SYS_FLASH1_SIZE 0x02000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH0_BASE #define CONFIG_SYS_FLASH_SIZE CONFIG_SYS_FLASH0_SIZE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 * 1024) /* Reserve 196 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h index cb75960..0b7aee2 100644 --- a/include/configs/FADS823.h +++ b/include/configs/FADS823.h @@ -38,6 +38,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_ETHADDR 08:00:22:50:70:63 /* Ethernet address */ #define CONFIG_ENV_OVERWRITE 1 /* Overwrite the environment */ diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h index 84187fb..c2c9093 100644 --- a/include/configs/FADS850SAR.h +++ b/include/configs/FADS850SAR.h @@ -34,6 +34,8 @@ #define CONFIG_MPC850SAR 1 #define CONFIG_FADS 1 +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/FADS860T.h b/include/configs/FADS860T.h index dcb0c39..ed7484b 100644 --- a/include/configs/FADS860T.h +++ b/include/configs/FADS860T.h @@ -20,6 +20,8 @@ /* processor type */ #define CONFIG_MPC860T 1 /* 860T */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h index 0f4277c..4f526b7 100644 --- a/include/configs/FLAGADM.h +++ b/include/configs/FLAGADM.h @@ -37,6 +37,8 @@ #define CONFIG_FLAGADM 1 /* ...on a FLAGA DM */ #define CONFIG_8xx_GCLK_FREQ 48000000 /*48MHz*/ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #undef CONFIG_8xx_CONS_SMC1 /* Console is on SMC1 */ #define CONFIG_8xx_CONS_SMC2 1 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index addca2f..ac0c48e 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -36,6 +36,8 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_FPS850L 1 /* ...on a FingerPrint Sensor */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index ec9000d..ffb40e0 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -36,6 +36,8 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_FPS860L 1 /* ...on a FingerPrint Sensor */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/G2000.h b/include/configs/G2000.h index e2e6cb2..2865b84 100644 --- a/include/configs/G2000.h +++ b/include/configs/G2000.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_G2000 1 /* ...on a PLU405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h index 12f879a..a2b934f 100644 --- a/include/configs/GEN860T.h +++ b/include/configs/GEN860T.h @@ -35,6 +35,8 @@ #define CONFIG_MPC860 #define CONFIG_GEN860T +#define CONFIG_SYS_TEXT_BASE 0x40000000 + /* * Identify the board */ diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h index fadd830..4faafe5 100644 --- a/include/configs/GENIETV.h +++ b/include/configs/GENIETV.h @@ -38,6 +38,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_TEXT_BASE 0x00000000 + #define CONFIG_ETHADDR 08:00:22:50:70:63 /* Ethernet address */ #define CONFIG_ENV_OVERWRITE 1 /* Overwrite the environment */ diff --git a/include/configs/HH405.h b/include/configs/HH405.h index 0db9298..661db2b 100644 --- a/include/configs/HH405.h +++ b/include/configs/HH405.h @@ -43,6 +43,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_HH405 1 /* ...on a HH405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ @@ -311,7 +313,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFFF80000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (4 << 20) /* Reserve 4 MB for malloc() */ diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h index 251fe67..ac6a455 100644 --- a/include/configs/HIDDEN_DRAGON.h +++ b/include/configs/HIDDEN_DRAGON.h @@ -42,6 +42,8 @@ #define CONFIG_MPC8245 1 #define CONFIG_HIDDEN_DRAGON 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #if 0 #define USE_DINK32 1 #else @@ -131,7 +133,7 @@ #else #undef CONFIG_SYS_RAMBOOT #define CONFIG_SYS_MONITOR_LEN 0x00030000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_GBL_DATA_SIZE 128 diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h index 5dea96e..b7a8dae 100644 --- a/include/configs/HUB405.h +++ b/include/configs/HUB405.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_HUB405 1 /* ...on a HUB405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h index ea1e706..54e8a72 100644 --- a/include/configs/IAD210.h +++ b/include/configs/IAD210.h @@ -44,6 +44,8 @@ #define CONFIG_MPC860T 1 #define CONFIG_MPC862 1 +#define CONFIG_SYS_TEXT_BASE 0x08000000 + #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #undef CONFIG_8xx_CONS_SMC1 diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h index 917135e..635f916 100644 --- a/include/configs/ICU862.h +++ b/include/configs/ICU862.h @@ -39,6 +39,8 @@ #define CONFIG_ICU862 1 #define CONFIG_MPC862 1 +#define CONFIG_SYS_TEXT_BASE 0x40F00000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE @@ -210,7 +212,7 @@ #else #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #endif -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN (256 << 10) /* Reserve 256 kB for malloc() */ /* diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h index 4e73941..a3a79e8 100644 --- a/include/configs/IDS8247.h +++ b/include/configs/IDS8247.h @@ -39,6 +39,8 @@ #define CPU_ID_STR "MPC8247" #define CONFIG_CPM2 1 /* Has a CPM2 */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_BOOTCOUNT_LIMIT @@ -229,7 +231,7 @@ #define CONFIG_SYS_FLASH_BANKS_LIST { 0xFF800000 } #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/ids8247/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/ids8247/config.mk * The main FLASH is whichever is connected to *CS0. */ #define CONFIG_SYS_FLASH0_BASE 0xFFF00000 @@ -305,7 +307,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH0_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ diff --git a/include/configs/IP860.h b/include/configs/IP860.h index ed6b7fd..eef1d6b 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -35,6 +35,9 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_IP860 1 /* ...on a IP860 board */ + +#define CONFIG_SYS_TEXT_BASE 0x10000000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */ diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h index 3cb6cf7..88ef4bb 100644 --- a/include/configs/IPHASE4539.h +++ b/include/configs/IPHASE4539.h @@ -38,6 +38,8 @@ #define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */ #define CONFIG_IPHASE4539 1 /* ...on a Interphase 4539 PMC */ +#define CONFIG_SYS_TEXT_BASE 0xffb00000 + #define CONFIG_CPM2 1 /* Has a CPM2 */ /*----------------------------------------------------------------------- @@ -193,7 +195,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFF800000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h index c0b1d86..bcd7348 100644 --- a/include/configs/ISPAN.h +++ b/include/configs/ISPAN.h @@ -33,6 +33,8 @@ #define CONFIG_ISPAN /* ...on one of Interphase iSPAN boards */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#define CONFIG_SYS_TEXT_BASE 0xFE7A0000 + /*----------------------------------------------------------------------- * Select serial console configuration * @@ -171,7 +173,7 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */ #ifdef CONFIG_BZIP2 #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */ diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h index 1a4924e..5cc8e9a 100644 --- a/include/configs/IVML24.h +++ b/include/configs/IVML24.h @@ -36,6 +36,8 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_IVML24 1 /* ...on a IVML24 board */ +#define CONFIG_SYS_TEXT_BASE 0xFF000000 + #if defined (CONFIG_IVML24_16M) # define CONFIG_IDENT_STRING " IVML24" #elif defined (CONFIG_IVML24_32M) diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h index 256cabd..ed73b57 100644 --- a/include/configs/IVMS8.h +++ b/include/configs/IVMS8.h @@ -36,6 +36,8 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_IVMS8 1 /* ...on a IVMS8 board */ +#define CONFIG_SYS_TEXT_BASE 0xFF000000 + #if defined (CONFIG_IVMS8_16M) # define CONFIG_IDENT_STRING " IVMS8" #elif defined (CONFIG_IVMS8_32M) diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 3961100..327b0bb 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -33,6 +33,17 @@ #define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */ #define CONFIG_ICECUBE 1 /* ... on IceCube board */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFFF00000 boot high (standard configuration) + * 0xFF000000 boot low for 16 MiB boards + * 0xFF800000 boot low for 8 MiB boards + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -122,11 +133,11 @@ #endif -#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ # define CONFIG_SYS_LOWBOOT 1 # define CONFIG_SYS_LOWBOOT16 1 #endif -#if (TEXT_BASE == 0xFF800000) /* Boot low with 8 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF800000) /* Boot low with 8 MB Flash */ #if defined(CONFIG_LITE5200B) # error CONFIG_SYS_LOWBOOT08 is incompatible with the Lite5200B #else @@ -274,7 +285,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 diff --git a/include/configs/JSE.h b/include/configs/JSE.h index b0b1175..6971158 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -37,7 +37,7 @@ /* JSE has a PPC405GPr */ #define CONFIG_405GP 1 /* ... which is a 4xxx series */ -#define CONFIG_4xx 1 +#define CONFIG_4x 1 /* ... with a 33MHz OSC. connected to the SysCLK input */ #define CONFIG_SYS_CLK_FREQ 33333333 /* ... with on-chip memory here (4KBytes) */ @@ -46,6 +46,8 @@ /* Do not set up locked dcache as init ram. */ #undef CONFIG_SYS_INIT_DCACHE_CS +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + /* Map the SystemACE chip (CS#1) here. (Must be a multiple of 1Meg) */ #define CONFIG_SYSTEMACE 1 #define CONFIG_SYS_SYSTEMACE_BASE 0xf0000000 diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 94cc317..5b6da4f 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -43,6 +43,9 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ #define CONFIG_MISC_INIT_F 1 /* Call board misc_init_f */ #define CONFIG_MISC_INIT_R 1 /* Call board misc_init_r */ + +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + #undef CONFIG_SYS_DRAM_TEST /* Disable-takes long time!*/ #define CONFIG_SYS_CLK_FREQ 66666666 /* external freq to pll */ diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index c6978c3..b5f48b1 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -38,6 +38,8 @@ #define CONFIG_MPC855 1 /* This is a MPC855 CPU */ #define CONFIG_KUP4K 1 /* ...on a KUP4K module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index ab535e1..7fea5f7 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -38,6 +38,8 @@ #define CONFIG_MPC859T 1 /* This is a MPC859T CPU */ #define CONFIG_KUP4X 1 /* ...on a KUP4X module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h index 6e8a4b8..d10958d 100644 --- a/include/configs/LANTEC.h +++ b/include/configs/LANTEC.h @@ -40,6 +40,8 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_LANTEC 2 /* ...on a Lantec rev.2 board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + /* * Port assignments (CONFIG_LANTEC == 1): * - SMC1: J11 (MDB) ? diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 6c6b5d6..887bd63 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -232,7 +232,7 @@ #define CONFIG_SYS_MEMTEST_END ((CONFIG_SYS_SDRAM_SIZE - 3) << 20) #ifdef CONFIG_CF_SBF -# define CONFIG_SYS_MONITOR_BASE (TEXT_BASE + 0x400) +# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400) #else # define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) #endif diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 6e0aa14..46f60bf 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -172,10 +172,10 @@ /* If M5282 port is fully implemented the monitor base will be behind * the vector table. */ -#if (TEXT_BASE != CONFIG_SYS_INT_FLASH_BASE) +#if (CONFIG_SYS_TEXT_BASE != CONFIG_SYS_INT_FLASH_BASE) #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) #else -#define CONFIG_SYS_MONITOR_BASE (TEXT_BASE + 0x418) /* 24 Byte for CFM-Config */ +#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x418) /* 24 Byte for CFM-Config */ #endif #define CONFIG_SYS_MONITOR_LEN 0x20000 diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index a80d330..1ff80ee 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -245,7 +245,7 @@ #define CONFIG_SYS_MEMTEST_END ((CONFIG_SYS_SDRAM_SIZE - 3) << 20) #ifdef CONFIG_CF_SBF -# define CONFIG_SYS_MONITOR_BASE (TEXT_BASE + 0x400) +# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400) #else # define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) #endif diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 5b4bba8..1cdc373 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -305,7 +305,7 @@ #define CONFIG_SYS_MEMTEST_END ((CONFIG_SYS_SDRAM_SIZE - 3) << 20) #ifdef CONFIG_CF_SBF -# define CONFIG_SYS_MONITOR_BASE (TEXT_BASE + 0x400) +# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400) #else # define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) #endif diff --git a/include/configs/MBX.h b/include/configs/MBX.h index 5f7c7a8..7cda287 100644 --- a/include/configs/MBX.h +++ b/include/configs/MBX.h @@ -46,6 +46,8 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_MBX 1 /* ...on an MBX module */ +#define CONFIG_SYS_TEXT_BASE 0xfe000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h index afe2383..aed1729 100644 --- a/include/configs/MBX860T.h +++ b/include/configs/MBX860T.h @@ -28,6 +28,8 @@ #define CONFIG_MPC860T 1 #define CONFIG_MBX 1 +#define CONFIG_SYS_TEXT_BASE 0xfe000000 + #define CONFIG_8xx_CPUCLOCK 40 #define CONFIG_8xx_BUSCLOCK (CONFIG_8xx_CPUCLOCK) #define TARGET_SYSTEM_FREQUENCY 40 diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index 2e63306..04ae4f8 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -109,6 +109,9 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ #define CONFIG_MISC_INIT_F 1 /* Call board misc_init_f */ #define CONFIG_MISC_INIT_R 1 /* Call board misc_init_r */ + +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + #undef CONFIG_SYS_DRAM_TEST /* Disable-takes long time!*/ #define CONFIG_SYS_CLK_FREQ 66666666 /* external freq to pll */ diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h index 19a288c..7ad2712 100644 --- a/include/configs/MHPC.h +++ b/include/configs/MHPC.h @@ -43,6 +43,8 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 /* do special hardware init. */ #define CONFIG_MISC_INIT_R 1 +#define CONFIG_SYS_TEXT_BASE 0xfe000000 + #define CONFIG_8xx_GCLK_FREQ MPC8XX_SPEED #undef CONFIG_8xx_CONS_SMC1 #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index bfff750..a097639 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -35,6 +35,9 @@ #define CONFIG_405GP 1 /* This is a PPC405 CPU */ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_MIP405 1 /* ...on a MIP405 board */ + +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + /*********************************************************** * Note that it may also be a MIP405T board which is a subset of the * MIP405 diff --git a/include/configs/ML2.h b/include/configs/ML2.h index 2fc0119..8f56902 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -30,6 +30,7 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_ML2 1 /* ...on a ML2 board */ +#define CONFIG_SYS_TEXT_BASE 0x18000000 #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h index 986590a..9dccd24 100644 --- a/include/configs/MOUSSE.h +++ b/include/configs/MOUSSE.h @@ -48,7 +48,11 @@ #define CONFIG_MPC824X 1 #define CONFIG_MPC8240 1 #define CONFIG_MOUSSE 1 + +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_SYS_ADDR_MAP_B 1 + #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 9600 #if 1 diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index ffd37fd..fd7ef90 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -48,12 +48,16 @@ #define CONFIG_MPC8260ADS 1 /* Motorola PQ2 ADS family board */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 /* Standard: boot high */ +#endif + #define CONFIG_CPM2 1 /* Has a CPM2 */ /* * Figure out if we are booting low via flash HRCW or high via the BCSR. */ -#if (TEXT_BASE != 0xFFF00000) /* Boot low (flash HRCW) */ +#if (CONFIG_SYS_TEXT_BASE != 0xFFF00000) /* Boot low (flash HRCW) */ # define CONFIG_SYS_LOWBOOT 1 #endif @@ -376,7 +380,7 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ -#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 #endif @@ -537,11 +541,11 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=" MK_STR(CONFIG_NETDEV) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "fdtaddr=400000\0" \ "console=ttyCPM0\0" \ "setbootargs=setenv bootargs " \ diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 55d77f8..1fbc190 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -33,7 +33,7 @@ /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! !! !! This configuration requires JP3 to be in position 1-2 to work !! - !! To make it work for the default, the TEXT_BASE define in !! + !! To make it work for the default, the CONFIG_SYS_TEXT_BASE define in !! !! board/mpc8266ads/config.mk must be changed from 0xfe000000 to !! !! 0xfff00000 !! !! The CONFIG_SYS_HRCW_MASTER define below must also be changed to match !! @@ -53,6 +53,8 @@ #define CONFIG_MPC8266ADS 1 /* ...on motorola ADS board */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#define CONFIG_SYS_TEXT_BASE 0xfe000000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */ @@ -422,7 +424,7 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ -#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 #endif diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 1314271..de03a97 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -33,6 +33,8 @@ #define CONFIG_MPC8308 1 /* MPC8308 CPU specific */ #define CONFIG_MPC8308RDB 1 /* MPC8308RDB board specific */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_MISC_INIT_R /* @@ -200,7 +202,7 @@ /* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 3fdd1b0..3eca719 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -35,6 +35,10 @@ #define CONFIG_MPC8313 1 #define CONFIG_MPC8313ERDB 1 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFE000000 +#endif + #define CONFIG_PCI #define CONFIG_FSL_ELBC 1 @@ -196,7 +200,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) && !defined(CONFIG_NAND_SPL) #define CONFIG_SYS_RAMBOOT @@ -609,11 +613,11 @@ "ethprime=TSEC1\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "fdtaddr=780000\0" \ "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0" \ "console=ttyS0\0" \ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index abc29c0..2e6cc51 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -25,9 +25,13 @@ #ifndef __CONFIG_H #define __CONFIG_H -#ifdef CONFIG_MK_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_U_BOOT 1 -#define CONFIG_RAMBOOT_TEXT_BASE 0x00100000 +#define CONFIG_SYS_TEXT_BASE 0x00100000 +#endif + +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFE000000 #endif /* @@ -177,7 +181,7 @@ /* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 0719fcea..177e6e9 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -17,6 +17,8 @@ #define CONFIG_MPC83xx 1 /* MPC83xx family */ #define CONFIG_MPC832x 1 /* MPC832x CPU specific */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_PCI 1 /* @@ -146,7 +148,7 @@ /* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT @@ -551,11 +553,11 @@ "netdev=" MK_STR(CONFIG_NETDEV) "\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftp $loadaddr $uboot;" \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "fdtaddr=780000\0" \ "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0" \ "ramdiskaddr=1000000\0" \ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index bed62bd..fe51208 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -28,8 +28,8 @@ #define CONFIG_MPC83xx 1 /* MPC83xx family */ #define CONFIG_MPC832x 1 /* MPC832x CPU specific */ #define CONFIG_MPC832XEMDS 1 /* MPC832XEMDS board specific */ -#undef CONFIG_PQ_MDS_PIB /* POWERQUICC MDS Platform IO Board */ -#undef CONFIG_PQ_MDS_PIB_ATM /* QOC3 ATM card */ + +#define CONFIG_SYS_TEXT_BASE 0xFE000000 /* * System Clock Setup @@ -135,7 +135,7 @@ /* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 55e9de0..6f02db0 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2006 + * (C) Copyright 2006-2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -38,8 +38,10 @@ #define CONFIG_MPC8349 1 /* MPC8349 specific */ #define CONFIG_MPC8349EMDS 1 /* MPC8349EMDS board specific */ -#define PCI_66M -#ifdef PCI_66M +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + +#define CONFIG_PCI_66M +#ifdef CONFIG_PCI_66M #define CONFIG_83XX_CLKIN 66000000 /* in Hz */ #else #define CONFIG_83XX_CLKIN 33000000 /* in Hz */ @@ -51,7 +53,7 @@ #endif /* CONFIG_PCISLAVE */ #ifndef CONFIG_SYS_CLK_FREQ -#ifdef PCI_66M +#ifdef CONFIG_PCI_66M #define CONFIG_SYS_CLK_FREQ 66000000 #define HRCWL_CSB_TO_CLKIN HRCWL_CSB_TO_CLKIN_4X1 #else @@ -172,7 +174,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 117f745..d49c1ff 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -56,7 +56,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#if (TEXT_BASE == 0xFE000000) +#if (CONFIG_SYS_TEXT_BASE == 0xFE000000) #define CONFIG_SYS_LOWBOOT #endif @@ -67,6 +67,10 @@ #define CONFIG_MPC834x /* MPC834x family (8343, 8347, 8349) */ #define CONFIG_MPC8349 /* MPC8349 specific */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFEF00000 +#endif + #define CONFIG_SYS_IMMR 0xE0000000 /* The IMMR is relocated to here */ #define CONFIG_MISC_INIT_F @@ -292,7 +296,7 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * U-Boot memory configuration */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT @@ -394,8 +398,8 @@ boards, we say we have two, but don't display a message if we find only one. */ #endif -#define PCI_66M -#ifdef PCI_66M +#define CONFIG_PCI_66M +#ifdef CONFIG_PCI_66M #define CONFIG_83XX_CLKIN 66666666 /* in Hz */ #else #define CONFIG_83XX_CLKIN 33333333 /* in Hz */ @@ -716,11 +720,11 @@ boards, we say we have two, but don't display a message if we find only one. */ "netdev=" MK_STR(CONFIG_NETDEV) "\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "fdtaddr=780000\0" \ "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0" diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index d7381aa..e5165e9 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -30,6 +30,9 @@ #define CONFIG_MPC83xx 1 /* MPC83xx family */ #define CONFIG_MPC8360 1 /* MPC8360 CPU specific */ #define CONFIG_MPC8360EMDS 1 /* MPC8360EMDS board specific */ + +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #undef CONFIG_PQ_MDS_PIB /* POWERQUICC MDS Platform IO Board */ #undef CONFIG_PQ_MDS_PIB_ATM /* QOC3 ATM card */ @@ -161,7 +164,7 @@ * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h index fc53ecc..dbbeeca 100644 --- a/include/configs/MPC8360ERDK.h +++ b/include/configs/MPC8360ERDK.h @@ -26,18 +26,20 @@ #define CONFIG_MPC8360 1 /* MPC8360 CPU specific */ #define CONFIG_MPC8360ERDK 1 /* MPC8360ERDK board specific */ +#define CONFIG_SYS_TEXT_BASE 0xFF800000 + /* * System Clock Setup */ #ifdef CONFIG_CLKIN_33MHZ #define CONFIG_83XX_CLKIN 33333333 #define CONFIG_SYS_CLK_FREQ 33333333 -#define PCI_33M 1 +#define CONFIG_PCI_33M 1 #define HRCWL_CSB_TO_CLKIN_MPC8360ERDK HRCWL_CSB_TO_CLKIN_10X1 #else #define CONFIG_83XX_CLKIN 66000000 #define CONFIG_SYS_CLK_FREQ 66000000 -#define PCI_66M 1 +#define CONFIG_PCI_66M 1 #define HRCWL_CSB_TO_CLKIN_MPC8360ERDK HRCWL_CSB_TO_CLKIN_5X1 #endif /* CONFIG_CLKIN_33MHZ */ @@ -153,7 +155,7 @@ /* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_FLASH_BASE 0xFF800000 /* FLASH base address */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 8546ebc..5d30c79 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -29,6 +29,8 @@ #define CONFIG_MPC837x 1 /* MPC837x CPU specific */ #define CONFIG_MPC837XEMDS 1 /* MPC837XEMDS board specific */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + /* * System Clock Setup */ @@ -196,7 +198,7 @@ /* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 20c2304..afc37b5 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -30,6 +30,8 @@ #define CONFIG_MPC837x 1 /* MPC837x CPU specific */ #define CONFIG_MPC837XERDB 1 +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_PCI 1 #define CONFIG_BOARD_EARLY_INIT_F @@ -220,7 +222,7 @@ /* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT @@ -667,11 +669,11 @@ "netdev=" MK_STR(CONFIG_NETDEV) "\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftp $loadaddr $uboot;" \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "fdtaddr=780000\0" \ "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0" \ "ramdiskaddr=1000000\0" \ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 0a9f47b..cc83d92 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -29,24 +29,28 @@ #include "../board/freescale/common/ics307_clk.h" -#ifdef CONFIG_MK_36BIT +#ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT 1 #endif -#ifdef CONFIG_MK_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_U_BOOT 1 #define CONFIG_RAMBOOT_NAND 1 -#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000 +#define CONFIG_SYS_TEXT_BASE 0xf8f82000 #endif -#ifdef CONFIG_MK_SDCARD +#ifdef CONFIG_SDCARD #define CONFIG_RAMBOOT_SDCARD 1 -#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 +#define CONFIG_SYS_TEXT_BASE 0xf8f80000 #endif -#ifdef CONFIG_MK_SPIFLASH +#ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH 1 -#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 +#define CONFIG_SYS_TEXT_BASE 0xf8f80000 +#endif + +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xeff80000 #endif /* High Level Configuration Options */ @@ -229,7 +233,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \ || defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH) @@ -759,11 +763,11 @@ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=8536ds/ramdisk.uboot\0" \ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index c133895..4ac1f6e 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -41,6 +41,12 @@ #define CONFIG_MPC8540 1 /* MPC8540 specific */ #define CONFIG_MPC8540ADS 1 /* MPC8540ADS board specific */ +/* + * default CCARBAR is at 0xff700000 + * assume U-Boot is less than 0.5MB + */ +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #ifndef CONFIG_HAS_FEC #define CONFIG_HAS_FEC 1 /* 8540 has FEC */ #endif @@ -137,7 +143,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h index 75227a6..85ecf47 100644 --- a/include/configs/MPC8540EVAL.h +++ b/include/configs/MPC8540EVAL.h @@ -36,6 +36,8 @@ #define CONFIG_MPC8540 1 /* MPC8540 specific */ #define CONFIG_MPC8540EVAL 1 /* MPC8540EVAL board specific */ +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #undef CONFIG_PCI /* pci ethernet support */ #define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE @@ -107,7 +109,7 @@ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms)*/ #define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index c3167e9..5bd851f 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -37,6 +37,8 @@ #define CONFIG_MPC8541 1 /* MPC8541 specific */ #define CONFIG_MPC8541CDS 1 /* MPC8541CDS board specific */ +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #define CONFIG_PCI #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ #define CONFIG_TSEC_ENET /* tsec ethernet support */ @@ -145,7 +147,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 1804582..5322a23 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -34,6 +34,10 @@ #define CONFIG_MPC8544 1 #define CONFIG_MPC8544DS 1 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xfff80000 +#endif + #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI1 1 /* PCI controller 1 */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ @@ -154,7 +158,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -498,11 +502,11 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=8544ds/ramdisk.uboot\0" \ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index e1e4acf..2d99358 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -36,6 +36,10 @@ #define CONFIG_MPC8548 1 /* MPC8548 specific */ #define CONFIG_MPC8548CDS 1 /* MPC8548CDS board specific */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xfff80000 +#endif + #define CONFIG_PCI /* enable any pci type devices */ #define CONFIG_PCI1 /* PCI controller 1 */ #define CONFIG_PCIE1 /* PCIE controler 1 (slot 1) */ @@ -157,7 +161,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -542,11 +546,11 @@ extern unsigned long get_clock_freq(void); "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS1\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=ramdisk.uboot\0" \ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index b0dd175..7bc1bce 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -37,6 +37,8 @@ #define CONFIG_MPC8555 1 /* MPC8555 specific */ #define CONFIG_MPC8555CDS 1 /* MPC8555CDS board specific */ +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #define CONFIG_PCI #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ #define CONFIG_TSEC_ENET /* tsec ethernet support */ @@ -143,7 +145,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 31740fd..fad180f 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -42,6 +42,12 @@ #define CONFIG_MPC8560ADS 1 /* MPC8560ADS board specific */ #define CONFIG_MPC8560 1 +/* + * default CCARBAR is at 0xff700000 + * assume U-Boot is less than 0.5MB + */ +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #define CONFIG_PCI #define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */ #define CONFIG_TSEC_ENET /* tsec ethernet support */ @@ -134,7 +140,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index a98ecde..054991e 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -33,6 +33,8 @@ #define CONFIG_MPC8568 1 /* MPC8568 specific */ #define CONFIG_MPC8568MDS 1 /* MPC8568MDS board specific */ +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI1 1 /* PCI controller */ #define CONFIG_PCIE1 1 /* PCIE controller */ @@ -154,7 +156,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 95c0a9f..62a4039 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -51,7 +51,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_CLK_FREQ 66666666 #define CONFIG_DDR_CLK_FREQ CONFIG_SYS_CLK_FREQ -#ifdef CONFIG_MK_ATM +#ifdef CONFIG_ATM #define CONFIG_PQ_MDS_PIB #define CONFIG_PQ_MDS_PIB_ATM #endif @@ -62,10 +62,14 @@ extern unsigned long get_clock_freq(void); #define CONFIG_L2_CACHE /* toggle L2 cache */ #define CONFIG_BTB /* toggle branch predition */ -#ifdef CONFIG_MK_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_U_BOOT 1 #define CONFIG_RAMBOOT_NAND 1 -#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000 +#define CONFIG_SYS_TEXT_BASE 0xf8f82000 +#endif + +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xfff80000 #endif /* @@ -190,7 +194,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 34ebbdb..336d62d 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -29,7 +29,7 @@ #include "../board/freescale/common/ics307_clk.h" -#ifdef CONFIG_MK_36BIT +#ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT #endif @@ -41,6 +41,10 @@ #define CONFIG_MPC8572DS 1 #define CONFIG_MP 1 /* support multiple processors */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xeff80000 +#endif + #define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ @@ -189,7 +193,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -654,11 +658,11 @@ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=8572ds/ramdisk.uboot\0" \ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 2b7b8b5..9128c98 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -19,6 +19,8 @@ #define CONFIG_MPC8610HPCD 1 /* MPC8610HPCD board specific */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ /* video */ @@ -185,7 +187,7 @@ #undef CONFIG_SYS_FLASH_CHECKSUM #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_BASE_EARLY 0xfff00000 /* early monitor loc */ #define CONFIG_FLASH_CFI_DRIVER @@ -424,7 +426,7 @@ /* Map the last 1M of flash where we're running from reset */ #define CONFIG_SYS_DBAT6L_EARLY (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \ | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE) -#define CONFIG_SYS_DBAT6U_EARLY (TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP) +#define CONFIG_SYS_DBAT6U_EARLY (CONFIG_SYS_TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP) #define CONFIG_SYS_IBAT6L_EARLY (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \ | BATL_MEMCOHERENCE) #define CONFIG_SYS_IBAT6U_EARLY CONFIG_SYS_DBAT6U_EARLY @@ -606,11 +608,11 @@ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=8610hpcd/ramdisk.uboot\0" \ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index d92b12d..c4efaba 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -41,6 +41,12 @@ /*#define CONFIG_PHYS_64BIT 1*/ /* Place devices in 36-bit space */ #define CONFIG_ADDR_MAP 1 /* Use addr map */ +/* + * default CCSRBAR is at 0xff700000 + * assume U-Boot is less than 0.5MB + */ +#define CONFIG_SYS_TEXT_BASE 0xeff00000 + #ifdef RUN_DIAG #define CONFIG_SYS_DIAG_ADDR CONFIG_SYS_FLASH_BASE #endif @@ -239,7 +245,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #undef CONFIG_SYS_FLASH_CHECKSUM #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_BASE_EARLY 0xfff00000 /* early monitor loc */ #define CONFIG_FLASH_CFI_DRIVER @@ -587,7 +593,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* Map the last 1M of flash where we're running from reset */ #define CONFIG_SYS_DBAT6L_EARLY (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \ | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE) -#define CONFIG_SYS_DBAT6U_EARLY (TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP) +#define CONFIG_SYS_DBAT6U_EARLY (CONFIG_SYS_TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP) #define CONFIG_SYS_IBAT6L_EARLY (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \ | BATL_MEMCOHERENCE) #define CONFIG_SYS_IBAT6U_EARLY CONFIG_SYS_DBAT6U_EARLY @@ -728,11 +734,11 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=your.ramdisk.u-boot\0" \ diff --git a/include/configs/MPC86xADS.h b/include/configs/MPC86xADS.h index 85c6890..beada7e 100644 --- a/include/configs/MPC86xADS.h +++ b/include/configs/MPC86xADS.h @@ -28,6 +28,8 @@ #undef CONFIG_MPC859DSL #undef CONFIG_MPC852T +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/MPC885ADS.h b/include/configs/MPC885ADS.h index 8ffc1b2..eeb2355 100644 --- a/include/configs/MPC885ADS.h +++ b/include/configs/MPC885ADS.h @@ -15,6 +15,8 @@ #define CONFIG_MPC885 1 /* MPC885 CPU (Duet family) */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h index ec9e1ec..e600639 100644 --- a/include/configs/MUSENKI.h +++ b/include/configs/MUSENKI.h @@ -45,6 +45,7 @@ #define CONFIG_MPC8245 1 #define CONFIG_MUSENKI 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 9600 @@ -118,7 +119,7 @@ #define CONFIG_SYS_EUMB_ADDR 0xFC000000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ @@ -153,7 +154,7 @@ * Definitions for initial stack pointer and data area */ -/* #define CONFIG_SYS_MONITOR_BASE TEXT_BASE */ +/* #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE */ /*#define CONFIG_SYS_GBL_DATA_SIZE 256*/ #define CONFIG_SYS_GBL_DATA_SIZE 128 #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h index 8f6b16b..cd86766 100644 --- a/include/configs/MVBC_P.h +++ b/include/configs/MVBC_P.h @@ -32,6 +32,10 @@ #define CONFIG_MPC5xxx 1 #define CONFIG_MPC5200 1 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFF800000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 #define BOOTFLAG_COLD 0x01 @@ -211,7 +215,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_LOWBOOT -#define CONFIG_SYS_FLASH_BASE TEXT_BASE +#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_FLASH_SIZE 0x00800000 /* @@ -240,7 +244,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 diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h index 25d8077..9ec03d9 100644 --- a/include/configs/MVBLM7.h +++ b/include/configs/MVBLM7.h @@ -37,6 +37,8 @@ #define CONFIG_MPC834x 1 #define CONFIG_MPC8343 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_SYS_IMMR 0xE0000000 #define CONFIG_PCI @@ -116,7 +118,7 @@ /* * U-Boot memory configuration */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #undef CONFIG_SYS_RAMBOOT #define CONFIG_SYS_INIT_RAM_LOCK @@ -186,7 +188,7 @@ #define CONFIG_NET_MULTI 1 #define CONFIG_NET_RETRY_COUNT 3 -#define PCI_66M +#define CONFIG_PCI_66M #define CONFIG_83XX_CLKIN 66666667 #define CONFIG_PCI_PNP #define CONFIG_PCI_SCAN_SHOW diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h index 669816c..bee1327 100644 --- a/include/configs/MVBLUE.h +++ b/include/configs/MVBLUE.h @@ -43,6 +43,8 @@ #define MVBLUE_BOARD_BOX 1 #define MVBLUE_BOARD_LYNX 2 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #if 0 #define ERR_LED(code) do { if (code) \ *(volatile char *)(0xff000003) = ( 3 | (code<<4) ) & 0xf3; \ @@ -172,7 +174,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFFF00000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100 #define CONFIG_SYS_EUMB_ADDR 0xFC000000 diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h index 000c4c6..ec93245 100644 --- a/include/configs/MVSMR.h +++ b/include/configs/MVSMR.h @@ -32,6 +32,10 @@ #define CONFIG_MPC5xxx 1 #define CONFIG_MPC5200 1 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFF800000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 #define BOOTFLAG_COLD 0x01 @@ -177,7 +181,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_LOWBOOT -#define CONFIG_SYS_FLASH_BASE TEXT_BASE +#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_FLASH_SIZE 0x00800000 /* @@ -210,7 +214,7 @@ 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 diff --git a/include/configs/NC650.h b/include/configs/NC650.h index 6343cfe..8d1d45d 100644 --- a/include/configs/NC650.h +++ b/include/configs/NC650.h @@ -36,6 +36,8 @@ #define CONFIG_MPC852T 1 #define CONFIG_NC650 1 +#define CONFIG_SYS_TEXT_BASE 0x40700000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE @@ -213,7 +215,7 @@ #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100 #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN (256 << 10) /* Reserve 256 kB for malloc() */ /* diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h index 76ca916..24d9110 100644 --- a/include/configs/NETPHONE.h +++ b/include/configs/NETPHONE.h @@ -41,6 +41,8 @@ #define CONFIG_MPC870 1 /* This is a MPC885 CPU */ #define CONFIG_NETPHONE 1 /* ...on a NetPhone board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index 4f9f9fe..3c2c958 100644 --- a/include/configs/NETTA.h +++ b/include/configs/NETTA.h @@ -37,6 +37,8 @@ #define CONFIG_MPC885 1 /* This is a MPC885 CPU */ #define CONFIG_NETTA 1 /* ...on a NetTA board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index d060cb7..a89c77d 100644 --- a/include/configs/NETTA2.h +++ b/include/configs/NETTA2.h @@ -41,6 +41,8 @@ #define CONFIG_MPC870 1 /* This is a MPC885 CPU */ #define CONFIG_NETTA2 1 /* ...on a NetTA2 board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h index a18b480..0cc07f8 100644 --- a/include/configs/NETVIA.h +++ b/include/configs/NETVIA.h @@ -37,6 +37,8 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_NETVIA 1 /* ...on a NetVia board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #if !defined(CONFIG_NETVIA_VERSION) || CONFIG_NETVIA_VERSION == 1 #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index 6a4c47d..cd8c769 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -37,6 +37,8 @@ #define CONFIG_TQM855M 1 /* ...on a TQM8xxM module */ #define CONFIG_NSCU 1 +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SCC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/NX823.h b/include/configs/NX823.h index 5054d5e..70c6bb5 100644 --- a/include/configs/NX823.h +++ b/include/configs/NX823.h @@ -39,6 +39,8 @@ #define CONFIG_MPC823 1 /* This is a MPC823 CPU */ #define CONFIG_NX823 1 /* ...on a NEXUS 823 module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + /*#define CONFIG_VIDEO 1 */ #define CONFIG_8xx_GCLK_FREQ MPC8XX_SPEED diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h index ad2e4da..a275b54 100644 --- a/include/configs/OCRTC.h +++ b/include/configs/OCRTC.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_OCRTC 1 /* ...on a OCRTC board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFD0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_SYS_CLK_FREQ 33000000 /* external frequency to pll */ diff --git a/include/configs/OXC.h b/include/configs/OXC.h index 74c51f4..76d8b04 100644 --- a/include/configs/OXC.h +++ b/include/configs/OXC.h @@ -39,6 +39,8 @@ #define CONFIG_MPC8240 1 #define CONFIG_OXC 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_IDENT_STRING " [oxc] " @@ -136,7 +138,7 @@ #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN 0x00030000 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_PRELIMBASE) diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index da826fc..5d127cf 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -22,6 +22,10 @@ #define CONFIG_P1022DS #define CONFIG_MP /* support multiple processors */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xeff80000 +#endif + #define CONFIG_FSL_ELBC /* Has Enhanced localbus controller */ #define CONFIG_PCI /* Enable PCI/PCIE */ #define CONFIG_PCIE1 /* PCIE controler 1 (slot 1) */ @@ -125,7 +129,7 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 2 #define CONFIG_SYS_MAX_FLASH_SECT 1024 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -432,11 +436,11 @@ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=uramdisk\0" \ diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index fa45b5b..8c373fa 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -30,33 +30,37 @@ #ifndef __CONFIG_H #define __CONFIG_H -#ifdef CONFIG_MK_P1011RDB +#ifdef CONFIG_P1011RDB #define CONFIG_P1011 #endif -#ifdef CONFIG_MK_P1020RDB +#ifdef CONFIG_P1020RDB #define CONFIG_P1020 #endif -#ifdef CONFIG_MK_P2010RDB +#ifdef CONFIG_P2010RDB #define CONFIG_P2010 #endif -#ifdef CONFIG_MK_P2020RDB +#ifdef CONFIG_P2020RDB #define CONFIG_P2020 #endif -#ifdef CONFIG_MK_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_U_BOOT 1 #define CONFIG_RAMBOOT_NAND 1 -#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000 +#define CONFIG_SYS_TEXT_BASE 0xf8f82000 #endif -#ifdef CONFIG_MK_SDCARD +#ifdef CONFIG_SDCARD #define CONFIG_RAMBOOT_SDCARD 1 -#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 +#define CONFIG_SYS_TEXT_BASE 0xf8f80000 #endif -#ifdef CONFIG_MK_SPIFLASH +#ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH 1 -#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 +#define CONFIG_SYS_TEXT_BASE 0xf8f80000 +#endif + +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xeff80000 #endif /* High Level Configuration Options */ @@ -188,7 +192,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \ || defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH) @@ -579,11 +583,11 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=rootfs.ext2.gz.uboot\0" \ diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index 74cff0c..102e4c9 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -29,7 +29,7 @@ #include "../board/freescale/common/ics307_clk.h" -#ifdef CONFIG_MK_36BIT +#ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT #endif @@ -41,6 +41,10 @@ #define CONFIG_P2020DS 1 #define CONFIG_MP 1 /* support multiple processors */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xeff80000 +#endif + #define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ @@ -92,7 +96,7 @@ /* DDR Setup */ #define CONFIG_VERY_BIG_RAM -#ifdef CONFIG_MK_DDR2 +#ifdef CONFIG_DDR2 #define CONFIG_FSL_DDR2 #else #define CONFIG_FSL_DDR3 1 @@ -224,7 +228,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -659,11 +663,11 @@ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=p2020ds/ramdisk.uboot\0" \ diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h index 890170d..5f3c414 100644 --- a/include/configs/P3G4.h +++ b/include/configs/P3G4.h @@ -42,6 +42,8 @@ #define CONFIG_P3G4 1 /* this is a P3G4 board */ #define CONFIG_SYS_GT_6426x GT_64260 /* with a 64260 system controller */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BAUDRATE 115200 /* console baudrate = 115200 */ #undef CONFIG_ECC /* enable ECC support */ @@ -198,7 +200,7 @@ #define CONFIG_SYS_FLASH_BASE 0xff000000 #define CONFIG_SYS_RESET_ADDRESS 0xfff00100 #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN (256 << 10) /* Reserve 256 kB for malloc */ /* areas to map different things with the GT in physical space */ diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h index 87703c9..5e7b81f 100644 --- a/include/configs/P4080DS.h +++ b/include/configs/P4080DS.h @@ -36,4 +36,8 @@ #define CONFIG_SYS_P4080_ERRATUM_CPU22 #define CONFIG_SYS_P4080_ERRATUM_SERDES8 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xeff80000 +#endif + #include "corenet_ds.h" diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 88e9528..8a913f5 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -33,6 +33,9 @@ #define CONFIG_MPC555 1 /* This is an MPC555 CPU */ #define CONFIG_PATI 1 /* ...On a PATI board */ + +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + /* Serial Console Configuration */ #define CONFIG_5xx_CONS_SCI1 #undef CONFIG_5xx_CONS_SCI2 @@ -144,7 +147,7 @@ #define PLD_CONFIG_BASE 0x04001000 /* PLD (CS3) */ #define CONFIG_SYS_MONITOR_BASE 0xFFF00000 -/* CONFIG_SYS_FLASH_BASE */ /* TEXT_BASE is defined in the board config.mk file. */ +/* CONFIG_SYS_FLASH_BASE */ /* CONFIG_SYS_TEXT_BASE is defined in the board config.mk file. */ /* This adress is given to the linker with -Ttext to */ /* locate the text section at this adress. */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 192 kB for Monitor */ diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h index 244d6fe..bea7e49 100644 --- a/include/configs/PCI405.h +++ b/include/configs/PCI405.h @@ -39,6 +39,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_PCI405 1 /* ...on a PCI405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFD0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() on init */ diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h index c60a9f7..3e7e74b 100644 --- a/include/configs/PCI5441.h +++ b/include/configs/PCI5441.h @@ -63,7 +63,7 @@ #define CONFIG_SYS_GBL_DATA_SIZE 128 /* Global data size rsvd*/ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_MALLOC_BASE - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP CONFIG_SYS_GBL_DATA_OFFSET diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h index c30ac78..f98295a 100644 --- a/include/configs/PCIPPC2.h +++ b/include/configs/PCIPPC2.h @@ -43,6 +43,8 @@ #define CONFIG_PCIPPC2 1 /* this is a PCIPPC2 board */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BOARD_EARLY_INIT_F 1 #define CONFIG_MISC_INIT_R 1 @@ -117,7 +119,7 @@ #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h index bc67480..a33d946 100644 --- a/include/configs/PCIPPC6.h +++ b/include/configs/PCIPPC6.h @@ -43,6 +43,8 @@ #define CONFIG_PCIPPC2 1 /* this is a PCIPPC2 board */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BOARD_EARLY_INIT_F 1 #define CONFIG_MISC_INIT_R 1 @@ -119,7 +121,7 @@ #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 2901cfd..8d89c80 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -35,6 +35,9 @@ #define CONFIG_405GP 1 /* This is a PPC405 CPU */ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_PIP405 1 /* ...on a PIP405 board */ + +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + /*********************************************************** * Clock ***********************************************************/ diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h index 874c20b..8e8c049 100644 --- a/include/configs/PK1C20.h +++ b/include/configs/PK1C20.h @@ -65,7 +65,7 @@ #define CONFIG_SYS_GBL_DATA_SIZE 128 /* Global data size rsvd*/ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_MALLOC_BASE - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP CONFIG_SYS_GBL_DATA_OFFSET diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 928ed8e..7d91a75 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_PLU405 1 /* ...on a PLU405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ @@ -268,8 +270,8 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_MONITOR_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (1024 << 10) /* diff --git a/include/configs/PM520.h b/include/configs/PM520.h index 22de207..e1e709f 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -33,6 +33,8 @@ #define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_PM520 1 /* ... on PM520 board */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33MHz */ #define CONFIG_MISC_INIT_R @@ -241,7 +243,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 diff --git a/include/configs/PM826.h b/include/configs/PM826.h index 636bd26..31874b1 100644 --- a/include/configs/PM826.h +++ b/include/configs/PM826.h @@ -39,6 +39,10 @@ #define CONFIG_PM826 1 /* ...on a PM8260 module */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFF000000 /* Standard: boot 64-bit flash */ +#endif + #undef CONFIG_DB_CR826_J30x_ON /* J30x jumpers on D.B. carrier */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ @@ -304,7 +308,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH0_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ diff --git a/include/configs/PM828.h b/include/configs/PM828.h index 9d620af..8573ef9 100644 --- a/include/configs/PM828.h +++ b/include/configs/PM828.h @@ -39,6 +39,10 @@ #define CONFIG_PM828 1 /* ...on a PM828 module */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0x40000000 /* Standard: boot 64-bit flash */ +#endif + #undef CONFIG_DB_CR826_J30x_ON /* J30x jumpers on D.B. carrier */ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ @@ -298,7 +302,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH0_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ diff --git a/include/configs/PM854.h b/include/configs/PM854.h index cf8a8cf..8a0af47 100644 --- a/include/configs/PM854.h +++ b/include/configs/PM854.h @@ -41,6 +41,8 @@ #define CONFIG_MPC8540 1 /* MPC8540 specific */ #define CONFIG_PM854 1 /* PM854 board specific */ +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #define CONFIG_PCI #define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE @@ -137,7 +139,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) diff --git a/include/configs/PM856.h b/include/configs/PM856.h index 0bd28fc..a6acc0b 100644 --- a/include/configs/PM856.h +++ b/include/configs/PM856.h @@ -42,6 +42,8 @@ #define CONFIG_CPM2 1 /* Has a CPM2 */ #define CONFIG_PM856 1 /* PM856 board specific */ +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #define CONFIG_PCI #define CONFIG_TSEC_ENET /* tsec ethernet support */ #define CONFIG_ENV_OVERWRITE @@ -139,7 +141,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h index c420efe..4d65df8 100644 --- a/include/configs/PMC405.h +++ b/include/configs/PMC405.h @@ -32,6 +32,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_PMC405 1 /* ...on a PMC405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ @@ -195,8 +197,8 @@ * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0 */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* 128 kB for malloc() */ #define CONFIG_PRAM 0 /* use pram variable to overwrite */ diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 5b1048e..74b656c 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -28,6 +28,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_PMC405DE 1 /* ...on a PMC405DE board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ #define CONFIG_BOARD_TYPES 1 /* support board types */ @@ -205,8 +207,8 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xfe000000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (256 * 1024) /* diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index bf2247d..66e2692 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -39,6 +39,10 @@ #define CONFIG_440 1 /* ... PPC440 family */ #define CONFIG_4xx 1 /* ... PPC4xx family */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF90000 +#endif + #define CONFIG_SYS_CLK_FREQ 33333400 #if 0 /* temporary disabled because OS/9 does not like dcache on startup */ @@ -53,7 +57,7 @@ * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses) *----------------------------------------------------------------------*/ -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserve 256 kB for malloc() */ #define CONFIG_PRAM 0 /* use pram variable to overwrite */ @@ -61,7 +65,7 @@ #define CONFIG_SYS_BOOT_BASE_ADDR 0xf0000000 #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */ #define CONFIG_SYS_FLASH_BASE 0xfc000000 /* start of FLASH */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_ADDR 0xd0000000 /* NAND Flash */ #define CONFIG_SYS_OCM_BASE 0xe0010000 /* ocm */ #define CONFIG_SYS_OCM_DATA_ADDR CONFIG_SYS_OCM_BASE diff --git a/include/configs/PN62.h b/include/configs/PN62.h index 562c5c3..b19beba 100644 --- a/include/configs/PN62.h +++ b/include/configs/PN62.h @@ -39,6 +39,8 @@ #define CONFIG_MPC8240 1 #define CONFIG_PN62 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_CONS_INDEX 1 @@ -148,7 +150,7 @@ #undef CONFIG_SYS_RAMBOOT #define CONFIG_SYS_MONITOR_LEN 0x00030000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /*#define CONFIG_SYS_GBL_DATA_SIZE 256*/ #define CONFIG_SYS_GBL_DATA_SIZE 128 diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index f9b2014..e910f7d 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -75,6 +75,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_PPCHAMELEONEVB 1 /* ...on a PPChameleonEVB board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFB0000 /* Reserve 320 kB for Monitor */ + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/QS823.h b/include/configs/QS823.h index c1416cb..df9376c 100644 --- a/include/configs/QS823.h +++ b/include/configs/QS823.h @@ -53,6 +53,8 @@ #define CONFIG_QS823 1 /* ...on a QS823 module */ #define CONFIG_SCC2_ENET 1 /* SCC2 10BaseT ethernet */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + /* Select the target clock speed */ #undef CONFIG_CLOCK_16MHZ /* cpu=16,777,216 Hz, mem=16Mhz */ #undef CONFIG_CLOCK_33MHZ /* cpu=33,554,432 Hz, mem=33Mhz */ diff --git a/include/configs/QS850.h b/include/configs/QS850.h index de74fee..45b8325 100644 --- a/include/configs/QS850.h +++ b/include/configs/QS850.h @@ -53,6 +53,8 @@ #define CONFIG_QS850 1 /* ...on a QS850 module */ #define CONFIG_SCC2_ENET 1 /* SCC2 10BaseT ethernet */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + /* Select the target clock speed */ #undef CONFIG_CLOCK_16MHZ /* cpu=16,777,216 Hz, mem=16Mhz */ #undef CONFIG_CLOCK_33MHZ /* cpu=33,554,432 Hz, mem=33Mhz */ diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h index 705d375..48a20df 100644 --- a/include/configs/QS860T.h +++ b/include/configs/QS860T.h @@ -54,6 +54,9 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_QS860T 1 /* ...on a QS860T module */ +/* Start address of 512K Socketed Flash */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_FEC_ENET 1 /* FEC 10/100BaseT ethernet */ #define CONFIG_MII #define FEC_INTERRUPT SIU_LEVEL1 diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h index 830f4bc..586f1bb 100644 --- a/include/configs/R360MPI.h +++ b/include/configs/R360MPI.h @@ -36,6 +36,8 @@ #define CONFIG_MPC823 1 /* This is a MPC823 CPU */ #define CONFIG_R360MPI 1 +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_LCD #undef CONFIG_EDT32F10 #define CONFIG_SHARP_LQ057Q3DC02 diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index 00ac6cf..471f32e 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -39,6 +39,7 @@ #define CONFIG_MPC823 1 /* This is a MPC823 CPU */ #define CONFIG_RBC823 1 /* ...on a RBC823 module */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 #if 0 #define DEBUG 1 diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h index bec5278..37414a8 100644 --- a/include/configs/RPXClassic.h +++ b/include/configs/RPXClassic.h @@ -42,6 +42,8 @@ #define CONFIG_MPC860 1 #define CONFIG_RPXCLASSIC 1 +#define CONFIG_SYS_TEXT_BASE 0xff000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h index dd9134d..b564796 100644 --- a/include/configs/RPXlite.h +++ b/include/configs/RPXlite.h @@ -39,6 +39,8 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_RPXLITE 1 +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE @@ -129,7 +131,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFFC00000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #ifdef CONFIG_BZIP2 #define CONFIG_SYS_MALLOC_LEN (4096 << 10) /* Reserve ~4 MB for malloc() */ diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h index a59053c..6577a26 100644 --- a/include/configs/RPXlite_DW.h +++ b/include/configs/RPXlite_DW.h @@ -51,6 +51,8 @@ #define CONFIG_MPC823 1 /* This is a MPC823e CPU. */ #define CONFIG_RPXLITE 1 /* RPXlite DW version board */ +#define CONFIG_SYS_TEXT_BASE 0xff000000 + #ifdef CONFIG_LCD /* with LCD controller ? */ #define CONFIG_SPLASH_SCREEN /* ... with splashscreen support*/ #endif diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h index da962f3..f4f90f2 100644 --- a/include/configs/RPXsuper.h +++ b/include/configs/RPXsuper.h @@ -1,6 +1,7 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_TEXT_BASE 0x80F00000 /***************************************************************************** * @@ -34,7 +35,7 @@ #undef CONFIG_SYS_SBC_BOOT_LOW /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/sbc8260/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/sbc8260/config.mk * The main FLASH is whichever is connected to *CS0. U-Boot expects * this to be the SIMM. */ diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h index 6ec5be0..6e30335 100644 --- a/include/configs/RRvision.h +++ b/include/configs/RRvision.h @@ -36,6 +36,8 @@ #define CONFIG_MPC823 1 /* This is a MPC823 CPU */ #define CONFIG_RRVISION 1 /* ...on a RRvision board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_GCLK_FREQ 64000000 #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index e630afe..8140ae9 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -33,6 +33,8 @@ #define CPU_ID_STR "MPC8250" #endif /* CONFIG_MPC8248 */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_CPM2 1 /* Has a CPM2 */ #define CONFIG_RATTLER /* Analogue&Micro Rattler board */ @@ -220,7 +222,7 @@ */ #endif /* CONFIG_CMD_JFFS2 */ -#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 #endif diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h index d6b3cb8..9cc87dd 100644 --- a/include/configs/SBC8540.h +++ b/include/configs/SBC8540.h @@ -34,7 +34,7 @@ /* * Top level Makefile configuration choices */ -#ifdef CONFIG_MK_66 +#ifdef CONFIG_66 #define CONFIG_PCI_66 #endif @@ -48,6 +48,8 @@ #define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */ #define CONFIG_MPC85xx_REV1 1 /* MPC85xx Rev 1.0 chip */ +#define CONFIG_SYS_TEXT_BASE 0xfffc0000 + #define CONFIG_CPM2 1 /* has CPM2 */ @@ -324,7 +326,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 200000 /* Timeout for Flash Erase (in ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 50000 /* Timeout for Flash Write (in ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if 0 /* XXX This doesn't work and I don't want to fix it */ diff --git a/include/configs/SCM.h b/include/configs/SCM.h index c6fb074..6f8c28e 100644 --- a/include/configs/SCM.h +++ b/include/configs/SCM.h @@ -38,6 +38,8 @@ #define CONFIG_SCM 1 /* ...on a System Controller Module */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #if (CONFIG_TQM8260 <= 100) # error "TQM8260 module revison not supported" #endif @@ -247,7 +249,7 @@ /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/tqm8260/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/tqm8260/config.mk * The main FLASH is whichever is connected to *CS0. */ #define CONFIG_SYS_FLASH0_BASE 0x40000000 @@ -338,7 +340,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH0_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h index 9c8c318..b4fbae4 100644 --- a/include/configs/SIMPC8313.h +++ b/include/configs/SIMPC8313.h @@ -36,6 +36,10 @@ #define CONFIG_MPC831x 1 #define CONFIG_MPC8313 1 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0x00100000 +#endif + #define CONFIG_PCI #define CONFIG_FSL_ELBC 1 @@ -91,7 +95,7 @@ */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if !defined(CONFIG_NAND_SPL) #define CONFIG_SYS_RAMBOOT @@ -511,11 +515,11 @@ "ethprime=TSEC1\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "fdtaddr=ae0000\0" \ "fdtfile=" MK_STR(CONFIG_FDTFILE) "\0" \ "console=ttyS0\0" \ diff --git a/include/configs/SM850.h b/include/configs/SM850.h index 56f03e2..b5fe1cd 100644 --- a/include/configs/SM850.h +++ b/include/configs/SM850.h @@ -38,6 +38,8 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_SM850 1 /*...on a MPC850 Service Module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h index fa77882..5de4dd2 100644 --- a/include/configs/SPD823TS.h +++ b/include/configs/SPD823TS.h @@ -36,6 +36,8 @@ #define CONFIG_MPC823 1 /* This is a MPC823 CPU */ #define CONFIG_SPD823TS 1 /* ...on a SPD823TS board */ +#define CONFIG_SYS_TEXT_BASE 0xFF000000 + #define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h index 8ee8cbf..f399153 100644 --- a/include/configs/SXNI855T.h +++ b/include/configs/SXNI855T.h @@ -64,6 +64,8 @@ #define CONFIG_MPC860T 1 #define CONFIG_MPC855T 1 +#define CONFIG_SYS_TEXT_BASE 0xF8000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_SCC1 diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h index 125b9a2..20fb96a 100644 --- a/include/configs/Sandpoint8240.h +++ b/include/configs/Sandpoint8240.h @@ -39,6 +39,8 @@ #define CONFIG_MPC8240 1 #define CONFIG_SANDPOINT 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #if 0 #define USE_DINK32 1 #else @@ -159,7 +161,7 @@ #else #undef CONFIG_SYS_RAMBOOT #define CONFIG_SYS_MONITOR_LEN 0x00030000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /*#define CONFIG_SYS_GBL_DATA_SIZE 256*/ #define CONFIG_SYS_GBL_DATA_SIZE 128 diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h index 8cb920e..525e9fec 100644 --- a/include/configs/Sandpoint8245.h +++ b/include/configs/Sandpoint8245.h @@ -39,6 +39,8 @@ #define CONFIG_MPC8245 1 #define CONFIG_SANDPOINT 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #if 0 #define USE_DINK32 1 #else @@ -129,7 +131,7 @@ #else #undef CONFIG_SYS_RAMBOOT #define CONFIG_SYS_MONITOR_LEN 0x00030000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /*#define CONFIG_SYS_GBL_DATA_SIZE 256*/ #define CONFIG_SYS_GBL_DATA_SIZE 128 diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 7a6602c..fcadd4a 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -37,6 +37,17 @@ #define CONFIG_TQM5200 1 /* ... on TQM5200 module */ #define CONFIG_TB5200 1 /* ... on a TB5200 base board */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFC000000 boot low (standard configuration with room for + * max 64 MByte Flash ROM) + * 0xFFF00000 boot high (for a backup copy of U-Boot) + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFC000000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -132,7 +143,7 @@ #define CONFIG_TIMESTAMP /* display image timestamps */ -#if (TEXT_BASE == 0xFC000000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFC000000) /* Boot low */ # define CONFIG_SYS_LOWBOOT 1 #endif @@ -251,7 +262,7 @@ /* * Flash configuration */ -#define CONFIG_SYS_FLASH_BASE TEXT_BASE /* 0xFC000000 */ +#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE /* 0xFC000000 */ /* use CFI flash driver */ #define CONFIG_SYS_FLASH_CFI 1 /* Flash is CFI conformant */ @@ -329,7 +340,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 diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 7cefa32..0d916f5 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -40,6 +40,8 @@ #define CONFIG_TQM885D 1 /* ...on a TQM88D module */ #define CONFIG_TK885D 1 /* ...in a TK885D base board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_OSCLK 10000000 /* 10 MHz - PLL input clock */ #define CONFIG_SYS_8xx_CPUCLK_MIN 15000000 /* 15 MHz - CPU minimum clock */ #define CONFIG_SYS_8xx_CPUCLK_MAX 133000000 /* 133 MHz - CPU maximum clock */ diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h index 50197f4..2654a44 100644 --- a/include/configs/TOP5200.h +++ b/include/configs/TOP5200.h @@ -45,6 +45,14 @@ #define CONFIG_MPC5200 1 /* More exactly a MPC5200 */ #define CONFIG_TOP5200 1 /* ... on TOP5200 board - we need this for FEC.C */ +/* + * allowed and functional CONFIG_SYS_TEXT_BASE values: + * 0xff000000 low boot at 0x00000100 (default board setting) + * 0xfff00000 high boot at 0xfff00100 (board needs modification) + * 0x00100000 RAM load and test + */ +#define CONFIG_SYS_TEXT_BASE 0xff000000 + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -138,11 +146,11 @@ /* * MUST be low boot - HIGHBOOT is not supported anymore */ -#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ # define CONFIG_SYS_LOWBOOT 1 # define CONFIG_SYS_LOWBOOT16 1 #else -# error "TEXT_BASE must be 0xff000000" +# error "CONFIG_SYS_TEXT_BASE must be 0xff000000" #endif /* @@ -299,7 +307,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 diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h index b9e450d..8bc87e3 100644 --- a/include/configs/TOP860.h +++ b/include/configs/TOP860.h @@ -53,6 +53,9 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_MPC860T 1 /* even better... an FEC! */ #define CONFIG_TOP860 1 /* ...on a TOP860 module */ + +#define CONFIG_SYS_TEXT_BASE 0x80000000 + #undef CONFIG_WATCHDOG /* watchdog disabled */ #define CONFIG_IDENT_STRING " EMK TOP860" @@ -212,7 +215,7 @@ * adresses */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ /*----------------------------------------------------------------------- diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 107bff1..f9d1110 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -37,6 +37,17 @@ #define CONFIG_TQM5200 1 /* ... on TQM5200 module */ #undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFC000000 boot low (standard configuration with room for + * max 64 MByte Flash ROM) + * 0xFFF00000 boot high (for a backup copy of U-Boot) + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFC000000 +#endif + /* On a Cameron or on a FO300 board or ... */ #if !defined(CONFIG_CAM5200) && !defined(CONFIG_FO300) #define CONFIG_STK52XX 1 /* ... on a STK52XX board */ @@ -214,7 +225,7 @@ #define CONFIG_TIMESTAMP /* display image timestamps */ -#if (TEXT_BASE != 0xFFF00000) +#if (CONFIG_SYS_TEXT_BASE != 0xFFF00000) # define CONFIG_SYS_LOWBOOT 1 /* Boot low */ #endif @@ -489,7 +500,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 diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 372c76d..c2753a6 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -36,6 +36,8 @@ #define CONFIG_MPC823 1 /* This is a MPC823 CPU */ #define CONFIG_TQM823L 1 /* ...on a TQM8xxL module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #ifdef CONFIG_LCD /* with LCD controller ? */ #define CONFIG_LCD_LOGO 1 /* print our logo on the LCD */ #define CONFIG_LCD_INFO 1 /* ... and some board info */ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 64c9707..028cff7 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -36,6 +36,8 @@ #define CONFIG_MPC823 1 /* This is a MPC823 CPU */ #define CONFIG_TQM823M 1 /* ...on a TQM8xxM module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #ifdef CONFIG_LCD /* with LCD controller ? */ /* #define CONFIG_NEC_NL6448BC20 1 / * use NEC NL6448BC20 display */ #endif diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h index 582e670..5cbab9b 100644 --- a/include/configs/TQM8260.h +++ b/include/configs/TQM8260.h @@ -44,6 +44,8 @@ * (easy to change) */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_MPC8260 1 /* This is a MPC8260 CPU */ #if 0 @@ -279,7 +281,7 @@ /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/tqm8260/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/tqm8260/config.mk * The main FLASH is whichever is connected to *CS0. */ #define CONFIG_SYS_FLASH0_BASE 0x40000000 @@ -375,7 +377,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH0_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc()*/ diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h index 12a7eda..a8a9ddf 100644 --- a/include/configs/TQM8272.h +++ b/include/configs/TQM8272.h @@ -37,6 +37,8 @@ #define CONFIG_MPC8272_FAMILY 1 #define CONFIG_TQM8272 1 +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_GET_CPU_STR_F 1 /* Get the CPU ID STR */ #define CONFIG_BOARD_GET_CPU_CLK_F 1 /* Get the CLKIN from board fct */ @@ -357,7 +359,7 @@ /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/tqm8272/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/tqm8272/config.mk * The main FLASH is whichever is connected to *CS0. */ #define CONFIG_SYS_FLASH0_BASE 0x40000000 @@ -498,7 +500,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH0_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index d0c6a4d..a34e442 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -37,6 +37,8 @@ #define CONFIG_MPC8349 1 /* MPC8349 specific */ #define CONFIG_TQM834X 1 /* TQM834X board specific */ +#define CONFIG_SYS_TEXT_BASE 0x80000000 + /* IMMR Base Addres Register, use Freescale default: 0xff400000 */ #define CONFIG_SYS_IMMR 0xff400000 @@ -139,7 +141,7 @@ /* * Monitor config */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) # define CONFIG_SYS_RAMBOOT diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index bf6ecce..2e091f8 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -36,6 +36,8 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_TQM850L 1 /* ...on a TQM8xxL module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 7442452..2c988c3 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -36,6 +36,8 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_TQM850M 1 /* ...on a TQM8xxM module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 5bf8f02..f4ab989 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -36,6 +36,8 @@ #define CONFIG_MPC855 1 /* This is a MPC855 CPU */ #define CONFIG_TQM855L 1 /* ...on a TQM8xxL module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 456ed7e..c92a6ac 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -36,6 +36,8 @@ #define CONFIG_MPC855 1 /* This is a MPC855 CPU */ #define CONFIG_TQM855M 1 /* ...on a TQM8xxM module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index ccb339d..d95f75d 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -41,6 +41,12 @@ #define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_MPC85xx 1 /* MPC8540/60/55/41 */ +#if defined(CONFIG_TQM8548_BE) +#define CONFIG_SYS_TEXT_BASE 0xfff80000 +#else +#define CONFIG_SYS_TEXT_BASE 0xfffc0000 +#endif + #if defined(CONFIG_TQM8548_AG) || defined(CONFIG_TQM8548_BE) #define CONFIG_TQM8548 #endif @@ -75,7 +81,7 @@ * NAND flash support (disabled by default) * * Warning: NAND support will likely increase the U-Boot image size - * to more than 256 KB. Please adjust TEXT_BASE if necessary. + * to more than 256 KB. Please adjust CONFIG_SYS_TEXT_BASE if necessary. */ #ifdef CONFIG_TQM8548_BE #define CONFIG_NAND @@ -219,7 +225,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ /* * Note: when changing the Local Bus clock divider you have to @@ -243,7 +249,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_LEN (~TEXT_BASE + 1)/* Reserved for Monitor */ +#define CONFIG_SYS_MONITOR_LEN (~CONFIG_SYS_TEXT_BASE + 1)/* Reserved for Monitor */ #define CONFIG_SYS_MALLOC_LEN (384 * 1024) /* Reserved for malloc */ /* Serial Port */ @@ -659,7 +665,7 @@ MK_STR(CONFIG_HOSTNAME)".dtb\0" #define CONFIG_ENV_BOOTFILE "bootfile="MK_STR(CONFIG_HOSTNAME)"/uImage\0" #define CONFIG_ENV_UBOOT "uboot="MK_STR(CONFIG_HOSTNAME)"/u-boot.bin\0" \ - "uboot_addr="MK_STR(TEXT_BASE)"\0" + "uboot_addr="MK_STR(CONFIG_SYS_TEXT_BASE)"\0" #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_ENV_BOOTFILE \ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 94b9a3b..ff629cf 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -36,6 +36,8 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_TQM860L 1 /* ...on a TQM8xxL module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index ce5e691..aa682f3 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -36,6 +36,8 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_TQM860M 1 /* ...on a TQM8xxM module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index d77df9c..f36ef19 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -39,6 +39,8 @@ #define CONFIG_TQM862L 1 /* ...on a TQM8xxL module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index a6c465b..fb8f538 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -39,6 +39,8 @@ #define CONFIG_TQM862M 1 /* ...on a TQM8xxM module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 9ec815c..f92bab0 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -36,6 +36,8 @@ #define CONFIG_MPC866 1 /* This is a MPC866 CPU */ #define CONFIG_TQM866M 1 /* ...on a TQM8xxM module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_OSCLK 10000000 /* 10 MHz - PLL input clock */ #define CONFIG_SYS_8xx_CPUCLK_MIN 15000000 /* 15 MHz - CPU minimum clock */ #define CONFIG_SYS_8xx_CPUCLK_MAX 133000000 /* 133 MHz - CPU maximum clock */ diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index c715c07..7418512 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -39,6 +39,8 @@ #define CONFIG_MPC885 1 /* This is a MPC885 CPU */ #define CONFIG_TQM885D 1 /* ...on a TQM88D module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_OSCLK 10000000 /* 10 MHz - PLL input clock */ #define CONFIG_SYS_8xx_CPUCLK_MIN 15000000 /* 15 MHz - CPU minimum clock */ #define CONFIG_SYS_8xx_CPUCLK_MAX 133000000 /* 133 MHz - CPU maximum clock */ diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index 7510ab1..be0a9f8 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -44,6 +44,16 @@ #define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */ #define CONFIG_TOTAL5200 1 /* ... on Total5200 board */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFFF00000 boot high (standard configuration) + * 0xFE000000 boot low + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -132,7 +142,7 @@ #define CONFIG_CMD_USB -#if (TEXT_BASE == 0xFE000000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFE000000) /* Boot low */ # define CONFIG_SYS_LOWBOOT 1 #endif @@ -245,7 +255,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 diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h index b9ea610..8dbee86 100644 --- a/include/configs/VOH405.h +++ b/include/configs/VOH405.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_VOH405 1 /* ...on a VOH405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ @@ -257,7 +259,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFFF80000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (2 * 1024*1024) /* Reserve 2 MB for malloc() */ diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index a88b41a..63e6ca8 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -35,6 +35,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_VOM405 1 /* ...on a VOM405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC8000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ @@ -183,8 +185,8 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_MONITOR_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (~(TEXT_BASE) + 1) +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_LEN (~(CONFIG_SYS_TEXT_BASE) + 1) #define CONFIG_SYS_MALLOC_LEN (256 * 1024) #if (CONFIG_SYS_MONITOR_BASE < FLASH_BASE0_PRELIM) diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h index 3614184..805764a 100644 --- a/include/configs/VoVPN-GW.h +++ b/include/configs/VoVPN-GW.h @@ -29,6 +29,8 @@ /* define busmode: 8260 */ #undef CONFIG_BUSMODE_60x +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + /* system clock rate (CLKIN) - equal to the 60x and local bus speed */ #ifdef CONFIG_CLKIN_66MHz #define CONFIG_8260_CLKIN 66666666 /* in Hz */ @@ -308,7 +310,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_SIZE (32*1024*1024) -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_FLASH (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_OFFSET) #define CONFIG_SYS_MONITOR_LEN 0x00020000 #define CONFIG_SYS_MALLOC_LEN 0x00020000 diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h index 0fbe80c..fce7f28 100644 --- a/include/configs/W7OLMC.h +++ b/include/configs/W7OLMC.h @@ -38,6 +38,8 @@ #define CONFIG_W7O 1 /* ...on a Wave 7 Optics board */ #define CONFIG_W7OLMC 1 /* ...specifically an LMC */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_MISC_INIT_F 1 /* and misc_init_f() */ #define CONFIG_MISC_INIT_R 1 /* and misc_init_r() */ diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h index f12fa55..0144fbd 100644 --- a/include/configs/W7OLMG.h +++ b/include/configs/W7OLMG.h @@ -38,6 +38,8 @@ #define CONFIG_W7O 1 /* ...on a Wave 7 Optics board */ #define CONFIG_W7OLMG 1 /* ...specifically an LMG */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_MISC_INIT_F 1 /* and misc_init_f() */ #define CONFIG_MISC_INIT_R 1 /* and misc_init_r() */ diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h index 34a5fff..3ca19fc 100644 --- a/include/configs/WUH405.h +++ b/include/configs/WUH405.h @@ -38,6 +38,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_WUH405 1 /* ...on a WUH405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/XPEDITE1000.h b/include/configs/XPEDITE1000.h index 8b47862..b2399c6 100644 --- a/include/configs/XPEDITE1000.h +++ b/include/configs/XPEDITE1000.h @@ -39,6 +39,8 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + /* * DDR config */ @@ -52,7 +54,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xff000000 /* start of FLASH */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_PCI_MEMBASE 0x80000000 /* mapped pci memory */ #define CONFIG_SYS_ISRAM_BASE 0xc0000000 /* internal SRAM */ #define CONFIG_SYS_PCI_BASE 0xd0000000 /* internal PCI regs */ @@ -269,7 +271,7 @@ extern void out32(unsigned int, unsigned long); * ff000000 - ffbfffff OS Use/Filesystem (12MB) */ -#define CONFIG_UBOOT_ENV_ADDR MK_STR(TEXT_BASE) +#define CONFIG_UBOOT_ENV_ADDR MK_STR(CONFIG_SYS_TEXT_BASE) #define CONFIG_FDT_ENV_ADDR MK_STR(0xfff00000) #define CONFIG_OS_ENV_ADDR MK_STR(0xffc00000) diff --git a/include/configs/XPEDITE5170.h b/include/configs/XPEDITE5170.h index 306baed..31ca59d 100644 --- a/include/configs/XPEDITE5170.h +++ b/include/configs/XPEDITE5170.h @@ -40,6 +40,8 @@ #define CONFIG_HIGH_BATS 1 /* High BATs supported and enabled */ #define CONFIG_ALTIVEC 1 +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI_PNP 1 /* do pci plug-and-play */ #define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */ @@ -152,7 +154,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_FLASH_AUTOPROTECT_LIST { {0xfff00000, 0xc0000}, \ {0xf7f00000, 0xc0000} } -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_BASE_EARLY 0xfff00000 /* early monitor loc */ /* @@ -492,7 +494,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); BATL_PP_RW |\ BATL_CACHEINHIBIT |\ BATL_GUARDEDSTORAGE) -#define CONFIG_SYS_DBAT6U_EARLY (TEXT_BASE |\ +#define CONFIG_SYS_DBAT6U_EARLY (CONFIG_SYS_TEXT_BASE |\ BATU_BL_1M |\ BATU_VS |\ BATU_VP) diff --git a/include/configs/XPEDITE5200.h b/include/configs/XPEDITE5200.h index 1fbe4fb..1f27c5e 100644 --- a/include/configs/XPEDITE5200.h +++ b/include/configs/XPEDITE5200.h @@ -38,6 +38,10 @@ #define CONFIG_SYS_BOARD_NAME "XPedite5200" #define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xfff80000 +#endif + #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI_PNP 1 /* do pci plug-and-play */ #define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */ @@ -130,7 +134,7 @@ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_FLASH_AUTOPROTECT_LIST { {0xfff40000, 0xc0000}, \ {0xfbf40000, 0xc0000} } -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ /* * Chip select configuration diff --git a/include/configs/XPEDITE5370.h b/include/configs/XPEDITE5370.h index 8225fff..24ee65e 100644 --- a/include/configs/XPEDITE5370.h +++ b/include/configs/XPEDITE5370.h @@ -38,6 +38,10 @@ #define CONFIG_SYS_BOARD_NAME "XPedite5370" #define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xfff80000 +#endif + #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI_PNP 1 /* do pci plug-and-play */ #define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */ @@ -151,7 +155,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define CONFIG_SYS_FLASH_AUTOPROTECT_LIST { {0xfff40000, 0xc0000}, \ {0xf7f40000, 0xc0000} } -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ /* * Chip select configuration diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h index 8ec6c84..398a70d 100644 --- a/include/configs/Yukon8220.h +++ b/include/configs/Yukon8220.h @@ -31,6 +31,8 @@ #define CONFIG_MPC8220 1 #define CONFIG_YUKON8220 1 /* ... on Yukon board */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_BAT_RW 1 /* Use common BAT rw code */ #define CONFIG_HIGH_BATS 1 /* High BATs supported */ @@ -264,7 +266,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 diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 8ae765c..d305fa4 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -29,6 +29,9 @@ #define CONFIG_MPC8260 1 /* This is an MPC8260 CPU */ #define CONFIG_ZPC1900 1 /* ...on Zephyr ZPC.1900 board */ + +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CPU_ID_STR "MPC8265" #define CONFIG_CPM2 1 /* Has a CPM2 */ @@ -215,7 +218,7 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ -#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 #endif diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index fcc47a9..b161dde 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -41,6 +41,8 @@ #define CONFIG_EVB64260 1 /* this is an EVB64260 board */ #define CONFIG_ZUMA_V2 1 /* always define this for ZUMA v2 */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + /* #define CONFIG_ZUMA_V2_OLD 1 */ /* backwards compat for old V2 board */ #define CONFIG_BAUDRATE 38400 /* console baudrate = 38400 */ diff --git a/include/configs/acadia.h b/include/configs/acadia.h index 39f85ae..c1bd4be 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -35,6 +35,10 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_405EZ 1 /* Specifc 405EZ support*/ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 +#endif + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/aev.h b/include/configs/aev.h index 54e6c57..187e5c1 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -41,6 +41,17 @@ #define CONFIG_AEVFIFO 1 #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFC000000 boot low (standard configuration with room for + * max 64 MByte Flash ROM) + * 0xFFF00000 boot high (for a backup copy of U-Boot) + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFC000000 +#endif + #define CONFIG_HIGH_BATS 1 /* High BATs supported */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -128,7 +139,7 @@ #define CONFIG_TIMESTAMP /* display image timestamps */ -#if (TEXT_BASE == 0xFC000000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFC000000) /* Boot low */ # define CONFIG_SYS_LOWBOOT 1 #endif @@ -221,7 +232,7 @@ /* * Flash configuration */ -#define CONFIG_SYS_FLASH_BASE TEXT_BASE /* 0xFC000000 */ +#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE /* 0xFC000000 */ /* use CFI flash driver if no module variant is spezified */ #define CONFIG_SYS_FLASH_CFI 1 /* Flash is CFI conformant */ @@ -273,7 +284,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 diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 7038291..74a0781 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -33,6 +33,9 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ #define CONFIG_LAST_STAGE_INIT 1 /* call last_stage_init() */ + +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ #define CONFIG_4xx_DCACHE /* Enable i- and d-cache */ diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 9c53d37..b9f1f6b 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -24,7 +24,7 @@ #define __AMCC_COMMON_H #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* Start of U-Boot */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of U-Boot */ #define CONFIG_SYS_MONITOR_LEN (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1) #define CONFIG_SYS_MALLOC_LEN (1 << 20) /* Reserved for malloc */ diff --git a/include/configs/aria.h b/include/configs/aria.h index c5a3feb..3f1e7f7 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -51,6 +51,8 @@ #define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ #define CONFIG_FSL_DIU_LOGO_BMP 1 /* Don't include FSL DIU binary bmp */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + /* video */ #undef CONFIG_VIDEO @@ -305,7 +307,7 @@ 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 #define CONFIG_SYS_MONITOR_LEN (384 * 1024) #ifdef CONFIG_FSL_DIU_FB diff --git a/include/configs/assabet.h b/include/configs/assabet.h index d17d4bd..58cdbd5 100644 --- a/include/configs/assabet.h +++ b/include/configs/assabet.h @@ -140,7 +140,7 @@ #define PHYS_FLASH_BANK_SIZE 0x01000000 /* 16 MB Banks */ #define PHYS_FLASH_SECT_SIZE 0x00040000 /* 256 KB sectors (x2) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 KB for Monitor */ #if CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 7c8281c..f2bc26a 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -69,17 +69,17 @@ #include <config_cmd_default.h> /* - * CONFIG_MK_RAM defines if u-boot is loaded via BDM (or started from + * CONFIG_RAM defines if u-boot is loaded via BDM (or started from * a different bootloader that has already performed RAM setup) or * started directly from flash, which is the regular case for production * boards. */ -#ifdef CONFIG_MK_RAM +#ifdef CONFIG_RAM #define CONFIG_MONITOR_IS_IN_RAM -#define CONFIG_TEXT_BASE 0x40020000 +#define CONFIG_SYS_TEXT_BASE 0x40020000 #define ENABLE_JFFS 0 #else -#define CONFIG_TEXT_BASE 0x00000000 +#define CONFIG_SYS_TEXT_BASE 0x00000000 #define ENABLE_JFFS 1 #endif @@ -343,7 +343,7 @@ #define CONFIG_SYS_FLASH_BASE 0x00000000 #ifdef CONFIG_MONITOR_IS_IN_RAM -#define CONFIG_SYS_MONITOR_BASE CONFIG_TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #else /* This is mainly used during relocation in start.S */ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) diff --git a/include/configs/atc.h b/include/configs/atc.h index 24015b7..8ec8c79 100644 --- a/include/configs/atc.h +++ b/include/configs/atc.h @@ -37,6 +37,8 @@ #define CONFIG_ATC 1 /* ...on a ATC board */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#define CONFIG_SYS_TEXT_BASE 0xFF000000 + /* * select serial console configuration * @@ -256,7 +258,7 @@ */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_MAX_SIZE 0x08000000 /* max. 128 MB */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 18276c5..1bdfd9d 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -36,6 +36,10 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 +#endif + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/barco.h b/include/configs/barco.h index b1af701..9073b2f 100644 --- a/include/configs/barco.h +++ b/include/configs/barco.h @@ -62,6 +62,8 @@ #define CONFIG_MPC8245 1 #define CONFIG_BARCOBCD_STREAMING 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #undef USE_DINK32 #define CONFIG_CONS_INDEX 3 /* set to '3' for on-chip DUART */ @@ -156,7 +158,7 @@ #else #undef CONFIG_SYS_RAMBOOT #define CONFIG_SYS_MONITOR_LEN 0x00030000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_GBL_DATA_SIZE 128 diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 54fc063..fa9053b 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -154,7 +154,7 @@ /* * Video Settings */ -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1 # define CONFIG_LQ035Q1_SPI_BUS 0 # define CONFIG_LQ035Q1_SPI_CS 7 #endif diff --git a/include/configs/bluestone.h b/include/configs/bluestone.h index 560c64f..0bb97d9 100644 --- a/include/configs/bluestone.h +++ b/include/configs/bluestone.h @@ -31,6 +31,11 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_440 1 + +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 +#endif + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index 3e64492..7262b3e 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_BUBINGA 1 /* ...on a BUBINGA board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h index 4508d75..15d79c4 100644 --- a/include/configs/c2mon.h +++ b/include/configs/c2mon.h @@ -36,6 +36,8 @@ #define CONFIG_MPC855 1 /* This is a MPC855 CPU */ #define CONFIG_C2MON 1 /* ...on a C2MON module */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_80MHz 1 /* Running at 5 * 16 = 80 MHz */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ diff --git a/include/configs/canmb.h b/include/configs/canmb.h index 1f275e5..0f2f386 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -33,6 +33,13 @@ #define CONFIG_MPC5200 1 /* More exactly a MPC5200 */ #define CONFIG_CANMB 1 /* ... on canmb board - we need this for FEC.C */ +/* + * allowed and functional CONFIG_SYS_TEXT_BASE values: + * 0xfe000000 low boot at 0x00000100 (default board setting) + * 0x00100000 RAM load and test + */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -77,11 +84,11 @@ /* * MUST be low boot - HIGHBOOT is not supported anymore */ -#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_LOWBOOT16 1 #else -# error "TEXT_BASE must be 0xFE000000" +# error "CONFIG_SYS_TEXT_BASE must be 0xFE000000" #endif /* @@ -160,7 +167,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 diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index 51087f7..fcc7d0e 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -48,6 +48,10 @@ #define CONFIG_440 1 #define CONFIG_4xx 1 /* ... PPC4xx family */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 +#endif + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 72cf941..84311e3 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -31,6 +31,8 @@ #define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_CM5200 1 /* ... on CM5200 platform */ +#define CONFIG_SYS_TEXT_BASE 0xfc000000 + #define CONFIG_HIGH_BATS 1 /* High BATs supported */ /* @@ -169,7 +171,7 @@ #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 #define CONFIG_SYS_MONITOR_LEN (384 << 10) /* 384 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (256 << 10) /* 256 kB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* initial mem map for Linux */ diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h index c3c603b..72fdb6b 100644 --- a/include/configs/cmi_mpc5xx.h +++ b/include/configs/cmi_mpc5xx.h @@ -38,6 +38,8 @@ #define CONFIG_MPC555 1 /* This is an MPC555 CPU */ #define CONFIG_CMI 1 /* Using the customized cmi board */ +#define CONFIG_SYS_TEXT_BASE 0x02000000 /* Boot from flash at location 0x00000000 */ + /* Serial Console Configuration */ #define CONFIG_5xx_CONS_SCI1 #undef CONFIG_5xx_CONS_SCI2 @@ -142,7 +144,7 @@ #define ANYBUS_BASE 0x03010000 /* Anybus Module */ #define CONFIG_SYS_RESET_ADRESS 0x01000000 /* Adress which causes reset */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* TEXT_BASE is defined in the board config.mk file. */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* CONFIG_SYS_TEXT_BASE is defined in the board config.mk file. */ /* This adress is given to the linker with -Ttext to */ /* locate the text section at this adress. */ #define CONFIG_SYS_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 330e3ac..18710fb 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -107,7 +107,7 @@ * * Setting #if 0: u-boot will start from flash and relocate itself to RAM * - * Please do not forget to modify the setting of TEXT_BASE + * Please do not forget to modify the setting of CONFIG_SYS_TEXT_BASE * in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000) * * --- diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h index 566565a..444fce6 100644 --- a/include/configs/cogent_mpc8260.h +++ b/include/configs/cogent_mpc8260.h @@ -37,6 +37,8 @@ #define CONFIG_COGENT 1 /* using Cogent Modular Architecture */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */ #define CONFIG_MISC_INIT_R /* Use misc_init_r() */ @@ -238,7 +240,7 @@ #else #define CONFIG_SYS_FLASH_BASE CMA_MB_FLASH_BASE /* flash on m/b */ #endif -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc()*/ @@ -368,7 +370,7 @@ * (the *_SIZE vars must be a power of 2) */ -#define CONFIG_SYS_CMA_CS0_BASE TEXT_BASE /* EPROM */ +#define CONFIG_SYS_CMA_CS0_BASE CONFIG_SYS_TEXT_BASE /* EPROM */ #define CONFIG_SYS_CMA_CS0_SIZE (1 << 20) #if 0 #define CONFIG_SYS_CMA_CS2_BASE 0x10000000 /* Local Bus SDRAM */ diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h index 750c0df..a23db1c 100644 --- a/include/configs/cogent_mpc8xx.h +++ b/include/configs/cogent_mpc8xx.h @@ -36,6 +36,8 @@ #define CONFIG_MPC860 1 /* This is an MPC860 CPU */ #define CONFIG_COGENT 1 /* using Cogent Modular Architecture */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */ #define CONFIG_MISC_INIT_R /* Use misc_init_r() */ @@ -185,7 +187,7 @@ #else #define CONFIG_SYS_FLASH_BASE CMA_MB_FLASH_BASE /* flash on m/b */ #endif -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (128 << 10) /* Reserve 128 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ @@ -310,7 +312,7 @@ * (the *_SIZE vars must be a power of 2) */ -#define CONFIG_SYS_CMA_CS0_BASE TEXT_BASE /* EPROM */ +#define CONFIG_SYS_CMA_CS0_BASE CONFIG_SYS_TEXT_BASE /* EPROM */ #define CONFIG_SYS_CMA_CS0_SIZE (1 << 20) #define CONFIG_SYS_CMA_CS1_BASE CMA_MB_RAM_BASE /* RAM + I/O SLOT 1 */ #define CONFIG_SYS_CMA_CS1_SIZE (64 << 20) diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 9184eeb..9af0a73 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -240,7 +240,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7 @@ -619,7 +619,7 @@ "bank_intlv=cs0_cs1\0" \ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ - "ubootaddr=" MK_STR(TEXT_BASE) "\0" \ + "ubootaddr=" MK_STR(CONFIG_SYS_TEXT_BASE) "\0" \ "tftpflash=tftpboot $loadaddr $uboot && " \ "protect off $ubootaddr +$filesize && " \ "erase $ubootaddr +$filesize && " \ diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h index f7290d6..2bedae2 100644 --- a/include/configs/cpci5200.h +++ b/include/configs/cpci5200.h @@ -45,6 +45,10 @@ #define CONFIG_CPCI5200 1 /* ... on CPCI5200 board */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 /* Standard: boot high */ +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -126,11 +130,11 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_DATE -#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ # define CONFIG_SYS_LOWBOOT 1 # define CONFIG_SYS_LOWBOOT16 1 #endif -#if (TEXT_BASE == 0xFF800000) /* Boot low with 8 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF800000) /* Boot low with 8 MB Flash */ # define CONFIG_SYS_LOWBOOT 1 # define CONFIG_SYS_LOWBOOT08 1 #endif @@ -240,7 +244,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 diff --git a/include/configs/csb272.h b/include/configs/csb272.h index 7108210..24367ba 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -40,6 +40,8 @@ #define CONFIG_LAST_STAGE_INIT 1 /* Call last_stage_init() */ #define CONFIG_SYS_CLK_FREQ 33000000 /* external frequency to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + /* * OS Bootstrap configuration * @@ -251,7 +253,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFE000000 #define CONFIG_SYS_FLASH_SIZE 0x02000000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 KB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 KB for malloc() */ diff --git a/include/configs/csb472.h b/include/configs/csb472.h index 7b9f29a..ad8811f 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -40,6 +40,8 @@ #define CONFIG_LAST_STAGE_INIT 1 /* Call last_stage_init() */ #define CONFIG_SYS_CLK_FREQ 25000000 /* external frequency to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + /* * OS Bootstrap configuration * @@ -250,7 +252,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFF800000 #define CONFIG_SYS_FLASH_SIZE 0x00800000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 KB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 KB for malloc() */ diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index 4c01844..1746495 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -118,6 +118,7 @@ #define CONFIG_SYS_NAND_CS 2 #undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_OVERWRITE /* instead if obsoleted forceenv() */ #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */ #define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */ diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index b439c80..d8c9362 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -186,7 +186,7 @@ #define CONFIG_FLASH_CFI_DRIVER 1 /* The following #defines are needed to get flash environment right */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 diff --git a/include/configs/debris.h b/include/configs/debris.h index dc59df9..42b8c34 100644 --- a/include/configs/debris.h +++ b/include/configs/debris.h @@ -30,6 +30,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + /* Environments */ /* bootargs */ @@ -204,7 +206,7 @@ #else #undef CONFIG_SYS_RAMBOOT #define CONFIG_SYS_MONITOR_LEN 0x00040000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /*#define CONFIG_SYS_GBL_DATA_SIZE 256*/ #define CONFIG_SYS_GBL_DATA_SIZE 128 diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 7a1a7c3..3368b2d 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -40,6 +40,16 @@ #define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_DIGSY_MTC 1 /* ... on InterControl digsyMTC board */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFFF00000 boot high (standard configuration) + * 0xFE000000 boot low + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 /* Standard: boot high */ +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 #define BOOTFLAG_COLD 0x01 @@ -103,7 +113,7 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_USB -#if (TEXT_BASE == 0xFF000000) +#if (CONFIG_SYS_TEXT_BASE == 0xFF000000) #define CONFIG_SYS_LOWBOOT 1 #endif @@ -308,7 +318,7 @@ (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 diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index 21d2d28..0d44eda 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -28,6 +28,8 @@ #define CONFIG_4xx 1 /* member of PPC4xx family */ #define CONFIG_DLVISION 1 /* on a Neo board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/eNET.h b/include/configs/eNET.h index fc7c1c6..78cab29 100644 --- a/include/configs/eNET.h +++ b/include/configs/eNET.h @@ -172,7 +172,7 @@ #define CONFIG_SYS_STACK_SIZE 0x8000 /* Size of bootloader stack */ #define CONFIG_SYS_BL_START_FLASH 0x38040000 /* Address of relocated code */ #define CONFIG_SYS_BL_START_RAM 0x03fd0000 /* Address of relocated code */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CONFIG_SYS_FLASH_BASE 0x38000000 /* Boot Flash */ #define CONFIG_SYS_FLASH_BASE_1 0x10000000 /* StrataFlash 1 */ diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h index 85bf236..bacdbf0 100644 --- a/include/configs/eXalion.h +++ b/include/configs/eXalion.h @@ -40,6 +40,8 @@ #define CONFIG_MPC8245 1 #define CONFIG_EXALION 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #if defined (CONFIG_MPC8240) /* #warning ---------- eXalion with MPC8240 --------------- */ #elif defined (CONFIG_MPC8245) @@ -109,7 +111,7 @@ #undef CONFIG_SYS_RAMBOOT #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /*----------------------------------------------------------------------- * Definitions for initial stack pointer and data area diff --git a/include/configs/ebony.h b/include/configs/ebony.h index 8c3284a..a0d3869 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -37,6 +37,8 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 4b00391..ff25ee2 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -5,21 +5,21 @@ #ifndef __CONFIG_H #define __CONFIG_H -#ifdef CONFIG_MK_edb9301 +#ifdef CONFIG_edb9301 #define CONFIG_EDB9301 -#elif defined(CONFIG_MK_edb9302) +#elif defined(CONFIG_edb9302) #define CONFIG_EDB9302 -#elif defined(CONFIG_MK_edb9302a) +#elif defined(CONFIG_edb9302a) #define CONFIG_EDB9302A -#elif defined(CONFIG_MK_edb9307) +#elif defined(CONFIG_edb9307) #define CONFIG_EDB9307 -#elif defined(CONFIG_MK_edb9307a) +#elif defined(CONFIG_edb9307a) #define CONFIG_EDB9307A -#elif defined(CONFIG_MK_edb9312) +#elif defined(CONFIG_edb9312) #define CONFIG_EDB9312 -#elif defined(CONFIG_MK_edb9315) +#elif defined(CONFIG_edb9315) #define CONFIG_EDB9315 -#elif defined(CONFIG_MK_edb9315a) +#elif defined(CONFIG_edb9315a) #define CONFIG_EDB9315A #else #error "no board defined" diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index a738425..1576533 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -31,6 +31,8 @@ #define CONFIG_EP8248 /* Embedded Planet EP8248 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ /* Allow serial number (serial#) and MAC address (ethaddr) to be overwritten */ @@ -197,7 +199,7 @@ #define CONFIG_SYS_I2C_SLAVE 0x7F /* I2C slave address */ #endif -#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 #endif diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index 3f4425a..ab646ae 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -48,6 +48,8 @@ #define CONFIG_SYS_EP8260_H2 1 /* #undef CONFIG_SYS_EP8260_H2 */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_CPM2 1 /* Has a CPM2 */ /* What is the oscillator's (UX2) frequency in Hz? */ @@ -97,7 +99,7 @@ #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100 /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/ep8260/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/ep8260/config.mk * The main FLASH is whichever is connected to *CS0. U-Boot expects * this to be the SIMM. */ @@ -438,7 +440,7 @@ * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0 * Note also that the logic that sets CONFIG_SYS_RAMBOOT is platform dependent. */ -#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) diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index b52b941..90407a8 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -31,6 +31,8 @@ #define CONFIG_EP82XXM /* Embedded Planet EP82xxM H 1.0 board */ /* 256MB SDRAM / 64MB FLASH */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ /* Allow serial number (serial#) and MAC address (ethaddr) to be overwritten */ @@ -333,7 +335,7 @@ #define CONFIG_SYS_I2C_SLAVE 0x7F /* I2C slave address */ #endif -#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 #endif diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h index 29951f7..f6585d0 100644 --- a/include/configs/galaxy5200.h +++ b/include/configs/galaxy5200.h @@ -46,6 +46,20 @@ #define BOOTFLAG_WARM 0x02 /* Software reboot */ /* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFFF00000 boot high (standard configuration) + * 0xFE000000 boot low + * 0x00100000 boot from RAM (for testing only) does not work + */ +#ifdef CONFIG_galaxy5200_LOWBOOT +#define CONFIG_SYS_TEXT_BASE 0xFE000000 +#endif + +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 /* Standard: boot high */ +#endif + +/* * Serial console configuration */ #define CONFIG_PSC_CONSOLE 4 /* console is on PSC4 -> */ @@ -76,7 +90,7 @@ #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ -#if (TEXT_BASE == 0xFE000000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFE000000) /* Boot low */ #define CONFIG_SYS_LOWBOOT 1 #endif /* RAMBOOT will be defined automatically in memory section */ @@ -204,7 +218,7 @@ 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 diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h index d6db7bf..282afbc 100644 --- a/include/configs/gdppc440etx.h +++ b/include/configs/gdppc440etx.h @@ -40,6 +40,8 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_SYS_CLK_FREQ 66666666 /* external freq to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index d188439..bb4ea79 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -270,7 +270,7 @@ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_PROM_OFFSET-32) #define CONFIG_SYS_STACK_SIZE (0x10000-32) -#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 @@ -287,7 +287,7 @@ #define CONFIG_SYS_RELOC_MONITOR_BASE (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN) /* make un relocated address from relocated address */ -#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)) +#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)) /* * Ethernet configuration uses on board SMC91C111 diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 3a568ff..35c4a08 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -238,7 +238,7 @@ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_PROM_OFFSET-32) #define CONFIG_SYS_STACK_SIZE (0x10000-32) -#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 @@ -255,7 +255,7 @@ #define CONFIG_SYS_RELOC_MONITOR_BASE (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN) /* make un relocated address from relocated address */ -#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)) +#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)) /* * Ethernet configuration uses on board SMC91C111, however if a mezzanine diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index 4dd9a0f..92fbbbb 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -215,7 +215,7 @@ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_PROM_OFFSET-32) #define CONFIG_SYS_STACK_SIZE (0x10000-32) -#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 @@ -232,7 +232,7 @@ #define CONFIG_SYS_RELOC_MONITOR_BASE (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN) /* make un relocated address from relocated address */ -#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)) +#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)) /* * Ethernet configuration diff --git a/include/configs/grsim.h b/include/configs/grsim.h index c3f1a31..5dfdf51 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -240,7 +240,7 @@ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_PROM_OFFSET-32) #define CONFIG_SYS_STACK_SIZE (0x10000-32) -#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 @@ -257,7 +257,7 @@ #define CONFIG_SYS_RELOC_MONITOR_BASE (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN) /* make un relocated address from relocated address */ -#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)) +#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)) /* * Ethernet configuration diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 7ebbf25..39af8fe 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -238,7 +238,7 @@ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_PROM_OFFSET-32) #define CONFIG_SYS_STACK_SIZE (0x10000-32) -#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 @@ -255,7 +255,7 @@ #define CONFIG_SYS_RELOC_MONITOR_BASE (CONFIG_SYS_RELOC_MONITOR_MAX_END-CONFIG_SYS_MONITOR_LEN) /* make un relocated address from relocated address */ -#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)) +#define UN_RELOC(address) (address-(CONFIG_SYS_RELOC_MONITOR_BASE-CONFIG_SYS_TEXT_BASE)) /* * Ethernet configuration diff --git a/include/configs/gth2.h b/include/configs/gth2.h index 677baea..b5f454c 100644 --- a/include/configs/gth2.h +++ b/include/configs/gth2.h @@ -141,7 +141,7 @@ #define PHYS_FLASH 0xbfc00000 /* Flash Bank #1 */ /* The following #defines are needed to get flash environment right */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h index 9ed3846..9e76467 100644 --- a/include/configs/gw8260.h +++ b/include/configs/gw8260.h @@ -50,6 +50,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_TEXT_BASE 0x40000000 + /* Enable debug prints */ #undef DEBUG_BOOTP_EXT /* Debug received vendor fields */ @@ -83,7 +85,7 @@ #define CONFIG_SYS_SBC_BOOT_LOW 1 /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/sbc8260/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/sbc8260/config.mk * The main FLASH is whichever is connected to *CS0. U-Boot expects * this to be the SIMM. */ diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h index 68bf998..dd5e5a2 100644 --- a/include/configs/hcu4.h +++ b/include/configs/hcu4.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 #define CONFIG_HOSTNAME hcu4 +#define CONFIG_SYS_TEXT_BASE 0xFFFB0000 + /* * Include common defines/options for all boards produced by Netstal Maschinen */ @@ -57,7 +59,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */ #define CONFIG_SYS_FLASH_BASE 0xfff80000 /* start of FLASH */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* ... with on-chip memory here (4KBytes) */ #define CONFIG_SYS_OCM_DATA_ADDR 0xF4000000 diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h index 5aa304d..a2edf51 100644 --- a/include/configs/hcu5.h +++ b/include/configs/hcu5.h @@ -41,6 +41,8 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_HOSTNAME hcu5 +#define CONFIG_SYS_TEXT_BASE 0xFFFB0000 + /* * Include common defines/options for all boards produced by Netstal Maschinen */ @@ -61,7 +63,7 @@ #define CONFIG_SYS_BOOT_BASE_ADDR 0xfff00000 #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */ #define CONFIG_SYS_FLASH_BASE 0xfff80000 /* start of FLASH */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_OCM_BASE 0xe0010000 /* ocm */ #define CONFIG_SYS_OCM_DATA_ADDR CONFIG_SYS_OCM_BASE #define CONFIG_SYS_PCI_BASE 0xe0000000 /* Internal PCI regs */ diff --git a/include/configs/hermes.h b/include/configs/hermes.h index 0df46fa..0c46398 100644 --- a/include/configs/hermes.h +++ b/include/configs/hermes.h @@ -36,6 +36,8 @@ #define CONFIG_MPC860 1 /* This is a MPC860T CPU */ #define CONFIG_HERMES 1 /* ...on a HERMES-PRO board */ +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index 8b0b773..edb9a3a 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -33,6 +33,10 @@ #define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_HMI1001 1 /* HMI1001 board */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -80,7 +84,7 @@ #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ -#if (TEXT_BASE == 0xFFF00000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFFF00000) /* Boot low */ # define CONFIG_SYS_LOWBOOT 1 #endif @@ -149,7 +153,7 @@ #define CONFIG_SYS_FLASH_SIZE 0x00800000 /* 8 MByte */ #define CONFIG_SYS_MAX_FLASH_SECT 67 /* max num of sects on one chip */ -#define CONFIG_ENV_ADDR (TEXT_BASE+0x40000) /* second sector */ +#define CONFIG_ENV_ADDR (CONFIG_SYS_TEXT_BASE+0x40000) /* second sector */ #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max num of flash banks (= chip selects) */ #define CONFIG_SYS_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */ @@ -204,7 +208,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 diff --git a/include/configs/hymod.h b/include/configs/hymod.h index 5a282ff..406f35c 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -37,6 +37,8 @@ #define CONFIG_HYMOD 1 /* ...on a Hymod board */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */ #define CONFIG_BOARD_POSTCLK_INIT /* have board_postclk_init() function */ @@ -386,8 +388,8 @@ * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0 */ #define CONFIG_SYS_SDRAM_BASE 0x00000000 -#define CONFIG_SYS_FLASH_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_FPGA_BASE 0x80000000 /* * unfortunately, CONFIG_SYS_MONITOR_LEN must include the diff --git a/include/configs/icon.h b/include/configs/icon.h index ad0ca5d..8d98d57 100644 --- a/include/configs/icon.h +++ b/include/configs/icon.h @@ -35,6 +35,9 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_440 1 /* ... PPC440 family */ #define CONFIG_440SPE 1 /* Specifc SPe support */ + +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 + #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ #define CONFIG_SYS_4xx_RESET_TYPE 0x2 /* use chip reset on this board */ diff --git a/include/configs/incaip.h b/include/configs/incaip.h index 2129dfd..b7ba6f4 100644 --- a/include/configs/incaip.h +++ b/include/configs/incaip.h @@ -139,7 +139,7 @@ #define PHYS_FLASH_2 0xb0800000 /* Flash Bank #2 */ /* The following #defines are needed to get flash environment right */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 69365e6..f779612 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -36,6 +36,15 @@ #define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_INKA4X0 1 /* INKA4x0 board */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFFE00000 boot low + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFE00000 /* Standard: boot low */ +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -105,7 +114,7 @@ #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ -#if (TEXT_BASE == 0xFFE00000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFFE00000) /* Boot low */ # define CONFIG_SYS_LOWBOOT 1 #endif @@ -214,7 +223,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 diff --git a/include/configs/intip.h b/include/configs/intip.h index 82c8282..56d2be2 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -45,6 +45,10 @@ #define CONFIG_440 1 #define CONFIG_4xx 1 /* ... PPC4xx family */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 +#endif + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 6903b36..05f66da 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -37,6 +37,8 @@ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ #define CONFIG_IPEK01 /* Motherboard is ipek01 */ +#define CONFIG_SYS_TEXT_BASE 0xfc000000 + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33MHz */ #define CONFIG_MISC_INIT_R @@ -274,7 +276,7 @@ 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 diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index 9c45acf..4b3b008 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -33,6 +33,15 @@ #define CONFIG_MPC5200 1 /* especially an MPC5200 */ #define CONFIG_JUPITER 1 /* ... on Jupiter board */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFFF00000 boot high (standard configuration) + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define CONFIG_BOARD_EARLY_INIT_R 1 @@ -184,7 +193,7 @@ #define CONFIG_SYS_MAX_FLASH_SECT 128 /* max num of sects on one chip */ -#define CONFIG_ENV_ADDR (TEXT_BASE + 0x40000) /* third sector */ +#define CONFIG_ENV_ADDR (CONFIG_SYS_TEXT_BASE + 0x40000) /* third sector */ #define CONFIG_SYS_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ @@ -226,7 +235,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 diff --git a/include/configs/katmai.h b/include/configs/katmai.h index e4ccd7d..135a4c2 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -41,6 +41,8 @@ #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ #define CONFIG_SYS_4xx_RESET_TYPE 0x2 /* use chip reset on this board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 + /* * Enable this board for more than 2GB of SDRAM */ diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 612a0fe..e153b31 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -39,6 +39,10 @@ #define CONFIG_405EX 1 /* Specifc 405EX support*/ #define CONFIG_SYS_CLK_FREQ 33333333 /* ext frequency to pll */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 +#endif + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 4794256..9117842 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -30,6 +30,8 @@ #define CONFIG_KMETER1 1 /* KMETER1 board specific */ #define CONFIG_HOSTNAME kmeter1 +#define CONFIG_SYS_TEXT_BASE 0xF0000000 + /* include common defines/options for all Keymile boards */ #include "keymile-common.h" @@ -157,7 +159,7 @@ /* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_FLASH_BASE 0xF0000000 #define CONFIG_SYS_PIGGY_BASE 0xE8000000 #define CONFIG_SYS_PIGGY_SIZE 128 diff --git a/include/configs/kmsupx4.h b/include/configs/kmsupx4.h index 8f1e602..228bdd7 100644 --- a/include/configs/kmsupx4.h +++ b/include/configs/kmsupx4.h @@ -32,6 +32,8 @@ #define CONFIG_KMSUPX4 1 /* ...on a kmsupx4 board */ #define CONFIG_HOSTNAME kmsupx4 +#define CONFIG_SYS_TEXT_BASE 0xf0000000 + /* include common defines/options for all Keymile 8xx boards */ #include "km8xx.h" diff --git a/include/configs/korat.h b/include/configs/korat.h index 55ef4f0..96a984d 100644 --- a/include/configs/korat.h +++ b/include/configs/korat.h @@ -38,6 +38,12 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_SYS_CLK_FREQ 33333333 +#ifdef CONFIG_KORAT_PERMANENT +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 +#else +#define CONFIG_SYS_TEXT_BASE 0xF7F60000 +#endif + #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ @@ -64,7 +70,7 @@ #define CONFIG_SYS_FLASH1_MAX_SIZE 0x08000000 #define CONFIG_SYS_FLASH1_ADDR (CONFIG_SYS_FLASH1_TOP - CONFIG_SYS_FLASH1_MAX_SIZE) #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH1_ADDR /* start of FLASH */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_OCM_BASE 0xe0010000 /* ocm */ #define CONFIG_SYS_OCM_DATA_ADDR CONFIG_SYS_OCM_BASE #define CONFIG_SYS_PCI_BASE 0xe0000000 /* Internal PCI regs */ diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h index 0d95263..560cfb5 100644 --- a/include/configs/kvme080.h +++ b/include/configs/kvme080.h @@ -28,6 +28,8 @@ #define CONFIG_MPC8245 1 #define CONFIG_KVME080 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 @@ -136,7 +138,7 @@ #define CONFIG_VERY_BIG_RAM #define CONFIG_SYS_MONITOR_LEN 0x00040000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN (512 << 10) #define CONFIG_SYS_BOOTMAPSZ (8 << 20) diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index 6883e79..2918d79 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -20,6 +20,22 @@ #ifndef __CONFIG_H #define __CONFIG_H +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * + * Standard configuration - all models + * 0xFFF00000 boot from flash + * + * Test configuration (boot from RAM using uloader.o) + * LinkStation HD-HLAN and KuroBox Standard + * 0x03F00000 boot from RAM + * LinkStation HD-HGLAN and KuroBox HG + * 0x07F00000 boot from RAM + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #if 0 #define DEBUG #endif @@ -217,7 +233,7 @@ #define CONFIG_SYS_FLASH_BASE 0xFFC00000 #define CONFIG_SYS_FLASH_SIZE 0x00400000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_RESET_ADDRESS 0xFFF00100 #define CONFIG_SYS_EUMB_ADDR 0x80000000 @@ -240,7 +256,7 @@ #endif /*----------------------------------------------------------------------- - * Change TEXT_BASE in bord/linkstation/config.mk to get a RAM build + * Change CONFIG_SYS_TEXT_BASE in bord/linkstation/config.mk to get a RAM build * * RAM based builds are for testing purposes. A Linux module, uloader.o, * exists to load U-Boot and pass control to it diff --git a/include/configs/logodl.h b/include/configs/logodl.h deleted file mode 100644 index 0535ee1..0000000 --- a/include/configs/logodl.h +++ /dev/null @@ -1,299 +0,0 @@ -/* - * (C) Copyright 2003 - * Robert Schwebel, Pengutronix, r.schwebel@pengutronix.de. - * - * Configuration for the Logotronic DL board. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * include/configs/logodl.h - configuration options, board specific - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* - * High Level Configuration Options - * (easy to change) - */ -#define CONFIG_PXA250 1 /* This is an PXA250 CPU */ -#define CONFIG_GEALOG 1 /* on a Logotronic GEALOG SG board */ - -#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ - /* for timer/console/ethernet */ - -/* we will never enable dcache, because we have to setup MMU first */ -#define CONFIG_SYS_NO_DCACHE - -/* - * Hardware drivers - */ - -/* - * select serial console configuration - */ -#define CONFIG_PXA_SERIAL -#define CONFIG_FFUART 1 /* we use FFUART */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - -#define CONFIG_BAUDRATE 19200 -#undef CONFIG_MISC_INIT_R /* FIXME: misc_init_r() missing */ - - -/* - * BOOTP options - */ -#define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME - - -/* - * Command line configuration. - */ -#define CONFIG_CMD_ASKENV -#define CONFIG_CMD_ECHO -#define CONFIG_CMD_SAVEENV -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_RUN - - -#define CONFIG_BOOTDELAY 3 -/* #define CONFIG_BOOTARGS "root=/dev/nfs ip=bootp console=ttyS0,19200" */ -#define CONFIG_BOOTARGS "console=ttyS0,19200" -#define CONFIG_ETHADDR FF:FF:FF:FF:FF:FF -#define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_IPADDR 192.168.1.56 -#define CONFIG_SERVERIP 192.168.1.2 -#define CONFIG_BOOTCOMMAND "bootm 0x40000" -#define CONFIG_SHOW_BOOT_PROGRESS - -#define CONFIG_CMDLINE_TAG 1 - -/* - * Miscellaneous configurable options - */ - -/* - * Size of malloc() pool; this lives below the uppermost 128 KiB which are - * used for the RAM copy of the uboot code - * - */ -#define CONFIG_SYS_MALLOC_LEN (256*1024) - -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "uboot> " /* Monitor Command Prompt */ -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ -#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ - -#define CONFIG_SYS_MEMTEST_START 0x08000000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x0800ffff /* 64 KiB */ - -#define CONFIG_SYS_LOAD_ADDR 0x08000000 /* load kernel to this address */ - -#define CONFIG_SYS_HZ 1000 - /* RS: the oscillator is actually 3680130?? */ - -#define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ - /* 0101000001 */ - /* ^^^^^ Memory Speed 99.53 MHz */ - /* ^^ Run Mode Speed = 2x Mem Speed */ - /* ^^ Turbo Mode Sp. = 1x Run M. Sp. */ - -#define CONFIG_SYS_MONITOR_LEN 0x20000 /* 128 KiB */ - - /* valid baudrates */ -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } - -/* - * SMSC91C111 Network Card - */ -#if 0 -#define CONFIG_NET_MULTI -#define CONFIG_SMC91111 1 -#define CONFIG_SMC91111_BASE 0x10000000 /* chip select 4 */ -#undef CONFIG_SMC_USE_32_BIT /* 16 bit bus access */ -#undef CONFIG_SMC_91111_EXT_PHY /* we use internal phy */ -#undef CONFIG_SHOW_ACTIVITY -#define CONFIG_NET_RETRY_COUNT 10 /* # of retries */ -#endif - -/* - * Stack sizes - * - * The stack sizes are set up in start.S using the settings below - */ -#define CONFIG_STACKSIZE (128*1024) /* regular stack */ -#ifdef CONFIG_USE_IRQ -#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ -#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ -#endif - -/* - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of RAM */ -#define PHYS_SDRAM_1 0x08000000 /* SRAM Bank #1 */ -#define PHYS_SDRAM_1_SIZE (4*1024*1024) /* 4 MB */ - -#define PHYS_FLASH_1 0x00000000 /* Flash Bank #1 */ -#define PHYS_FLASH_2 0x01000000 /* Flash Bank #2 */ -#define PHYS_FLASH_SIZE (32*1024*1024) /* 32 MB */ - -#define CONFIG_SYS_DRAM_BASE PHYS_SDRAM_1 /* RAM starts here */ -#define CONFIG_SYS_DRAM_SIZE PHYS_SDRAM_1_SIZE - -#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 - - -/* - * GPIO settings - * - * GP?? == FOOBAR is 0/1 - */ - -#define _BIT0 0x00000001 -#define _BIT1 0x00000002 -#define _BIT2 0x00000004 -#define _BIT3 0x00000008 - -#define _BIT4 0x00000010 -#define _BIT5 0x00000020 -#define _BIT6 0x00000040 -#define _BIT7 0x00000080 - -#define _BIT8 0x00000100 -#define _BIT9 0x00000200 -#define _BIT10 0x00000400 -#define _BIT11 0x00000800 - -#define _BIT12 0x00001000 -#define _BIT13 0x00002000 -#define _BIT14 0x00004000 -#define _BIT15 0x00008000 - -#define _BIT16 0x00010000 -#define _BIT17 0x00020000 -#define _BIT18 0x00040000 -#define _BIT19 0x00080000 - -#define _BIT20 0x00100000 -#define _BIT21 0x00200000 -#define _BIT22 0x00400000 -#define _BIT23 0x00800000 - -#define _BIT24 0x01000000 -#define _BIT25 0x02000000 -#define _BIT26 0x04000000 -#define _BIT27 0x08000000 - -#define _BIT28 0x10000000 -#define _BIT29 0x20000000 -#define _BIT30 0x40000000 -#define _BIT31 0x80000000 - - -#define CONFIG_SYS_LED_A_BIT (_BIT18) -#define CONFIG_SYS_LED_A_SR GPSR0 -#define CONFIG_SYS_LED_A_CR GPCR0 - -#define CONFIG_SYS_LED_B_BIT (_BIT16) -#define CONFIG_SYS_LED_B_SR GPSR1 -#define CONFIG_SYS_LED_B_CR GPCR1 - - -/* LED A: off, LED B: off */ -#define CONFIG_SYS_GPSR0_VAL (_BIT1+_BIT6+_BIT8+_BIT9+_BIT11+_BIT15+_BIT16+_BIT18) -#define CONFIG_SYS_GPSR1_VAL (_BIT0+_BIT1+_BIT16+_BIT24+_BIT25 +_BIT7+_BIT8+_BIT9+_BIT11+_BIT13) -#define CONFIG_SYS_GPSR2_VAL (_BIT14+_BIT15+_BIT16) - -#define CONFIG_SYS_GPCR0_VAL 0x00000000 -#define CONFIG_SYS_GPCR1_VAL 0x00000000 -#define CONFIG_SYS_GPCR2_VAL 0x00000000 - -#define CONFIG_SYS_GPDR0_VAL (_BIT1+_BIT6+_BIT8+_BIT9+_BIT11+_BIT15+_BIT16+_BIT17+_BIT18) -#define CONFIG_SYS_GPDR1_VAL (_BIT0+_BIT1+_BIT16+_BIT24+_BIT25 +_BIT7+_BIT8+_BIT9+_BIT11+_BIT13) -#define CONFIG_SYS_GPDR2_VAL (_BIT14+_BIT15+_BIT16) - -#define CONFIG_SYS_GAFR0_L_VAL (_BIT22+_BIT24+_BIT31) -#define CONFIG_SYS_GAFR0_U_VAL (_BIT15+_BIT17+_BIT19+\ - _BIT20+_BIT22+_BIT24+_BIT26+_BIT29+_BIT31) -#define CONFIG_SYS_GAFR1_L_VAL (_BIT3+_BIT4+_BIT6+_BIT8+_BIT10+_BIT12+_BIT15+_BIT17+_BIT19+\ - _BIT20+_BIT23+_BIT24+_BIT27+_BIT28+_BIT31) -#define CONFIG_SYS_GAFR1_U_VAL (_BIT21+_BIT23+_BIT25+_BIT27+_BIT29+_BIT31) -#define CONFIG_SYS_GAFR2_L_VAL (_BIT1+_BIT3+_BIT5+_BIT7+_BIT9+_BIT11+_BIT13+_BIT15+_BIT17+\ - _BIT19+_BIT21+_BIT23+_BIT25+_BIT27+_BIT29+_BIT31) -#define CONFIG_SYS_GAFR2_U_VAL (_BIT1) - -#define CONFIG_SYS_PSSR_VAL (0x20) - -/* - * Memory settings - */ -#define CONFIG_SYS_MSC0_VAL 0x123c2980 -#define CONFIG_SYS_MSC1_VAL 0x123c2661 -#define CONFIG_SYS_MSC2_VAL 0x7ff87ff8 - - -/* no sdram/pcmcia here */ -#define CONFIG_SYS_MDCNFG_VAL 0x00000000 -#define CONFIG_SYS_MDREFR_VAL 0x00000000 -#define CONFIG_SYS_MDREFR_VAL_100 0x00000000 -#define CONFIG_SYS_MDMRS_VAL 0x00000000 - -/* only SRAM */ -#define SXCNFG_SETTINGS 0x00000000 - -/* - * PCMCIA and CF Interfaces - */ - -#define CONFIG_SYS_MECR_VAL 0x00000000 -#define CONFIG_SYS_MCMEM0_VAL 0x00010504 -#define CONFIG_SYS_MCMEM1_VAL 0x00010504 -#define CONFIG_SYS_MCATT0_VAL 0x00010504 -#define CONFIG_SYS_MCATT1_VAL 0x00010504 -#define CONFIG_SYS_MCIO0_VAL 0x00004715 -#define CONFIG_SYS_MCIO1_VAL 0x00004715 - - -/* - * FLASH and environment organization - */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of memory banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 128 /* max number of sectors on one chip */ - -/* timeout values are in ticks */ -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */ -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Write */ - -/* FIXME */ -#define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */ -#define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */ - -#endif /* __CONFIG_H */ diff --git a/include/configs/luan.h b/include/configs/luan.h index 6b1a41f..d801404 100644 --- a/include/configs/luan.h +++ b/include/configs/luan.h @@ -37,6 +37,8 @@ #define CONFIG_440 1 #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFFB0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index be20d72..3b7293a 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -39,6 +39,8 @@ #define CONFIG_MPC823 1 /* This is a MPC823E CPU */ #define CONFIG_LWMON 1 /* ...on a LWMON board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + /* Default Ethernet MAC address */ #define CONFIG_ETHADDR 00:11:B0:00:00:00 diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 4a3b1dc..19d2989 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -36,6 +36,11 @@ #define CONFIG_440EPX 1 /* Specific PPC440EPx */ #define CONFIG_440 1 /* ... PPC440 family */ #define CONFIG_4xx 1 /* ... PPC4xx family */ + +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 +#endif + #define CONFIG_SYS_CLK_FREQ 33300000 /* external freq to pll */ #define CONFIG_BOARD_EARLY_INIT_F /* Call board_early_init_f */ @@ -48,7 +53,7 @@ * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* Start of U-Boot */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of U-Boot */ #define CONFIG_SYS_MONITOR_LEN (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1) #define CONFIG_SYS_MALLOC_LEN (1 << 20) /* Reserved for malloc */ diff --git a/include/configs/makalu.h b/include/configs/makalu.h index 80163d4..c4853ab 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -39,6 +39,8 @@ #define CONFIG_405EX 1 /* Specifc 405EX support*/ #define CONFIG_SYS_CLK_FREQ 33330000 /* ext frequency to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h index 291b669..79f9965 100644 --- a/include/configs/manroland/common.h +++ b/include/configs/manroland/common.h @@ -106,11 +106,11 @@ "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin \0" \ "u-boot_addr_r=200000\0" \ "load=tftp ${u-boot_addr_r} ${u-boot}\0" \ - "update=protect off " xstr(TEXT_BASE) " +${filesize};" \ - "erase " xstr(TEXT_BASE) " +${filesize};" \ - "cp.b ${u-boot_addr_r} " xstr(TEXT_BASE) \ + "update=protect off " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize};" \ + "erase " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize};" \ + "cp.b ${u-boot_addr_r} " xstr(CONFIG_SYS_TEXT_BASE) \ " ${filesize};" \ - "protect on " xstr(TEXT_BASE) " +${filesize}\0" \ + "protect on " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize}\0" \ "" #define CONFIG_BOOTCOMMAND "run net_nfs" diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h index d25e093..7be1354 100644 --- a/include/configs/manroland/mpc5200-common.h +++ b/include/configs/manroland/mpc5200-common.h @@ -42,7 +42,7 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200,\ 230400 } -#if (TEXT_BASE == 0xFFF00000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFFF00000) /* Boot low */ # define CONFIG_SYS_LOWBOOT 1 #endif @@ -88,7 +88,7 @@ #define CONFIG_SYS_FLASH_SIZE 0x00800000 /* 8 MByte */ -#define CONFIG_ENV_ADDR (TEXT_BASE+0x40000) /* second sector */ +#define CONFIG_ENV_ADDR (CONFIG_SYS_TEXT_BASE+0x40000) /* second sector */ #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max num of flash banks (= chip selects) */ #define CONFIG_SYS_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout [ms]*/ @@ -140,7 +140,7 @@ #define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE #endif -#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 diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index 7ef6385..72d9750 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -33,6 +33,16 @@ #define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MCC200 1 /* ... on MCC200 board */ +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFC000000 boot low (standard configuration) + * 0xFFF00000 boot high + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFC000000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33MHz */ #define CONFIG_MISC_INIT_R @@ -169,7 +179,7 @@ "rootpath=/opt/eldk/ppc_6xx\0" \ "bootfile=/tftpboot/" CONFIG_SYS__BOARDNAME "/uImage\0" \ "load=tftp 200000 /tftpboot/" CONFIG_SYS__BOARDNAME "/u-boot.bin\0" \ - "text_base=" MK_STR(TEXT_BASE) "\0" \ + "text_base=" MK_STR(CONFIG_SYS_TEXT_BASE) "\0" \ "kernel_addr=0xFC0C0000\0" \ "update=protect off ${text_base} +${filesize};" \ "era ${text_base} +${filesize};" \ @@ -239,7 +249,7 @@ #define CONFIG_ENV_OVERWRITE 1 /* allow modification of vendor params */ -#if TEXT_BASE == CONFIG_SYS_FLASH_BASE +#if CONFIG_SYS_TEXT_BASE == CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_LOWBOOT 1 #endif @@ -259,7 +269,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 diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h index 8dd87cb..4aef6fc 100644 --- a/include/configs/mcu25.h +++ b/include/configs/mcu25.h @@ -37,6 +37,8 @@ #define CONFIG_4xx 1 #define CONFIG_HOSTNAME mcu25 +#define CONFIG_SYS_TEXT_BASE 0xFFFB0000 + /* * Include common defines/options for all boards produced by Netstal Maschinen */ @@ -57,7 +59,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */ #define CONFIG_SYS_FLASH_BASE 0xfff80000 /* start of FLASH */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* ... with on-chip memory here (4KBytes) */ #define CONFIG_SYS_OCM_DATA_ADDR 0xF4000000 diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index a26de0b..43c0528 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -48,6 +48,8 @@ #define CONFIG_E300 1 /* E300 Family */ #define CONFIG_MPC512X 1 /* MPC512X family */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_SYS_MPC512X_CLKIN 33333333 /* in Hz */ #define CONFIG_BOARD_EARLY_INIT_F /* call board_early_init_f() */ @@ -210,7 +212,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 /* Start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of monitor */ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Monitor length */ #define CONFIG_SYS_MALLOC_LEN (6 * 1024 * 1024) /* Malloc size */ diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h index 73405ea..8edb84d 100644 --- a/include/configs/mecp5200.h +++ b/include/configs/mecp5200.h @@ -45,6 +45,10 @@ #define CONFIG_MECP5200 1 /* ... on MECP5200 board */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -105,11 +109,11 @@ #define CONFIG_CMD_ELF -#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ # define CONFIG_SYS_LOWBOOT 1 # define CONFIG_SYS_LOWBOOT16 1 #endif -#if (TEXT_BASE == 0xFF800000) /* Boot low with 8 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF800000) /* Boot low with 8 MB Flash */ # define CONFIG_SYS_LOWBOOT 1 # define CONFIG_SYS_LOWBOOT08 1 #endif @@ -221,7 +225,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 diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 55d1fc9..152c9a6 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -34,6 +34,8 @@ #define CONFIG_MGCOGE 1 #define CONFIG_HOSTNAME mgcoge +#define CONFIG_SYS_TEXT_BASE 0xFE000000 + #define CONFIG_CPM2 1 /* Has a CPM2 */ /* include common defines/options for all Keymile boards */ @@ -123,7 +125,7 @@ CONFIG_SYS_FLASH_BASE_1, \ CONFIG_SYS_FLASH_BASE_2 } -#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 #endif diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index 1618f7d..6036da8 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -32,6 +32,8 @@ #define CONFIG_MGSUVD 1 /* ...on a mgsuvd board */ #define CONFIG_HOSTNAME mgsuvd +#define CONFIG_SYS_TEXT_BASE 0xf0000000 + /* include common defines/options for all Keymile 8xx boards */ #include "km8xx.h" diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index c30cc4c..bcdd86e 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -57,7 +57,7 @@ #endif /* setting reset address */ -/*#define CONFIG_SYS_RESET_ADDRESS TEXT_BASE*/ +/*#define CONFIG_SYS_RESET_ADDRESS CONFIG_SYS_TEXT_BASE*/ /* ethernet */ #ifdef XILINX_EMACLITE_BASEADDR @@ -103,7 +103,7 @@ /* * memory layout - Example - * TEXT_BASE = 0x1200_0000; + * CONFIG_SYS_TEXT_BASE = 0x1200_0000; * CONFIG_SYS_SRAM_BASE = 0x1000_0000; * CONFIG_SYS_SRAM_SIZE = 0x0400_0000; * @@ -113,7 +113,7 @@ * * 0x1000_0000 CONFIG_SYS_SDRAM_BASE * FREE - * 0x1200_0000 TEXT_BASE + * 0x1200_0000 CONFIG_SYS_TEXT_BASE * U-BOOT code * 0x1202_0000 * FREE diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index fa4310b..af2f40a 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -37,6 +37,8 @@ #define CONFIG_HIGH_BATS 1 /* High BATs supported */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + /* * BOOTP options */ @@ -192,12 +194,12 @@ * (e.g., by the BDI). Otherwise we must specify the default boot-up value of * MBAR, as given in the doccumentation. */ -#if TEXT_BASE == 0x00100000 +#if CONFIG_SYS_TEXT_BASE == 0x00100000 #define CONFIG_SYS_DEFAULT_MBAR 0xf0000000 -#else /* TEXT_BASE != 0x00100000 */ +#else /* CONFIG_SYS_TEXT_BASE != 0x00100000 */ #define CONFIG_SYS_DEFAULT_MBAR 0x80000000 #define CONFIG_SYS_LOWBOOT 1 -#endif /* TEXT_BASE == 0x00100000 */ +#endif /* CONFIG_SYS_TEXT_BASE == 0x00100000 */ /* Use SRAM until RAM will be available */ #define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM @@ -207,7 +209,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 diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 3740316..f5c2bd3 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -48,6 +48,8 @@ #define CONFIG_MPC512X 1 /* MPC512X family */ #define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + /* video */ #undef CONFIG_VIDEO @@ -274,7 +276,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 /* Start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of monitor */ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_MALLOC_LEN (6 * 1024 * 1024) /* Reserved for malloc */ diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h index 497ea42..ae5e109 100644 --- a/include/configs/mpc7448hpc2.h +++ b/include/configs/mpc7448hpc2.h @@ -42,6 +42,8 @@ #define CONFIG_HIGH_BATS /* High BATs supported */ #define CONFIG_ALTIVEC /* undef to disable */ +#define CONFIG_SYS_TEXT_BASE 0xFF000000 + #define CONFIG_SYS_BOARD_NAME "MPC7448 HPC II" #define CONFIG_IDENT_STRING " Freescale MPC7448 HPC II" @@ -251,7 +253,7 @@ #define CONFIG_SYS_RESET_ADDRESS 0x3fffff00 #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* u-boot code base */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* u-boot code base */ #define CONFIG_SYS_MALLOC_LEN (256 << 10) /* Reserve 256 kB for malloc */ /* Peripheral Device section */ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index b5a19e4..18f205a 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -33,6 +33,10 @@ #define CONFIG_MPC8308 1 /* MPC8308 CPU specific */ #define CONFIG_MPC8308_P1M 1 /* mpc8308_p1m board specific */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFC000000 +#endif + /* * On-board devices * @@ -206,7 +210,7 @@ /* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index 8c06bf2..02090f2 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -65,7 +65,7 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 115200, 57600, 38400, 19200, 9600 } #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE) -#define CONFIG_SYS_MEMTEST_END (TEXT_BASE - 0x100000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_TEXT_BASE - 0x100000) /* NOR Flash */ /* #define CONFIG_SYS_FLASH_BASE (0xA1000000)*/ diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h index 43f46bf..e85b953 100644 --- a/include/configs/muas3001.h +++ b/include/configs/muas3001.h @@ -33,6 +33,8 @@ #define CONFIG_MPC8260 1 #define CONFIG_MUAS3001 1 +#define CONFIG_SYS_TEXT_BASE 0xFF000000 + #define CONFIG_CPM2 1 /* Has a CPM2 */ /* Do boardspecific init */ @@ -225,7 +227,7 @@ #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } -#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 #endif diff --git a/include/configs/mucmc52.h b/include/configs/mucmc52.h index f87dc9c..101788a 100644 --- a/include/configs/mucmc52.h +++ b/include/configs/mucmc52.h @@ -35,6 +35,10 @@ #define CONFIG_MUCMC52 1 /* MUCMC52 board */ #define CONFIG_HOSTNAME mucmc52 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #include "manroland/common.h" #include "manroland/mpc5200-common.h" diff --git a/include/configs/munices.h b/include/configs/munices.h index fa5230f..9116368 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -31,6 +31,11 @@ #define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */ #define CONFIG_MUNICES 1 /* ... on MUNICes board */ + +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ @@ -119,7 +124,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 @@ -154,11 +159,11 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET 0x40000 -#define CONFIG_ENV_ADDR (TEXT_BASE + CONFIG_ENV_OFFSET) +#define CONFIG_ENV_ADDR (CONFIG_SYS_TEXT_BASE + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x4000 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) -#define CONFIG_ENV_ADDR_REDUND (TEXT_BASE + CONFIG_ENV_OFFSET_REDUND) +#define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_TEXT_BASE + CONFIG_ENV_OFFSET_REDUND) #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/neo.h b/include/configs/neo.h index f8f53e8..1063d12 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -29,6 +29,8 @@ #define CONFIG_4xx 1 /* member of PPC4xx family */ #define CONFIG_NEO 1 /* on a Neo board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/netstal-common.h b/include/configs/netstal-common.h index 8f42b6c..122f139 100644 --- a/include/configs/netstal-common.h +++ b/include/configs/netstal-common.h @@ -27,7 +27,7 @@ #define __NETSTAL_COMMON_H #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* Start of U-Boot */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of U-Boot */ #define CONFIG_SYS_MONITOR_LEN (320 * 1024) /* Reserve 320 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (256 * 1024) /* Reserve 256 kB for malloc() */ diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h index bdc0f79..cca32e6 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -32,6 +32,8 @@ #define CONFIG_MPC5200 #define CONFIG_O2DNT 1 /* ... on O2DNT board */ +#define CONFIG_SYS_TEXT_BASE 0xFF000000 /* boot low for 16 MiB boards */ + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -102,10 +104,10 @@ #define CONFIG_CMD_PCI -#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ # define CONFIG_SYS_LOWBOOT 1 #else -# error "TEXT_BASE must be 0xFF000000" +# error "CONFIG_SYS_TEXT_BASE must be 0xFF000000" #endif /* @@ -222,7 +224,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 #define CONFIG_SYS_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index d11d218..f33f0ff 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -46,6 +46,8 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h index 17ec08f..70c4b7d 100644 --- a/include/configs/p3mx.h +++ b/include/configs/p3mx.h @@ -40,6 +40,8 @@ *----------------------------------------------------------------------*/ #define CONFIG_P3Mx /* used for both board versions */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #if defined (CONFIG_P3M750) #define CONFIG_750FX /* 750GL/GX/FX */ #define CONFIG_HIGH_BATS /* High BATs supported */ diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index 6edf91e..4a2e420 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -39,6 +39,9 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ + +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ /*----------------------------------------------------------------------- diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index 5ad745e..d5cf89a 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -104,7 +104,7 @@ #define PHYS_FLASH_2 0xbfc00000 /* Flash Bank #2 */ /* The following #defines are needed to get flash environment right */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x4000000 diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 8acf3c7..c663b54 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -41,6 +41,17 @@ High Level Configuration Options #define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */ #define CONFIG_PHYCORE_MPC5200B_TINY 1 /* phyCORE-MPC5200B -> */ /* FEC configuration and IDE */ + +/* + * Valid values for CONFIG_SYS_TEXT_BASE are: + * 0xFFF00000 boot high (standard configuration) + * 0xFF000000 boot low + * 0x00100000 boot from RAM (for testing only) + */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ @@ -71,7 +82,7 @@ Serial console configuration #define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ -#if (TEXT_BASE == 0xFF000000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF000000) /* Boot low */ #define CONFIG_SYS_LOWBOOT 1 #endif /* RAMBOOT will be defined automatically in memory section */ @@ -222,7 +233,7 @@ RTC configuration 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 diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index 85152d1..9f04851 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -40,6 +40,9 @@ #define CONFIG_440EP 1 /* Specific PPC440EP support */ #define CONFIG_440 1 /* ... PPC440 family */ #define CONFIG_4xx 1 /* ... PPC4xx family */ + +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 + #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index f073fcd..c6d87e3 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -49,6 +49,8 @@ #define CONFIG_MPC512X 1 /* MPC512X family */ #define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ +#define CONFIG_SYS_TEXT_BASE 0xF0000000 + /* Used for silent command in environment */ #define CONFIG_SYS_DEVICE_NULLDEV #define CONFIG_SILENT_CONSOLE @@ -271,7 +273,7 @@ #define CONFIG_FDT_FIXUP_PARTITIONS #endif -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* Start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of monitor */ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* 512 kB for monitor */ #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_MALLOC_LEN (6 * 1024 * 1024) /* for malloc */ diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h index 80a0bc6..ad983e4 100644 --- a/include/configs/pf5200.h +++ b/include/configs/pf5200.h @@ -44,6 +44,10 @@ #define CONFIG_PF5200 1 /* ... on PF5200 board */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ @@ -122,11 +126,11 @@ #define CONFIG_CMD_PCI -#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ # define CONFIG_SYS_LOWBOOT 1 # define CONFIG_SYS_LOWBOOT16 1 #endif -#if (TEXT_BASE == 0xFF800000) /* Boot low with 8 MB Flash */ +#if (CONFIG_SYS_TEXT_BASE == 0xFF800000) /* Boot low with 8 MB Flash */ # define CONFIG_SYS_LOWBOOT 1 # define CONFIG_SYS_LOWBOOT08 1 #endif @@ -226,7 +230,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 diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h index 04779c4..09bf4e4 100644 --- a/include/configs/ppmc7xx.h +++ b/include/configs/ppmc7xx.h @@ -49,6 +49,7 @@ #undef CONFIG_ALTIVEC #define CONFIG_BUS_CLK 66000000 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 /* * Monitor configuration @@ -240,7 +241,7 @@ * CONFIG_SYS_MALLOC_LEN - Size of malloc pool (128KB) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN 0x20000 diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h index f387601..8ceb9bf 100644 --- a/include/configs/ppmc8260.h +++ b/include/configs/ppmc8260.h @@ -34,6 +34,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_TEXT_BASE 0xfe000000 + /***************************************************************************** * * These settings must match the way _your_ board is set up @@ -76,7 +78,7 @@ #define CONFIG_SYS_PPMC_BOOT_LOW 1 /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/ppmc8260/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/ppmc8260/config.mk * The main FLASH is whichever is connected to *CS0. U-Boot expects * this to be the SIMM. */ diff --git a/include/configs/purple.h b/include/configs/purple.h index 2573aa1..25d8ebe 100644 --- a/include/configs/purple.h +++ b/include/configs/purple.h @@ -134,7 +134,7 @@ #define PHYS_FLASH_1 0xb0000000 /* Flash Bank #1 */ /* The following #defines are needed to get flash environment right */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index cbacdf9..fb697d5 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -136,7 +136,7 @@ */ /* The following #defines are needed to get flash environment right */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index 0764cc8..f847f9c 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -34,6 +34,8 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_405EP 1 /* Specifc 405EP support*/ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ @@ -175,7 +177,7 @@ #define CONFIG_SYS_FLASH_BASE 0xFFC00000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ -#define CONFIG_SYS_MONITOR_BASE (TEXT_BASE) +#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE) /* * For booting Linux, the board info and command line data @@ -207,7 +209,7 @@ #ifdef CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */ /* the environment is located before u-boot */ -#define CONFIG_ENV_ADDR (TEXT_BASE - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR (CONFIG_SYS_TEXT_BASE - CONFIG_ENV_SECT_SIZE) /* Address and size of Redundant Environment Sector */ #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/quantum.h b/include/configs/quantum.h index e440e93..a38145b 100644 --- a/include/configs/quantum.h +++ b/include/configs/quantum.h @@ -39,6 +39,8 @@ #define CONFIG_RPXLITE 1 /* QUANTUM is the RPXlite clone */ #define CONFIG_RMU 1 /* The QUNATUM is based on our RMU */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 955f3ff..bc518db 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -49,7 +49,7 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 115200, 57600, 38400, 19200, 9600 } #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE) -#define CONFIG_SYS_MEMTEST_END (TEXT_BASE - 0x100000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_TEXT_BASE - 0x100000) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024) /* Address of u-boot image in Flash */ diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 3afe93a..41376da 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -73,7 +73,7 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 115200, 57600, 38400, 19200, 9600 } #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE) -#define CONFIG_SYS_MEMTEST_END (TEXT_BASE - 0x100000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_TEXT_BASE - 0x100000) /* Flash board support */ #define CONFIG_SYS_FLASH_BASE (0xA0000000) diff --git a/include/configs/redwood.h b/include/configs/redwood.h index 3c1e882..a7d5dac 100644 --- a/include/configs/redwood.h +++ b/include/configs/redwood.h @@ -33,6 +33,8 @@ #define CONFIG_460SX 1 /* ... PPC460 family */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ +#define CONFIG_SYS_TEXT_BASE 0xfffb0000 + /*----------------------------------------------------------------------- * Include common defines/options for all AMCC boards *----------------------------------------------------------------------*/ diff --git a/include/configs/rmu.h b/include/configs/rmu.h index 026826b..66f46b9 100644 --- a/include/configs/rmu.h +++ b/include/configs/rmu.h @@ -39,6 +39,8 @@ #define CONFIG_RPXLITE 1 /* RMU is the RPXlite clone */ #define CONFIG_RMU 1 +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE @@ -169,7 +171,7 @@ #else #define CONFIG_SYS_MONITOR_LEN (128 << 10) /* Reserve 128 kB for Monitor */ #endif -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ /* @@ -189,7 +191,7 @@ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_ADDR ((TEXT_BASE) + 0x40000) +#define CONFIG_ENV_ADDR ((CONFIG_SYS_TEXT_BASE) + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */ #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE /* Used size for environment */ diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h index 8207844..6b41b12 100644 --- a/include/configs/rsdproto.h +++ b/include/configs/rsdproto.h @@ -39,6 +39,8 @@ #define CONFIG_RSD_PROTO 1 /* on a R&S Protocol Board */ #define CONFIG_CPM2 1 /* Has a CPM2 */ +#define CONFIG_SYS_TEXT_BASE 0xff000000 + #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */ /* diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index b0198aa..f6049c4 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -35,6 +35,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #undef DEBUG_BOOTP_EXT /* Debug received vendor fields */ #undef CONFIG_LOGBUFFER /* External logbuffer support */ @@ -85,7 +87,7 @@ #define CONFIG_SYS_SBC_BOOT_LOW 1 /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/sacsng/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/sacsng/config.mk * The main FLASH is whichever is connected to *CS0. */ #define CONFIG_SYS_FLASH0_BASE 0x40000000 diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h index 187002c..346c847 100644 --- a/include/configs/sbc405.h +++ b/include/configs/sbc405.h @@ -36,6 +36,8 @@ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_SBC405 1 /* ...on a WR SBC405 board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h index 1cc2920..ea93043 100644 --- a/include/configs/sbc8240.h +++ b/include/configs/sbc8240.h @@ -43,6 +43,8 @@ #define CONFIG_MPC8240 1 #define CONFIG_WRSBC8240 1 +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 9600 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } @@ -175,7 +177,7 @@ typedef unsigned int led_id_t; #define CONFIG_SYS_EUMB_ADDR 0xFCE00000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index 3fa80a8..bfa0389 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -35,6 +35,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_TEXT_BASE 0x40000000 + /* Enable debug prints */ #undef DEBUG_BOOTP_EXT /* Debug received vendor fields */ @@ -84,7 +86,7 @@ #define CONFIG_SYS_SBC_BOOT_LOW 1 /* What should the base address of the main FLASH be and how big is - * it (in MBytes)? This must contain TEXT_BASE from board/sbc8260/config.mk + * it (in MBytes)? This must contain CONFIG_SYS_TEXT_BASE from board/sbc8260/config.mk * The main FLASH is whichever is connected to *CS0. U-Boot expects * this to be the SIMM. */ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index b8f4b6e..eecb9e6 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -32,21 +32,6 @@ #define __CONFIG_H /* - * Top level Makefile configuration choices - */ -#ifdef CONFIG_MK_PCI -#define CONFIG_PCI -#endif - -#ifdef CONFIG_MK_66 -#define PCI_66M -#endif - -#ifdef CONFIG_MK_33 -#define PCI_33M -#endif - -/* * High Level Configuration Options */ #define CONFIG_E300 1 /* E300 Family */ @@ -55,6 +40,8 @@ #define CONFIG_MPC8349 1 /* MPC8349 specific */ #define CONFIG_SBC8349 1 /* WRS SBC8349 board specific */ +#define CONFIG_SYS_TEXT_BASE 0xFF800000 + /* Don't enable PCI2 on sbc834x - it doesn't exist physically. */ #undef CONFIG_MPC83XX_PCI2 /* support for 2nd PCI controller */ @@ -64,14 +51,14 @@ * physically empty. The board will automatically (i.e w/o jumpers) * clock down to 33MHz if you insert a 33MHz PCI card. */ -#ifdef PCI_33M +#ifdef CONFIG_PCI_33M #define CONFIG_83XX_CLKIN 33000000 /* in Hz */ #else /* 66M */ #define CONFIG_83XX_CLKIN 66000000 /* in Hz */ #endif #ifndef CONFIG_SYS_CLK_FREQ -#ifdef PCI_33M +#ifdef CONFIG_PCI_33M #define CONFIG_SYS_CLK_FREQ 33000000 #define HRCWL_CSB_TO_CLKIN HRCWL_CSB_TO_CLKIN_8X1 #else /* 66M */ @@ -172,7 +159,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 8d047de..0cfd058 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -32,20 +32,19 @@ /* * Top level Makefile configuration choices */ -#ifdef CONFIG_MK_PCI -#define CONFIG_PCI +#ifdef CONFIG_PCI #define CONFIG_PCI1 #endif -#ifdef CONFIG_MK_66 +#ifdef CONFIG_66 #define CONFIG_SYS_CLK_DIV 1 #endif -#ifdef CONFIG_MK_33 +#ifdef CONFIG_33 #define CONFIG_SYS_CLK_DIV 2 #endif -#ifdef CONFIG_MK_PCIE +#ifdef CONFIG_PCIE #define CONFIG_PCIE1 #endif @@ -58,6 +57,10 @@ #define CONFIG_MPC8548 1 /* MPC8548 specific */ #define CONFIG_SBC8548 1 /* SBC8548 board specific */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xfffa0000 +#endif + #undef CONFIG_RIO #ifdef CONFIG_PCI @@ -206,7 +209,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI @@ -328,12 +331,12 @@ /* * For soldered on flash, (128kB/sector) we use 2 sectors for u-boot and - * one for env+bootpg (TEXT_BASE=0xfffa_0000, 384kB total). For SODIMM + * one for env+bootpg (CONFIG_SYS_TEXT_BASE=0xfffa_0000, 384kB total). For SODIMM * flash (512kB/sector) we use 1 sector for u-boot, and one for env+bootpg - * (TEXT_BASE=0xfff0_0000, 1MB total). This dynamically sets the right + * (CONFIG_SYS_TEXT_BASE=0xfff0_0000, 1MB total). This dynamically sets the right * thing for MONITOR_LEN in both cases. */ -#define CONFIG_SYS_MONITOR_LEN (~TEXT_BASE + 1) +#define CONFIG_SYS_MONITOR_LEN (~CONFIG_SYS_TEXT_BASE + 1) #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* Serial Port */ @@ -451,10 +454,10 @@ */ #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SIZE 0x2000 -#if TEXT_BASE == 0xfff00000 /* Boot from 64MB SODIMM */ +#if CONFIG_SYS_TEXT_BASE == 0xfff00000 /* Boot from 64MB SODIMM */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x80000) #define CONFIG_ENV_SECT_SIZE 0x80000 /* 512K(one sector) for env */ -#elif TEXT_BASE == 0xfffa0000 /* Boot from 8MB soldered flash */ +#elif CONFIG_SYS_TEXT_BASE == 0xfffa0000 /* Boot from 8MB soldered flash */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #else @@ -563,11 +566,11 @@ "netdev=eth0\0" \ "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0" \ "tftpflash=tftpboot $loadaddr $uboot; " \ - "protect off " MK_STR(TEXT_BASE) " +$filesize; " \ - "erase " MK_STR(TEXT_BASE) " +$filesize; " \ - "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; " \ - "protect on " MK_STR(TEXT_BASE) " +$filesize; " \ - "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0" \ + "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \ + "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \ + "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=2000000\0" \ "ramdiskfile=uRamdisk\0" \ diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h index 6352278..a75e4be 100644 --- a/include/configs/sbc8560.h +++ b/include/configs/sbc8560.h @@ -34,7 +34,7 @@ /* * Top level Makefile configuration choices */ -#ifdef CONFIG_MK_66 +#ifdef CONFIG_66 #define CONFIG_PCI_66 #endif @@ -46,6 +46,8 @@ #define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */ #define CONFIG_MPC85xx_REV1 1 /* MPC85xx Rev 1.0 chip */ +#define CONFIG_SYS_TEXT_BASE 0xfffc0000 + #define CONFIG_CPM2 1 /* has CPM2 */ #define CONFIG_SBC8560 1 /* configuration for SBC8560 board */ @@ -327,7 +329,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 200000 /* Timeout for Flash Erase (in ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 50000 /* Timeout for Flash Write (in ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if 0 /* XXX This doesn't work and I don't want to fix it */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 490d4f5..bc9a56a 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -43,6 +43,8 @@ #define CONFIG_MP 1 /* support multiple processors */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #ifdef RUN_DIAG #define CONFIG_SYS_DIAG_ADDR 0xff800000 #endif @@ -230,7 +232,7 @@ #undef CONFIG_SYS_FLASH_CHECKSUM #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_BASE_EARLY 0xfff00000 /* early monitor loc */ #define CONFIG_FLASH_CFI_DRIVER @@ -477,7 +479,7 @@ /* Map the last 1M of flash where we're running from reset */ #define CONFIG_SYS_DBAT6L_EARLY (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \ | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE) -#define CONFIG_SYS_DBAT6U_EARLY (TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP) +#define CONFIG_SYS_DBAT6U_EARLY (CONFIG_SYS_TEXT_BASE | BATU_BL_1M | BATU_VS | BATU_VP) #define CONFIG_SYS_IBAT6L_EARLY (CONFIG_SYS_MONITOR_BASE_EARLY | BATL_PP_RW \ | BATL_MEMCOHERENCE) #define CONFIG_SYS_IBAT6U_EARLY CONFIG_SYS_DBAT6U_EARLY diff --git a/include/configs/sc3.h b/include/configs/sc3.h index 278b60e..e71f1ac 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -62,6 +62,8 @@ #define CONFIG_4xx 1 #define CONFIG_405GP 1 +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 + #define CONFIG_BOARD_EARLY_INIT_F 1 #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r() */ @@ -377,7 +379,7 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFFE00000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* Start of U-Boot */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of U-Boot */ #define CONFIG_SYS_MONITOR_LEN (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1) #define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserve 128 KiB for malloc() */ diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 988d41f..412deea 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -42,6 +42,10 @@ #define CONFIG_440 1 /* ... PPC440 family */ #define CONFIG_4xx 1 /* ... PPC4xx family */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 +#endif + /* * Include common defines/options for all AMCC eval boards */ @@ -53,7 +57,7 @@ /* * Define this if you want support for video console with radeon 9200 pci card - * Also set TEXT_BASE to 0xFFF80000 in board/amcc/sequoia/config.mk in this case + * Also set CONFIG_SYS_TEXT_BASE to 0xFFF80000 in board/amcc/sequoia/config.mk in this case */ #undef CONFIG_VIDEO diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 624fe04..451b534 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -51,7 +51,7 @@ /* input clock of PLL: SMDK6400 has 12MHz input clock */ #define CONFIG_SYS_CLK_FREQ 12000000 -#if !defined(CONFIG_NAND_SPL) && (TEXT_BASE >= 0xc0000000) +#if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000) #define CONFIG_ENABLE_MMU #endif diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 595d174..bfd09a0 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -210,7 +210,7 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* 256 KiB */ #define CONFIG_IDENT_STRING " for SMDKC100" -#if !defined(CONFIG_NAND_SPL) && (TEXT_BASE >= 0xc0000000) +#if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000) #define CONFIG_ENABLE_MMU #endif diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 88be349..c2f00f2 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -45,6 +45,8 @@ #define CONFIG_MPC8544 1 #define CONFIG_SOCRATES 1 +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #define CONFIG_PCI #define CONFIG_TSEC_ENET /* tsec ethernet support */ @@ -159,7 +161,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #define CONFIG_SYS_LBC_LCRR 0x00030004 /* LB clock ratio reg */ #define CONFIG_SYS_LBC_LBCR 0x00000000 /* LB config reg */ diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h index 5db1379..d22d1c8 100644 --- a/include/configs/sorcery.h +++ b/include/configs/sorcery.h @@ -31,6 +31,8 @@ #define CONFIG_MPC8220 1 #define CONFIG_SORCERY 1 /* Sorcery board */ +#define CONFIG_SYS_TEXT_BASE 0xfff00000 + #define CONFIG_HIGH_BATS 1 /* High BATs supported */ /* Input clock running at 60Mhz, read Hid1 for the CPU multiplier to @@ -234,7 +236,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 diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h index 1fe2a04..75ed618 100644 --- a/include/configs/spc1920.h +++ b/include/configs/spc1920.h @@ -26,6 +26,8 @@ #define CONFIG_SPC1920 1 /* SPC1920 board */ #define CONFIG_MPC885 1 /* MPC885 CPU */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_8xx_CONS_SMC1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE @@ -161,7 +163,7 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 KB for monitor */ #ifdef CONFIG_BZIP2 diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h index 0248aba..37bdebb 100644 --- a/include/configs/spear3xx.h +++ b/include/configs/spear3xx.h @@ -28,13 +28,13 @@ * High Level Configuration Options * (easy to change) */ -#if defined(CONFIG_MK_spear300) +#if defined(CONFIG_spear300) #define CONFIG_SPEAR3XX 1 #define CONFIG_SPEAR300 1 -#elif defined(CONFIG_MK_spear310) +#elif defined(CONFIG_spear310) #define CONFIG_SPEAR3XX 1 #define CONFIG_SPEAR310 1 -#elif defined(CONFIG_MK_spear320) +#elif defined(CONFIG_spear320) #define CONFIG_SPEAR3XX 1 #define CONFIG_SPEAR320 1 #endif diff --git a/include/configs/spieval.h b/include/configs/spieval.h index d377e19..93c0990 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -176,7 +176,7 @@ #define CONFIG_TIMESTAMP /* display image timestamps */ -#if (TEXT_BASE == 0xFC000000) /* Boot low */ +#if (CONFIG_SYS_TEXT_BASE == 0xFC000000) /* Boot low */ # define CONFIG_SYS_LOWBOOT 1 #endif @@ -283,7 +283,7 @@ /* * Flash configuration */ -#define CONFIG_SYS_FLASH_BASE TEXT_BASE /* 0xFC000000 */ +#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE /* 0xFC000000 */ /* use CFI flash driver if no module variant is spezified */ #define CONFIG_SYS_FLASH_CFI 1 /* Flash is CFI conformant */ @@ -335,7 +335,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 diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index 891d2bf..5e71d74 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -43,6 +43,8 @@ #define CONFIG_STXGP3 1 /* Silicon Tx GPPP board specific*/ #define CONFIG_MPC8560 1 +#define CONFIG_SYS_TEXT_BASE 0xfff80000 + #undef CONFIG_PCI /* pci ethernet support */ #define CONFIG_TSEC_ENET /* tsec ethernet support*/ #undef CONFIG_ETHER_ON_FCC /* cpm FCC ethernet support */ @@ -97,7 +99,7 @@ #define CONFIG_SYS_OR1_PRELIM 0xffff0ff7 /* 64K is enough */ #define CONFIG_SYS_LBC_LCLDEVS_BASE 0xfc000000 /* Base of localbus devices */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index 911c906..e4493a9 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -43,6 +43,8 @@ #define CONFIG_STXSSA 1 /* Silicon Tx GPPP SSA board specific*/ #define CONFIG_MPC8560 1 +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_PCI /* PCI ethernet support */ #define CONFIG_TSEC_ENET /* tsec ethernet support*/ #undef CONFIG_ETHER_ON_FCC /* cpm FCC ethernet support */ @@ -109,7 +111,7 @@ #define CONFIG_SYS_BR1_PRELIM 0xFB001801 /* 32-bit port */ #define CONFIG_SYS_OR1_PRELIM 0xFFFF0FF7 /* 64K is enough */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index 5854366..426aa49 100644 --- a/include/configs/stxxtc.h +++ b/include/configs/stxxtc.h @@ -38,6 +38,8 @@ #define CONFIG_MPC875 1 /* This is a MPC875 CPU */ #define CONFIG_STXXTC 1 /* ...on a STx XTc board */ +#define CONFIG_SYS_TEXT_BASE 0x40F00000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #undef CONFIG_8xx_CONS_SMC2 #undef CONFIG_8xx_CONS_NONE diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h index 425f472..d7f4d80 100644 --- a/include/configs/svm_sc8xx.h +++ b/include/configs/svm_sc8xx.h @@ -31,6 +31,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_TEXT_BASE 0x40000000 + /* Custom configuration */ /* SC823,SC850,SC860SAR, FEL8xx-AT(823/850/860) */ /* SC85T,SC860T, FEL8xx-AT(855T/860T) */ diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h index 39ca793..d00e64e 100644 --- a/include/configs/t3corp.h +++ b/include/configs/t3corp.h @@ -31,6 +31,10 @@ #define CONFIG_440 1 #define CONFIG_4xx 1 /* ... PPC4xx family */ +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFFA0000 +#endif + #define CONFIG_HOSTNAME t3corp /* diff --git a/include/configs/taihu.h b/include/configs/taihu.h index 7e660ee..6e9dbc5 100644 --- a/include/configs/taihu.h +++ b/include/configs/taihu.h @@ -32,6 +32,8 @@ #define CONFIG_4xx 1 /* member of PPC4xx family */ #define CONFIG_TAIHU 1 /* on a taihu board */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/taishan.h b/include/configs/taishan.h index faf9e20..12f35ae 100644 --- a/include/configs/taishan.h +++ b/include/configs/taishan.h @@ -34,6 +34,8 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_SYS_CLK_FREQ 33333333 /* external freq to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h index 9285c9d..011a683 100644 --- a/include/configs/tb0229.h +++ b/include/configs/tb0229.h @@ -142,7 +142,7 @@ #define PHYS_FLASH_1 0xbfc00000 /* Flash Bank #1 */ /* The following #defines are needed to get flash environment right */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 << 10) #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h index 454e9b2..f423a0e 100644 --- a/include/configs/tnetv107x_evm.h +++ b/include/configs/tnetv107x_evm.h @@ -33,7 +33,7 @@ #define CONFIG_TNETV107X #define CONFIG_TNETV107X_EVM #define CONFIG_ARCH_CPU_INIT -#define CONFIG_SYS_UBOOT_BASE TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_DISABLE_TCM #define CONFIG_PERIPORT_REMAP #define CONFIG_PERIPORT_BASE 0x2000000 diff --git a/include/configs/uc100.h b/include/configs/uc100.h index 23f4c82..f1c09f3 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -40,6 +40,8 @@ #define CONFIG_UC100 1 /* ...on a UC100 module */ +#define CONFIG_SYS_TEXT_BASE 0x40700000 + #define MPC8XX_FACT 4 /* Multiply by 4 */ #define MPC8XX_XIN 25000000 /* 25.0 MHz in */ #define CONFIG_8xx_GCLK_FREQ (MPC8XX_FACT * MPC8XX_XIN) diff --git a/include/configs/uc101.h b/include/configs/uc101.h index 1972261..483534c 100644 --- a/include/configs/uc101.h +++ b/include/configs/uc101.h @@ -32,6 +32,10 @@ #define CONFIG_UC101 1 /* UC101 board */ #define CONFIG_HOSTNAME uc101 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#endif + #include "manroland/common.h" #include "manroland/mpc5200-common.h" diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h index 1a47aad..cc6a6c9 100644 --- a/include/configs/utx8245.h +++ b/include/configs/utx8245.h @@ -49,6 +49,9 @@ #define CONFIG_MPC824X 1 #define CONFIG_MPC8245 1 #define CONFIG_UTX8245 1 + +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define DEBUG 1 #define CONFIG_IDENT_STRING " [UTX5] " @@ -176,7 +179,7 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}" #define CONFIG_SYS_EUMB_ADDR 0xFC000000 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ diff --git a/include/configs/v37.h b/include/configs/v37.h index 7f1670e..ab9b22d 100644 --- a/include/configs/v37.h +++ b/include/configs/v37.h @@ -36,6 +36,8 @@ #define CONFIG_MPC823 1 /* This is a MPC823 CPU */ #define CONFIG_V37 1 /* ...on a Marel V37 board */ +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_LCD #define CONFIG_SHARP_LQ084V1DG21 #undef CONFIG_LCD_LOGO diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 600ccfb..26ebaba 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -29,6 +29,9 @@ #define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */ #define CONFIG_V38B 1 /* ...on V38B board */ + +#define CONFIG_SYS_TEXT_BASE 0xFF000000 + #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ...running at 33.000000MHz */ #define CONFIG_RTC_PCF8563 1 /* has PCF8563 RTC */ @@ -233,7 +236,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 diff --git a/include/configs/vct.h b/include/configs/vct.h index 1b894a6..4894969 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -45,7 +45,7 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* SDRAM is initialized by the bootstrap code */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) #define CONFIG_STACKSIZE (256 << 10) #define CONFIG_SYS_MALLOC_LEN (1 << 20) diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 45976db..d854180 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -38,6 +38,10 @@ #define CONFIG_MPC8313 1 #define CONFIG_VE8313 1 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0xfe000000 +#endif + #define CONFIG_PCI 1 #define CONFIG_FSL_ELBC 1 @@ -159,7 +163,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 7046e67..619c430 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -37,6 +37,8 @@ #define CONFIG_VIRTLAB2 1 /* ...on a virtlab2 module */ #define CONFIG_TQM8xxL 1 +#define CONFIG_SYS_TEXT_BASE 0x40000000 + #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_MAXIDLE 10 diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index f2fb592..ab46ff8 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -2,7 +2,7 @@ * esd vme8349 U-Boot configuration file * Copyright (c) 2008, 2009 esd gmbh Hannover Germany * - * (C) Copyright 2006 + * (C) Copyright 2006-2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * reinhard.arlt@esd-electronics.de @@ -37,7 +37,7 @@ /* * Top level Makefile configuration choices */ -#ifdef CONFIG_MK_caddy2 +#ifdef CONFIG_CADDY2 #define VME_CADDY2 #endif @@ -50,21 +50,23 @@ #define CONFIG_MPC8349 1 /* MPC8349 specific */ #define CONFIG_VME8349 1 /* ESD VME8349 board specific */ +#define CONFIG_SYS_TEXT_BASE 0xFFF00000 + #define CONFIG_MISC_INIT_R #define CONFIG_PCI /* Don't enable PCI2 on vme834x - it doesn't exist physically. */ #undef CONFIG_MPC83XX_PCI2 /* support for 2nd PCI controller */ -#define PCI_66M -#ifdef PCI_66M +#define CONFIG_PCI_66M +#ifdef CONFIG_PCI_66M #define CONFIG_83XX_CLKIN 66000000 /* in Hz */ #else #define CONFIG_83XX_CLKIN 33000000 /* in Hz */ #endif #ifndef CONFIG_SYS_CLK_FREQ -#ifdef PCI_66M +#ifdef CONFIG_PCI_66M #define CONFIG_SYS_CLK_FREQ 66000000 #define HRCWL_CSB_TO_CLKIN HRCWL_CSB_TO_CLKIN_4X1 #else @@ -149,7 +151,7 @@ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase TO (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write TO (ms) */ -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT diff --git a/include/configs/walnut.h b/include/configs/walnut.h index 3be489d..72ac4e3 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -36,7 +36,9 @@ #define CONFIG_405GP 1 /* This is a PPC405 CPU */ #define CONFIG_4xx 1 /* ...member of PPC4xx family */ #define CONFIG_WALNUT 1 /* ...on a WALNUT board */ - /* ...and on a SYCAMORE board */ + /* ...or on a SYCAMORE board */ + +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 /* * Include common defines/options for all AMCC eval boards diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 6efe342..b4a9675 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -28,7 +28,7 @@ /*Mem Map*/ #define CONFIG_SYS_SDRAM_BASE 0x0 -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_LEN (192 * 1024) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index ed0560a..0d450f5 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -42,6 +42,8 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_SYS_CLK_FREQ 66666666 /* external freq to pll */ +#define CONFIG_SYS_TEXT_BASE 0xFFF80000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/yucca.h b/include/configs/yucca.h index 4e64eec..8d5d45f 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -45,6 +45,8 @@ #define EXTCLK_50 50000000 #define EXTCLK_83 83333333 +#define CONFIG_SYS_TEXT_BASE 0xfffb0000 + /* * Include common defines/options for all AMCC eval boards */ diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 06d4526..6136af1 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -34,6 +34,8 @@ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_405EP 1 /* Specifc 405EP support*/ +#define CONFIG_SYS_TEXT_BASE 0xFFFC0000 + #define CONFIG_SYS_CLK_FREQ 33000000 /* external frequency to pll */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ |