global: Move remaining CONFIG_SYS_* to CFG_SYS_*

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

diff --git a/include/configs/x530.h b/include/configs/x530.h
index d23b7b4..dee87cb 100644 (file)
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -13,11 +13,9 @@
 /*
  * NS16550 Configuration
  */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_CLK         CONFIG_SYS_TCLK
+#define CFG_SYS_NS16550_CLK            CFG_SYS_TCLK
 #if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#define CONFIG_SYS_NS16550_COM1                MV_UART_CONSOLE_BASE
+#define CFG_SYS_NS16550_COM1           MV_UART_CONSOLE_BASE
 #endif
 
 /*
@@ -27,7 +25,6 @@
  */
 
 /* NAND */
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
 
 #define BBT_CUSTOM_SCAN
 #define BBT_CUSTOM_SCAN_PAGE 0
@@ -47,11 +44,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>
@@ -64,19 +56,4 @@
 #define CONFIG_UBI_PART                        user
 #define CONFIG_UBIFS_VOLUME            user
 
-/* SPL */
-
-/* Defines for SPL */
-#define CONFIG_SPL_SIZE                        (140 << 10)
-
-#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 */