diff options
-rw-r--r-- | arch/arm/Kconfig | 4 | ||||
-rw-r--r-- | arch/arm/cpu/start-arm.S | 2 | ||||
-rw-r--r-- | arch/m68k/Kconfig | 4 | ||||
-rw-r--r-- | arch/m68k/cpu/start-mcfv4e.S | 4 | ||||
-rw-r--r-- | common/Kconfig | 20 |
5 files changed, 23 insertions, 11 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6128f6990d..e6df3318ff 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -89,6 +89,7 @@ config MACH_SCB9328 select HAS_DM9000 select HAS_CFI select ARCH_IMX1 + select MACH_HAS_LOWLEVEL_INIT help Say Y here if you are using the Synertronixx scb9328 board @@ -96,6 +97,7 @@ config MACH_PCM038 bool "phyCORE-i.MX27" select HAS_CFI select ARCH_IMX27 + select MACH_HAS_LOWLEVEL_INIT help Say Y here if you are using Phytec's phyCORE-i.MX27 (pcm038) equipped with a Freescale i.MX27 Processor @@ -104,6 +106,7 @@ config MACH_IMX27ADS bool "Freescale i.MX27ADS" select HAS_CFI select ARCH_IMX27 + select MACH_HAS_LOWLEVEL_INIT help Say Y here if you are using the Freescale i.MX27ads board equipped with a Freescale i.MX27 Processor @@ -121,6 +124,7 @@ config MACH_NXDB500 select HAS_NETX_ETHER select HAS_CFI select ARCH_NETX + select MACH_HAS_LOWLEVEL_INIT help Say Y here if you are using the Hilscher Netx nxdb500 board diff --git a/arch/arm/cpu/start-arm.S b/arch/arm/cpu/start-arm.S index 8e4d2c2105..a4a18c64dc 100644 --- a/arch/arm/cpu/start-arm.S +++ b/arch/arm/cpu/start-arm.S @@ -156,7 +156,7 @@ reset: * because memory timing is board-dependend, you will * find a lowlevel_init.S in your board directory. */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifdef CONFIG_MACH_DO_LOWLEVEL_INIT bl board_init_lowlevel #endif diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 07cf431dbe..313a8f14f9 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -84,6 +84,7 @@ config MACH_KPUKDR1_NUM bool "konzeptpark UKD R1 + phyCore MCF5475 NUM" select HAS_CFI select ARCH_MCF54xx + select MACH_HAS_LOWLEVEL_INIT help Say Y here if you are using the konzeptpark UKD R1 with a Phytec Phycore PCM-024-NUM equipped with a Freescale MC5475 Processor @@ -108,6 +109,7 @@ config MACH_PCM982_5485 bool "Phytec pcm982 + phyCore MCF5485" select HAS_CFI select ARCH_MCF54xx + select MACH_HAS_LOWLEVEL_INIT help Say Y here if you are using the Phytec Phycore PCM-024 equipped with a Freescale MC5485 Processor @@ -116,6 +118,7 @@ config MACH_PCM982_5475 bool "Phytec pcm982 + phyCore MCF5475" select HAS_CFI select ARCH_MCF54xx + select MACH_HAS_LOWLEVEL_INIT help Say Y here if you are using the Phytec Phycore PCM-024 equipped with a Freescale MC5475 Processor @@ -124,6 +127,7 @@ config MACH_PCM982_5475_NUM bool "Phytec pcm982 + phyCore MCF5475 NUM" select HAS_CFI select ARCH_MCF54xx + select MACH_HAS_LOWLEVEL_INIT help Say Y here if you are using the Phytec Phycore PCM-024 equipped with a Freescale MC5475 Processor (NUM Variant) diff --git a/arch/m68k/cpu/start-mcfv4e.S b/arch/m68k/cpu/start-mcfv4e.S index c77fe676bb..489082f9a1 100644 --- a/arch/m68k/cpu/start-mcfv4e.S +++ b/arch/m68k/cpu/start-mcfv4e.S @@ -448,7 +448,7 @@ saveland: * * Do not jump/call other u-boot code here! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifdef CONFIG_MACH_DO_LOWLEVEL_INIT bsr.l board_init_lowlevel nop #endif @@ -512,7 +512,7 @@ skip_copy_vectors: nop #endif -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#ifdef CONFIG_MACH_DO_LOWLEVEL_INIT /* * Call other half of initcode in relocated code * diff --git a/common/Kconfig b/common/Kconfig index 05223d5acf..79a3684867 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -65,6 +65,18 @@ config RELOCATABLE allowing it to relocate to the end of the available RAM. This way you have the whole memory in a single piece. +config MACH_HAS_LOWLEVEL_INIT + bool + +config MACH_DO_LOWLEVEL_INIT + bool "run machine low-level init" + depends on MACH_HAS_LOWLEVEL_INIT + default y + help + This entry enables SDRAM and other board low level initialization + on many platforms. Disabling this option allows configurations to use + U-boot as a second stage boot loader. + config PROMPT string prompt "U-Boot command prompt" @@ -216,14 +228,6 @@ config DEBUG_INFO help Enable build of u-boot with -g. -config SKIP_LOWLEVEL_INIT - bool - depends on ARM - prompt "Skip lowlevel init" - help - This entry skips the SDRAM initialising on many ARM based boards. - It enables using U-boot as a second stage bootloader. - config ENABLE_FLASH_NOISE bool prompt "verbose flash handling" |