global: Migrate CONFIG_STACKBASE to CFG

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

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index a007d36..011f003 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -14,10 +14,8 @@
 #define GICD_BASE      0xF9010000
 #define GICC_BASE      0xF9020000
 
-#define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_TEXT_BASE
-
 /* Serial setup */
-#define CONFIG_SYS_BAUDRATE_TABLE \
+#define CFG_SYS_BAUDRATE_TABLE \
        { 4800, 9600, 19200, 38400, 57600, 115200 }
 
 /* GUIDs for capsule updatable firmware images */
@@ -29,23 +27,16 @@
        EFI_GUID(0xcf9ecfd4, 0x938b, 0x41c5, 0x85, 0x51, \
                 0x1f, 0x88, 0x3a, 0xb7, 0xdc, 0x18)
 
-#ifdef CONFIG_NAND_ARASAN
-# define CONFIG_SYS_MAX_NAND_DEVICE    1
-#endif
-
 /* Miscellaneous configurable options */
 
 #if defined(CONFIG_ZYNQMP_USB)
 #define DFU_DEFAULT_POLL_TIMEOUT       300
-#define CONFIG_THOR_RESET_OFF
 
-#ifndef CONFIG_SPL_BUILD
 # define PARTS_DEFAULT \
        "partitions=uuid_disk=${uuid_gpt_disk};" \
        "name=""boot"",size=16M,uuid=${uuid_gpt_boot};" \
        "name=""Linux"",size=-M,uuid=${uuid_gpt_Linux}\0"
 #endif
-#endif
 
 #if !defined(PARTS_DEFAULT)
 # define PARTS_DEFAULT
@@ -58,8 +49,6 @@
 # define PHY_ANEG_TIMEOUT       20000
 #endif
 
-#define CONFIG_SYS_BOOTM_LEN   (100 * 1024 * 1024)
-
 #define ENV_MEM_LAYOUT_SETTINGS \
        "fdt_addr_r=0x40000000\0" \
        "fdt_size_r=0x400000\0" \
@@ -184,16 +173,16 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
        ENV_MEM_LAYOUT_SETTINGS \
        BOOTENV
 #endif
 
 /* SPL can't handle all huge variables - define just DFU */
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
-#undef CONFIG_EXTRA_ENV_SETTINGS
-# define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+# define CFG_EXTRA_ENV_SETTINGS \
        "dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \
                          "atf-uboot.ub ram 0x10000000 0x1000000;" \
                          "Image ram 0x80000 0x3f80000;" \
@@ -201,36 +190,16 @@
        "dfu_bufsiz=0x1000\0"
 #endif
 
-#define CONFIG_SPL_STACK               0xfffffffc
-#define CONFIG_SPL_MAX_SIZE            0x40000
-
-/* Just random location in OCM */
-#define CONFIG_SPL_BSS_START_ADDR      0x0
-#define CONFIG_SPL_BSS_MAX_SIZE                0x80000
-
 #if defined(CONFIG_SPL_SPI_FLASH_SUPPORT)
-# define CONFIG_SYS_SPI_KERNEL_OFFS    0x80000
-# define CONFIG_SYS_SPI_ARGS_OFFS      0xa0000
-# define CONFIG_SYS_SPI_ARGS_SIZE      0xa0000
+# define CFG_SYS_SPI_KERNEL_OFFS       0x80000
+# define CFG_SYS_SPI_ARGS_OFFS 0xa0000
+# define CFG_SYS_SPI_ARGS_SIZE 0xa0000
 #endif
 
 /* u-boot is like dtb */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x8000000
 
 /* ATF is my kernel image */
 
-/* MMC support */
-# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */
-# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS        0 /* unused */
-
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU)
-# define CONFIG_SPL_HASH
-# define CONFIG_ENV_MAX_ENTRIES        10
-#endif
-
-#define CONFIG_SYS_SPL_MALLOC_START    0x20000000
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x1000000
-
 #ifdef CONFIG_SPL_SYS_MALLOC_SIMPLE
 # error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used"
 #endif