diff options
Diffstat (limited to 'include/configs')
41 files changed, 18 insertions, 233 deletions
diff --git a/include/configs/B2.h b/include/configs/B2.h index b031826..e55858d 100644 --- a/include/configs/B2.h +++ b/include/configs/B2.h @@ -31,12 +31,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/SX1.h b/include/configs/SX1.h index 7c51a1b..6ed98b8 100644 --- a/include/configs/SX1.h +++ b/include/configs/SX1.h @@ -24,12 +24,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 2c664d5..bde12e1 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -30,12 +30,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/assabet.h b/include/configs/assabet.h index a52d87d..1a69ebe 100644 --- a/include/configs/assabet.h +++ b/include/configs/assabet.h @@ -31,8 +31,6 @@ #undef DEBUG -#define CONFIG_INIT_CRITICAL - /* * High Level Configuration Options * (easy to change) diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h index d32ec34..6a246b6 100644 --- a/include/configs/at91rm9200dk.h +++ b/include/configs/at91rm9200dk.h @@ -25,12 +25,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - /* ARM asynchronous clock */ #define AT91C_MAIN_CLOCK 179712000 /* from 18.432 MHz crystal (18432000 / 4 * 39) */ #define AT91C_MASTER_CLOCK 59904000 /* peripheral clock (AT91C_MASTER_CLOCK / 3) */ @@ -44,7 +38,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 -#ifdef CONFIG_INIT_CRITICAL +#ifndef CONFIG_SKIP_LOWLEVEL_INIT #define CFG_USE_MAIN_OSCILLATOR 1 /* flash */ #define MC_PUIA_VAL 0x00000000 @@ -74,7 +68,7 @@ #define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ #define SDRC_MR_VAL3 0x00000000 /* Normal Mode */ #define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -#endif /* CONFIG_INIT_CRITICAL */ +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ /* * Size of malloc() pool */ @@ -177,19 +171,19 @@ #define CFG_ENV_SIZE 0x2000 /* 0x8000 */ #else #define CFG_ENV_IS_IN_FLASH 1 -#ifdef CONFIG_INIT_CRITICAL +#ifdef CONFIG_SKIP_LOWLEVEL_INIT #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ #define CFG_ENV_SIZE 0x10000 /* sectors are 64K here */ #else #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */ #define CFG_ENV_SIZE 0x2000 /* 0x8000 */ -#endif /* CONFIG_INIT_CRITICAL */ +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ #endif /* CFG_ENV_IS_IN_DATAFLASH */ #define CFG_LOAD_ADDR 0x21000000 /* default load address */ -#ifdef CONFIG_INIT_CRITICAL +#ifdef CONFIG_SKIP_LOWLEVEL_INIT #define CFG_BOOT_SIZE 0x00 /* 0 KBytes */ #define CFG_U_BOOT_BASE PHYS_FLASH_1 #define CFG_U_BOOT_SIZE 0x60000 /* 384 KBytes */ @@ -197,7 +191,7 @@ #define CFG_BOOT_SIZE 0x6000 /* 24 KBytes */ #define CFG_U_BOOT_BASE (PHYS_FLASH_1 + 0x10000) #define CFG_U_BOOT_SIZE 0x10000 /* 64 KBytes */ -#endif /* CONFIG_INIT_CRITICAL */ +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ #define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h index 6a136d5..6997c7a 100644 --- a/include/configs/cerf250.h +++ b/include/configs/cerf250.h @@ -31,12 +31,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h index 96b7148..5e96e09 100644 --- a/include/configs/cmc_pu2.h +++ b/include/configs/cmc_pu2.h @@ -25,12 +25,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - /* ARM asynchronous clock */ #define AT91C_MAIN_CLOCK 207360000 /* from 18.432 MHz crystal (18432000 / 4 * 45) */ #define AT91C_MASTER_CLOCK (AT91C_MAIN_CLOCK/3) /* peripheral clock */ @@ -44,7 +38,7 @@ #define CONFIG_SETUP_MEMORY_TAGS 1 #define CONFIG_INITRD_TAG 1 -#ifdef CONFIG_INIT_CRITICAL +#ifndef CONFIG_SKIP_LOWLEVEL_INIT #define CFG_USE_MAIN_OSCILLATOR 1 /* flash */ #define MC_PUIA_VAL 0x00000000 @@ -74,7 +68,7 @@ #define SDRC_MR_VAL2 0x00000003 /* Load Mode Register */ #define SDRC_MR_VAL3 0x00000000 /* Normal Mode */ #define SDRC_TR_VAL 0x000002E0 /* Write refresh rate */ -#endif /* CONFIG_INIT_CRITICAL */ +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ /* * Size of malloc() pool diff --git a/include/configs/cradle.h b/include/configs/cradle.h index ca7a97b..776e1d2 100644 --- a/include/configs/cradle.h +++ b/include/configs/cradle.h @@ -29,12 +29,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/csb226.h b/include/configs/csb226.h index 0b2b251..f04102e 100644 --- a/include/configs/csb226.h +++ b/include/configs/csb226.h @@ -34,12 +34,6 @@ #define DEBUG 1 /* - * If we are developing, we might want to start U-Boot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h index b14e35b..9ac2856 100644 --- a/include/configs/dnp1110.h +++ b/include/configs/dnp1110.h @@ -31,7 +31,8 @@ * If we are developing, we might want to start armboot from ram * so we MUST NOT initialize critical regs like mem-timing ... */ -#undef CONFIG_INIT_CRITICAL +#define CONFIG_SKIP_LOWLEVEL_INIT 1 +#undef CONFIG_SKIP_RELOCATE_UBOOT /* * High Level Configuration Options diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h index 41ad394..c6a028f 100644 --- a/include/configs/ep7312.h +++ b/include/configs/ep7312.h @@ -28,12 +28,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h index 9e0ed51..88c2c74 100644 --- a/include/configs/evb4510.h +++ b/include/configs/evb4510.h @@ -32,8 +32,8 @@ * * Also swap the flash1 and flash2 addresses during debug. * + * #define CONFIG_SKIP_LOWLEVEL_INIT */ -#define CONFIG_INIT_CRITICAL /* * High Level Configuration Options diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h index dbb8dec..b68a2dc 100644 --- a/include/configs/gcplus.h +++ b/include/configs/gcplus.h @@ -40,7 +40,8 @@ * boot ROM leaves the MMU enabled when it passes control to U-Boot. So * we use lowlevel_init (CONFIG_INIT_CRITICAL) to remedy that problem. */ -#define CONFIG_INIT_CRITICAL +#undef CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SKIP_RELOCATE_UBOOT 1 /* * High Level Configuration Options diff --git a/include/configs/impa7.h b/include/configs/impa7.h index dbc951d..c187c54 100644 --- a/include/configs/impa7.h +++ b/include/configs/impa7.h @@ -28,12 +28,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/innokom.h b/include/configs/innokom.h index a3d36a0..fce72e1 100644 --- a/include/configs/innokom.h +++ b/include/configs/innokom.h @@ -31,12 +31,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start U-Boot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h index a8067f6..b0a80a3 100644 --- a/include/configs/ixdp425.h +++ b/include/configs/ixdp425.h @@ -37,12 +37,6 @@ * U-boot generic defines start here. ***************************************************************/ -/* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ /* diff --git a/include/configs/lart.h b/include/configs/lart.h index 3c9895a..a00640b 100644 --- a/include/configs/lart.h +++ b/include/configs/lart.h @@ -28,12 +28,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/logodl.h b/include/configs/logodl.h index b320a40..715ed74 100644 --- a/include/configs/logodl.h +++ b/include/configs/logodl.h @@ -31,12 +31,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start U-Boot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h index 6f2c32c..d7d0460 100644 --- a/include/configs/lpd7a400.h +++ b/include/configs/lpd7a400.h @@ -23,12 +23,6 @@ #define CONFIG_LPD7A400 /* Logic LH7A400 SDK */ -/* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - #undef CONFIG_USE_IRQ /* diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h index e6855fb..4002e68 100644 --- a/include/configs/lpd7a404.h +++ b/include/configs/lpd7a404.h @@ -23,12 +23,6 @@ #define CONFIG_LPD7A404 /* Logic LH7A400 SDK */ -/* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - #undef CONFIG_USE_IRQ /* diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h index 536a175..9ac62c7 100644 --- a/include/configs/lubbock.h +++ b/include/configs/lubbock.h @@ -31,12 +31,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h index 166aa11..067c846 100644 --- a/include/configs/modnet50.h +++ b/include/configs/modnet50.h @@ -28,12 +28,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start u-boot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h index f7ccea3..7f3dfd5 100644 --- a/include/configs/mx1ads.h +++ b/include/configs/mx1ads.h @@ -29,12 +29,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h index 61a3b29..7b4dc92 100644 --- a/include/configs/mx1fs2.h +++ b/include/configs/mx1fs2.h @@ -113,8 +113,6 @@ #define PRECHARGE_CMD 0x910a8300 #define AUTOREFRESH_CMD 0xa10a8300 -#define CONFIG_INIT_CRITICAL - #define BUS32BIT_VERSION /* * SDRAM Memory Map diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h index af39e2e..0b1541d 100644 --- a/include/configs/ns9750dev.h +++ b/include/configs/ns9750dev.h @@ -28,12 +28,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h index 552beed..016d3d8 100644 --- a/include/configs/omap1510inn.h +++ b/include/configs/omap1510inn.h @@ -27,12 +27,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h index 9b82215..c6ca689 100644 --- a/include/configs/omap1610h2.h +++ b/include/configs/omap1610h2.h @@ -27,12 +27,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h index c00976e..f28ede0 100644 --- a/include/configs/omap1610inn.h +++ b/include/configs/omap1610inn.h @@ -27,12 +27,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h index cd2dbf1..605563a 100644 --- a/include/configs/omap5912osk.h +++ b/include/configs/omap5912osk.h @@ -27,12 +27,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h index 1bdea6c..fda55cf 100644 --- a/include/configs/omap730p2.h +++ b/include/configs/omap730p2.h @@ -27,13 +27,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ - -#define CONFIG_INIT_CRITICAL - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h index 9ba19c8..a6c2371 100644 --- a/include/configs/pleb2.h +++ b/include/configs/pleb2.h @@ -31,12 +31,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h index 6cd9126..a4249c4 100644 --- a/include/configs/scb9328.h +++ b/include/configs/scb9328.h @@ -119,7 +119,6 @@ #define PRECHARGE_CMD 0x910a8200 #define AUTOREFRESH_CMD 0xa10a8200 -#define CONFIG_INIT_CRITICAL /* * SDRAM Memory Map diff --git a/include/configs/shannon.h b/include/configs/shannon.h index 8a4e370..572985b 100644 --- a/include/configs/shannon.h +++ b/include/configs/shannon.h @@ -28,16 +28,13 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ - -/* - * we just run in non-critical mode now, because we use the Inferno-Loader to - * bring us to live + * Since we use the Inferno-Loader to bring us to live, + * we skip the lowlevel init stuff. + * But U-Boot still relocates itself into RAM */ #define CONFIG_INFERNO /* we are using the inferno bootldr */ -#undef CONFIG_INIT_CRITICAL +#define CONFIG_SKIP_LOWLEVEL_INIT 1 +#undef CONFIG_SKIP_RELOCATE_UBOOT /* * High Level Configuration Options diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h index f477575..a137f9d 100644 --- a/include/configs/smdk2400.h +++ b/include/configs/smdk2400.h @@ -31,12 +31,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index 2a1cd77..7edec0d 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -30,12 +30,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h index 6fda7b9..1ee6be1 100644 --- a/include/configs/suzaku.h +++ b/include/configs/suzaku.h @@ -26,12 +26,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/trab.h b/include/configs/trab.h index 2f59260..3ca0049 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -37,12 +37,6 @@ #endif /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h index ca32efb..47251bb 100644 --- a/include/configs/wepep250.h +++ b/include/configs/wepep250.h @@ -23,12 +23,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - #define CONFIG_PXA250 1 /* this is an PXA250 CPU */ #define CONFIG_WEPEP250 1 /* config for wepep250 board */ #undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */ diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h index 1177003..386ce05 100644 --- a/include/configs/xaeniax.h +++ b/include/configs/xaeniax.h @@ -37,16 +37,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* -#undef CONFIG_INIT_CRITICAL -*/ - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/xm250.h b/include/configs/xm250.h index 1be7dd4..952f73b 100644 --- a/include/configs/xm250.h +++ b/include/configs/xm250.h @@ -29,12 +29,6 @@ #define __CONFIG_H /* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - -/* * High Level Configuration Options * (easy to change) */ diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h index 6b15766..847e91a 100644 --- a/include/configs/xsengine.h +++ b/include/configs/xsengine.h @@ -28,12 +28,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * If we are developing, we might want to start armboot from ram - * so we MUST NOT initialize critical regs like mem-timing ... - */ -#define CONFIG_INIT_CRITICAL - /* High Level Configuration Options */ #define CONFIG_PXA250 1 /* This is an PXA250 CPU */ #define CONFIG_XSENGINE 1 |