X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Finclude%2Fasm%2Fconfig.h;h=5674d37c04df08187628855e61cd1c79d3fa8fef;hb=d46d40474a7e77b1640acd040223af8574ebe5ac;hp=be80434dee4d0dc9824f6f74e198a51be40f938b;hpb=42817eb85de1d7dec399c75dbd133ea6b5351a72;p=u-boot

diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index be80434dee..5674d37c04 100644
--- a/arch/arm/include/asm/config.h
+++ b/arch/arm/include/asm/config.h
@@ -7,23 +7,18 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#ifdef __aarch64__
-#define CONFIG_SYS_GENERIC_GLOBAL_DATA
-#endif
-
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 
 #ifdef CONFIG_ARM64
-#define CONFIG_PHYS_64BIT
 #define CONFIG_STATIC_RELA
 #endif
 
-#ifdef CONFIG_FSL_LSCH3
-#include <asm/arch-fsl-lsch3/config.h>
-#endif
-
-#ifdef CONFIG_LS102XA
+#if defined(CONFIG_ARCH_LS1021A) || \
+	defined(CONFIG_CPU_PXA27X) || \
+	defined(CONFIG_CPU_MONAHANS) || \
+	defined(CONFIG_CPU_PXA25X) || \
+	defined(CONFIG_FSL_LAYERSCAPE)
 #include <asm/arch/config.h>
 #endif