Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

[platform/kernel/u-boot.git] / include / configs / x530.h

diff --git a/include/configs/x530.h b/include/configs/x530.h
index f4d6449..cb12683 100644 (file)
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -10,8 +10,6 @@
  * High Level Configuration Options (easy to change)
  */
 
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
 /*
  * NS16550 Configuration
  */
@@ -49,11 +47,6 @@
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
 
-/* PCIe support */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 /* NAND */
 
 #include <asm/arch/config.h>
@@ -66,20 +59,4 @@
 #define CONFIG_UBI_PART                        user
 #define CONFIG_UBIFS_VOLUME            user
 
-/* SPL */
-
-/* Defines for SPL */
-#define CONFIG_SPL_SIZE                        (140 << 10)
-#define CONFIG_SPL_MAX_SIZE            (CONFIG_SPL_SIZE - 0x0030)
-
-#define CONFIG_SPL_BSS_START_ADDR      (0x40000000 + CONFIG_SPL_SIZE)
-#define CONFIG_SPL_BSS_MAX_SIZE                (16 << 10)
-
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_MALLOC_SIMPLE
-#endif
-
-#define CONFIG_SPL_STACK               (0x40000000 + ((192 - 16) << 10))
-#define CONFIG_SPL_BOOTROM_SAVE                (CONFIG_SPL_STACK + 4)
-
 #endif /* _CONFIG_X530_H */