diff options
author | wdenk <wdenk> | 2005-04-04 12:44:11 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2005-04-04 12:44:11 +0000 |
commit | 8aa1a2d115420b1eb126f69f3547b54d275c3228 (patch) | |
tree | 9167bf91193bcd6b15696a97180df29bc1524c83 /include/configs/cmc_pu2.h | |
parent | 986ef4340e73c6912a26e0c165c9966ab98618d4 (diff) | |
download | u-boot-imx-8aa1a2d115420b1eb126f69f3547b54d275c3228.zip u-boot-imx-8aa1a2d115420b1eb126f69f3547b54d275c3228.tar.gz u-boot-imx-8aa1a2d115420b1eb126f69f3547b54d275c3228.tar.bz2 |
Patch by Steven Scholz, 4 Apr 2005:
- remove all references to CONFIG_INIT_CRITICAL for ARM based boards
- introduce two new configuration options instead:
CONFIG_SKIP_LOWLEVEL_INIT and CONFIG_SKIP_RELOCATE_UBOOT
Diffstat (limited to 'include/configs/cmc_pu2.h')
-rw-r--r-- | include/configs/cmc_pu2.h | 10 |
1 files changed, 2 insertions, 8 deletions
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 |