From cb73b0c227daf37bb9422b9dce29c3576d4a5af3 Mon Sep 17 00:00:00 2001 From: "Menon, Nishanth" Date: Mon, 12 May 2008 11:35:15 +0200 Subject: Change CONFIG_SKIP_LOWLEVEL_INIT to CONFIG_MACH_DO_LOWLEVEL_INIT as we rather use positive logic. Make it dependent on boards that have it rather than on ARM Signed-off-by: Nishanth Menon Signed-off-by: Sascha Hauer --- arch/m68k/Kconfig | 4 ++++ arch/m68k/cpu/start-mcfv4e.S | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'arch/m68k') 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 * -- cgit v1.2.3