Merge tag 'u-boot-atmel-fixes-2019.07-a' of git://git.denx.de/u-boot-atmel

[oweals/u-boot.git] / arch / arm / include / asm / config.h

diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index 22fff02778f0e7cecdf163a6e9bd6f4026c2e3cc..bf692ce2792e974c21f7ee5a2a8cb36be3781850 100644 (file)
--- a/arch/arm/include/asm/config.h
+++ b/arch/arm/include/asm/config.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _ASM_CONFIG_H_
@@ -10,19 +9,11 @@
 #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
-
-#if defined(CONFIG_LS102XA) || \
+#if defined(CONFIG_ARCH_LS1021A) || \
        defined(CONFIG_CPU_PXA27X) || \
        defined(CONFIG_CPU_MONAHANS) || \
-       defined(CONFIG_CPU_PXA25X)
+       defined(CONFIG_CPU_PXA25X) || \
+       defined(CONFIG_FSL_LAYERSCAPE)
 #include <asm/arch/config.h>
 #endif