Merge tag 'u-boot-nand-20230417' of https://source.denx.de/u-boot/custodians/u-boot...

[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 010d28a..3795e61 100644 (file)
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -16,25 +16,9 @@
 
 /* Fixup settings */
 
-/* SPL settings */
-#undef CONFIG_SPL_ETH_SUPPORT
-#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"
-
-/* No falcon support */
-#undef CONFIG_SPL_OS_BOOT
-
-/* FPGA commands that we don't use */
-
-/* Extras */
-
-/* Faster flash, ours may run at 108 MHz */
-#undef CONFIG_SPI_FLASH_WINBOND
-
 /* 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" \
@@ -49,7 +33,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;" \
@@ -61,8 +44,8 @@
 # define EXTRA_ENV_USB
 #endif
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
        "kernel_image=uImage\0" \
        "kernel_addr=0x2080000\0" \
        "ramdisk_image=uramdisk.image.gz\0"     \
@@ -98,10 +81,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 */