Convert CONFIG_SPL_FS_LOAD_PAYLOAD_NAME et al to Kconfig

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

diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index 9e8409b..f8c7821 100644 (file)
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2014 Topic Embedded Products
  *
  * Configuration for Zynq Evaluation and Development Board - Miami
  * See zynq-common.h for Zynq common configs
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_TOPIC_MIAMI_H
@@ -16,50 +15,14 @@
 #include "zynq-common.h"
 
 /* Fixup settings */
-#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_SIZE                        0x8000
-#undef CONFIG_ENV_OFFSET
-#define CONFIG_ENV_OFFSET              0x80000
 
 /* SPL settings */
-#undef CONFIG_SPL_ETH_SUPPORT
-#undef CONFIG_SYS_SPI_U_BOOT_OFFS
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 #undef CONFIG_SPL_MAX_FOOTPRINT
 #define CONFIG_SPL_MAX_FOOTPRINT       CONFIG_SYS_SPI_U_BOOT_OFFS
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME     "u-boot.img"
-
-/* sspi command isn't useful */
-#undef CONFIG_CMD_SPI
-
-/* No useful gpio */
-#undef CONFIG_ZYNQ_GPIO
-#undef CONFIG_CMD_GPIO
-
-/* No falcon support */
-#undef CONFIG_SPL_OS_BOOT
-#undef CONFIG_SPL_FPGA_SUPPORT
-
-/* FPGA commands that we don't use */
-
-/* Extras */
-#define CONFIG_CMD_MEMTEST
-#undef CONFIG_SYS_MEMTEST_START
-#define CONFIG_SYS_MEMTEST_START       0
-#undef CONFIG_SYS_MEMTEST_END
-#define CONFIG_SYS_MEMTEST_END 0x18000000
-
-/* Faster flash, ours may run at 108 MHz */
-#undef CONFIG_SF_DEFAULT_SPEED
-#define CONFIG_SF_DEFAULT_SPEED        108000000
-#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
-#undef CONFIG_SPI_FLASH_WINBOND
-#undef CONFIG_SPI_FLASH_ISSI
 
 /* Setup proper boot sequences for Miami boards */
 
-#if defined(CONFIG_USB)
+#if defined(CONFIG_USB_HOST)
 # define EXTRA_ENV_USB \
        "usbreset=i2c dev 1 && i2c mw 41 1 ff && i2c mw 41 3 fe && "\
                "i2c mw 41 1 fe && i2c mw 41 1 ff\0" \
@@ -74,7 +37,6 @@
                        "${devicetree_addr}; " \
        "fi\0"
   /* Note that addresses here should match the addresses in the env */
-# undef DFU_ALT_INFO
 # define DFU_ALT_INFO \
        "dfu_alt_info=" \
        "uImage ram 0x2080000 0x500000;" \
@@ -86,8 +48,6 @@
 # define EXTRA_ENV_USB
 #endif
 
-#undef CONFIG_PREBOOT
-
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "kernel_image=uImage\0" \
@@ -125,10 +85,4 @@
        EXTRA_ENV_USB \
        DFU_ALT_INFO
 
-#undef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND     "if mmcinfo; then " \
-       "if fatload mmc 0 0x1900000 ${bootscript}; then source 0x1900000; " \
-       "fi; fi; run $modeboot"
-#undef CONFIG_DISPLAY_BOARDINFO
-
 #endif /* __CONFIG_TOPIC_MIAMI_H */