Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI

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

diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index 32cd5b2..4348645 100644 (file)
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -18,7 +18,6 @@
 #define GICD_BASE      0xF9000000
 #define GICR_BASE      0xF9080000
 
-
 #define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_TEXT_BASE
 
 /* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */
@@ -37,39 +36,20 @@
 #define CONFIG_BOOTP_MAY_FAIL
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LOAD_ADDR           0x8000000
 
 /* Monitor Command Prompt */
 /* Console I/O Buffer Size */
 #define CONFIG_SYS_CBSIZE              2048
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                       sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_MAXARGS             64
 
 #if defined(CONFIG_CMD_DFU)
-#define CONFIG_SYS_DFU_DATA_BUF_SIZE   0x1800000
 #define DFU_DEFAULT_POLL_TIMEOUT       300
 #define CONFIG_THOR_RESET_OFF
-#define DFU_ALT_INFO_RAM \
-       "dfu_ram_info=" \
-       "setenv dfu_alt_info " \
-       "Image ram 80000 $kernel_size_r\\\\;" \
-       "system.dtb ram $fdt_addr_r $fdt_size_r\0" \
-       "dfu_ram=run dfu_ram_info && dfu 0 ram 0\0" \
-       "thor_ram=run dfu_ram_info && thordown 0 ram 0\0"
-
-#define DFU_ALT_INFO  \
-               DFU_ALT_INFO_RAM
-#endif
-
-#if !defined(DFU_ALT_INFO)
-# define DFU_ALT_INFO
 #endif
 
 /* Ethernet driver */
 #if defined(CONFIG_ZYNQ_GEM)
-# define CONFIG_NET_MULTI
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 # define PHY_ANEG_TIMEOUT       20000
 #endif
@@ -79,12 +59,13 @@
 #define CONFIG_CLOCKS
 
 #define ENV_MEM_LAYOUT_SETTINGS \
-       "fdt_high=10000000\0" \
        "fdt_addr_r=0x40000000\0" \
        "fdt_size_r=0x400000\0" \
        "pxefile_addr_r=0x10000000\0" \
        "kernel_addr_r=0x18000000\0" \
        "kernel_size_r=0x10000000\0" \
+       "kernel_comp_addr_r=0x30000000\0" \
+       "kernel_comp_size=0x3C00000\0" \
        "scriptaddr=0x20000000\0" \
        "ramdisk_addr_r=0x02100000\0" \
        "script_size_f=0x80000\0"
@@ -95,6 +76,18 @@
 # define BOOT_TARGET_DEVICES_MMC(func)
 #endif
 
+#if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
+# define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na)
+#else
+# define BOOT_TARGET_DEVICES_PXE(func)
+#endif
+
+#if defined(CONFIG_CMD_DHCP)
+# define BOOT_TARGET_DEVICES_DHCP(func)        func(DHCP, dhcp, na)
+#else
+# define BOOT_TARGET_DEVICES_DHCP(func)
+#endif
+
 #if defined(CONFIG_ZYNQMP_GQSPI) || defined(CONFIG_CADENCE_OSPI_VERSAL)
 # define BOOT_TARGET_DEVICES_XSPI(func)        func(XSPI, xspi, 0)
 #else
@@ -119,25 +112,42 @@
 #define BOOTENV_DEV_NAME_JTAG(devtypeu, devtypel, instance) \
        "jtag "
 
-#define BOOT_TARGET_DEVICES_DFU_USB(func)  func(DFU_USB, dfu_usb, 0)
+#define BOOT_TARGET_DEVICES_USB_DFU(func) \
+       func(USB_DFU, usb_dfu, 0) func(USB_DFU, usb_dfu, 1)
+
+#define BOOTENV_DEV_USB_DFU(devtypeu, devtypel, instance) \
+       "bootcmd_" #devtypel #instance "=setenv dfu_alt_info boot.scr ram " \
+       "$scriptaddr $script_size_f && " \
+       "dfu " #instance " ram " #instance " 60 && " \
+       "echo DFU" #instance ": Trying to boot script at ${scriptaddr} && " \
+       "source ${scriptaddr}; " \
+       "echo DFU" #instance ": SCRIPT FAILED: continuing...;\0"
+
+#define BOOTENV_DEV_NAME_USB_DFU(devtypeu, devtypel, instance) \
+       ""
+
+#define BOOT_TARGET_DEVICES_USB_THOR(func) \
+       func(USB_THOR, usb_thor, 0) func(USB_THOR, usb_thor, 1)
 
-#define BOOTENV_DEV_DFU_USB(devtypeu, devtypel, instance) \
-       "bootcmd_dfu_usb=setenv dfu_alt_info boot.scr ram $scriptaddr " \
-       "$script_size_f; dfu 0 ram 0 && " \
-       "echo DFU: Trying to boot script at ${scriptaddr} && " \
+#define BOOTENV_DEV_USB_THOR(devtypeu, devtypel, instance) \
+       "bootcmd_" #devtypel #instance "=setenv dfu_alt_info boot.scr ram " \
+       "$scriptaddr $script_size_f && " \
+       "thordown " #instance " ram " #instance " && " \
+       "echo THOR" #instance ": Trying to boot script at ${scriptaddr} && " \
        "source ${scriptaddr}; " \
-       "echo DFU: SCRIPT FAILED: continuing...;\0"
+       "echo THOR" #instance ": SCRIPT FAILED: continuing...;\0"
 
-#define BOOTENV_DEV_NAME_DFU_USB(devtypeu, devtypel, instance) \
-       "dfu_usb "
+#define BOOTENV_DEV_NAME_USB_THOR(devtypeu, devtypel, instance) \
+       ""
 
 #define BOOT_TARGET_DEVICES(func) \
        BOOT_TARGET_DEVICES_JTAG(func) \
        BOOT_TARGET_DEVICES_MMC(func) \
        BOOT_TARGET_DEVICES_XSPI(func) \
-       BOOT_TARGET_DEVICES_DFU_USB(func) \
-       func(PXE, pxe, na) \
-       func(DHCP, dhcp, na)
+       BOOT_TARGET_DEVICES_USB_DFU(func) \
+       BOOT_TARGET_DEVICES_USB_THOR(func) \
+       BOOT_TARGET_DEVICES_PXE(func) \
+       BOOT_TARGET_DEVICES_DHCP(func)
 
 #include <config_distro_bootcmd.h>
 
@@ -145,8 +155,7 @@
 #ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
        ENV_MEM_LAYOUT_SETTINGS \
-       BOOTENV \
-       DFU_ALT_INFO
+       BOOTENV
 #endif
 
 #endif /* __XILINX_VERSAL_H */