global: Migrate CONFIG_STACKBASE to CFG

[platform/kernel/u-boot.git] / include / configs / mvebu_armada-8k.h

diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index beecf18..239a097 100644 (file)
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -9,61 +9,27 @@
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_SYS_TCLK                250000000       /* 250MHz */
+#define CFG_SYS_TCLK           250000000       /* 250MHz */
 
 /* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE  0x00000000
+#define CFG_SYS_SDRAM_BASE     0x00000000
 
 /* auto boot */
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, \
+#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
                                          115200, 230400, 460800, 921600 }
 
-#define        CONFIG_SYS_CBSIZE       1024    /* Console I/O Buff Size */
-
 /*
  * Other required minimal configurations
  */
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
-#define CONFIG_SYS_MAXARGS     32      /* max number of command args */
-
-/* End of 16M scrubbed by training in bootrom */
-#define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_TEXT_BASE + 0xFF0000)
 
 /* When runtime detection fails this is the default */
 
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_SYS_NAND_MAX_CHIPS      1
-#define CONFIG_SYS_NAND_ONFI_DETECTION
-
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_ARP_TIMEOUT     200
-#define CONFIG_NET_RETRY_COUNT 50
-
-#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
-
 /* USB ethernet */
 
 /*
- * SATA/SCSI/AHCI configuration
- */
-#define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_LBA48
-#define CONFIG_SYS_64BIT_LBA
-
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID    2
-#define CONFIG_SYS_SCSI_MAX_LUN                1
-#define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-                                        CONFIG_SYS_SCSI_MAX_LUN)
-
-/*
  * PCI configuration
  */
-#ifdef CONFIG_PCIE_DW_MVEBU
-#define CONFIG_E1000
-#endif
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 1) \
@@ -75,7 +41,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "scriptaddr=0x6d00000\0"        \
        "pxefile_addr_r=0x6e00000\0"    \
        "fdt_addr_r=0x6f00000\0"        \