mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-17 22:49:02 +00:00
18bfe9cf5a
Based on thread https://lists.denx.de/pipermail/u-boot/2021-June/451828.html especially "Overall we have a deficiency in the UEFI implementation in that we cannot deal with block devices added or removed after initialization." there is a need to deal with removable media as usb/scsi/sata. That's why bridge this gap in EFI implementation by resetting usb and scsi resets to get all disks before efi_init_obj_list() is called. In our standard boot flow, where we use distro boot, order is fixed as "jtag mmc0 mmc1 qspi0 nand0 usb0 usb1 scsi0 pxe dhcp" with prioritizing boot device added by commit2882b39d56("arm64: zynqmp: Setup the first boot_target at run time"). When device has ESP partition all devices should be detected because then efi_disk_register() in efi_init_obj_list() is called only once. The first such a device is sd/emmc(mmc0/mmc1) and then disks on usb/sata are not handled at all. The commit6bb577dbb3("arm64: zynqmp: Disable EFI_CAPSULE_ON_DISK_EARLY") also pointed out on this issue but detection of removable media wasn't solved that's why do it now via preboot command. I have tested cases without usb and scsi and there is no problem with calling resets without devices itself. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
204 lines
5.4 KiB
Text
204 lines
5.4 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_POSITION_INDEPENDENT=y
|
|
CONFIG_ARCH_ZYNQMP=y
|
|
CONFIG_SYS_TEXT_BASE=0x8000000
|
|
CONFIG_SYS_MALLOC_F_LEN=0x8000
|
|
CONFIG_SYS_MEMTEST_START=0x00000000
|
|
CONFIG_SYS_MEMTEST_END=0x00001000
|
|
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revC"
|
|
CONFIG_SPL=y
|
|
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
|
CONFIG_SPL_SPI_SUPPORT=y
|
|
CONFIG_ZYNQ_MAC_IN_EEPROM=y
|
|
CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
|
|
CONFIG_CMD_FRU=y
|
|
CONFIG_ZYNQMP_USB=y
|
|
CONFIG_AHCI=y
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_SPL_LOAD_FIT=y
|
|
CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
|
|
CONFIG_USE_PREBOOT=y
|
|
CONFIG_PREBOOT="run scsi_init;usb start"
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
CONFIG_BOARD_EARLY_INIT_R=y
|
|
CONFIG_SPL_FPGA=y
|
|
CONFIG_SPL_OS_BOOT=y
|
|
CONFIG_SPL_RAM_SUPPORT=y
|
|
CONFIG_SPL_RAM_DEVICE=y
|
|
CONFIG_SPL_SPI_LOAD=y
|
|
CONFIG_SPL_ATF=y
|
|
CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
|
|
CONFIG_CMD_BOOTMENU=y
|
|
CONFIG_CMD_THOR_DOWNLOAD=y
|
|
CONFIG_CMD_NVEDIT_EFI=y
|
|
CONFIG_CMD_MEMTEST=y
|
|
CONFIG_SYS_ALT_MEMTEST=y
|
|
CONFIG_CMD_BIND=y
|
|
CONFIG_CMD_CLK=y
|
|
CONFIG_CMD_DFU=y
|
|
CONFIG_CMD_FPGA_LOADBP=y
|
|
CONFIG_CMD_FPGA_LOADP=y
|
|
CONFIG_CMD_FPGA_LOAD_SECURE=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_GPT=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_MTD=y
|
|
CONFIG_CMD_NAND_LOCK_UNLOCK=y
|
|
CONFIG_CMD_POWEROFF=y
|
|
CONFIG_CMD_SDRAM=y
|
|
CONFIG_CMD_SF_TEST=y
|
|
CONFIG_CMD_SPI=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
CONFIG_CMD_WDT=y
|
|
CONFIG_CMD_TFTPPUT=y
|
|
CONFIG_CMD_BMP=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_EFIDEBUG=y
|
|
CONFIG_CMD_RTC=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_GETTIME=y
|
|
CONFIG_CMD_TIMER=y
|
|
CONFIG_CMD_REGULATOR=y
|
|
CONFIG_CMD_TPM=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_CMD_MTDPARTS_SPREAD=y
|
|
CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES=y
|
|
CONFIG_CMD_UBI=y
|
|
CONFIG_PARTITION_TYPE_GUID=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
CONFIG_OF_LIST="avnet-ultra96-rev1 zynqmp-a2197-revA zynqmp-e-a2197-00-revA zynqmp-g-a2197-00-revA zynqmp-m-a2197-01-revA zynqmp-m-a2197-02-revA zynqmp-m-a2197-03-revA zynqmp-p-a2197-00-revA zynqmp-zc1232-revA zynqmp-zc1254-revA zynqmp-zc1751-xm015-dc1 zynqmp-zc1751-xm016-dc2 zynqmp-zc1751-xm017-dc3 zynqmp-zc1751-xm018-dc4 zynqmp-zc1751-xm019-dc5 zynqmp-zcu100-revC zynqmp-zcu102-rev1.1 zynqmp-zcu102-rev1.0 zynqmp-zcu102-revA zynqmp-zcu102-revB zynqmp-zcu104-revA zynqmp-zcu104-revC zynqmp-zcu106-revA zynqmp-zcu111-revA zynqmp-zcu1275-revA zynqmp-zcu1275-revB zynqmp-zcu1285-revA zynqmp-zcu208-revA zynqmp-zcu216-revA zynqmp-topic-miamimp-xilinx-xdp-v1r1 zynqmp-sm-k26-revA zynqmp-smk-k26-revA"
|
|
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent interrupts iommus power-domains"
|
|
CONFIG_ENV_IS_NOWHERE=y
|
|
CONFIG_ENV_IS_IN_FAT=y
|
|
CONFIG_ENV_IS_IN_NAND=y
|
|
CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART=":auto"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_NETCONSOLE=y
|
|
CONFIG_SPL_DM_SEQ_ALIAS=y
|
|
CONFIG_SCSI_AHCI=y
|
|
CONFIG_SATA_CEVA=y
|
|
CONFIG_CLK_ZYNQMP=y
|
|
CONFIG_DFU_TFTP=y
|
|
CONFIG_DFU_TIMEOUT=y
|
|
CONFIG_DFU_MMC=y
|
|
CONFIG_DFU_NAND=y
|
|
CONFIG_DFU_RAM=y
|
|
CONFIG_DFU_SF=y
|
|
CONFIG_DFU_MTD=y
|
|
CONFIG_SET_DFU_ALT_INFO=y
|
|
CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1800000
|
|
CONFIG_USB_FUNCTION_FASTBOOT=y
|
|
CONFIG_FASTBOOT_FLASH=y
|
|
CONFIG_FASTBOOT_FLASH_MMC_DEV=0
|
|
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
|
|
CONFIG_FPGA_XILINX=y
|
|
CONFIG_FPGA_ZYNQMPPL=y
|
|
CONFIG_GPIO_HOG=y
|
|
CONFIG_XILINX_GPIO=y
|
|
CONFIG_DM_PCA953X=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SYS_I2C_CADENCE=y
|
|
CONFIG_I2C_MUX=y
|
|
CONFIG_I2C_MUX_PCA954x=y
|
|
CONFIG_LED=y
|
|
CONFIG_LED_GPIO=y
|
|
CONFIG_MISC=y
|
|
CONFIG_I2C_EEPROM=y
|
|
CONFIG_SYS_I2C_EEPROM_ADDR=0x0
|
|
CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
|
|
CONFIG_SUPPORT_EMMC_BOOT=y
|
|
CONFIG_MMC_IO_VOLTAGE=y
|
|
CONFIG_MMC_UHS_SUPPORT=y
|
|
CONFIG_MMC_HS200_SUPPORT=y
|
|
CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_ZYNQ=y
|
|
CONFIG_MTD=y
|
|
CONFIG_DM_MTD=y
|
|
CONFIG_MTD_RAW_NAND=y
|
|
CONFIG_NAND_ARASAN=y
|
|
CONFIG_SYS_NAND_MAX_CHIPS=2
|
|
CONFIG_SPI_FLASH_BAR=y
|
|
CONFIG_SF_DUAL_FLASH=y
|
|
CONFIG_SPI_FLASH_ISSI=y
|
|
CONFIG_SPI_FLASH_MACRONIX=y
|
|
CONFIG_SPI_FLASH_SPANSION=y
|
|
CONFIG_SPI_FLASH_STMICRO=y
|
|
CONFIG_SPI_FLASH_SST=y
|
|
CONFIG_SPI_FLASH_WINBOND=y
|
|
# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
|
|
CONFIG_SPI_FLASH_MTD=y
|
|
CONFIG_PHY_MARVELL=y
|
|
CONFIG_PHY_MICREL=y
|
|
CONFIG_PHY_MICREL_KSZ90X1=y
|
|
CONFIG_PHY_NATSEMI=y
|
|
CONFIG_PHY_REALTEK=y
|
|
CONFIG_PHY_TI_DP83867=y
|
|
CONFIG_PHY_VITESSE=y
|
|
CONFIG_PHY_XILINX_GMII2RGMII=y
|
|
CONFIG_PHY_FIXED=y
|
|
CONFIG_XILINX_AXIEMAC=y
|
|
CONFIG_ZYNQ_GEM=y
|
|
CONFIG_DM_REGULATOR=y
|
|
CONFIG_DM_REGULATOR_FIXED=y
|
|
CONFIG_DM_RTC=y
|
|
CONFIG_RTC_EMULATION=y
|
|
CONFIG_RTC_ZYNQMP=y
|
|
CONFIG_SCSI=y
|
|
CONFIG_DM_SCSI=y
|
|
CONFIG_ARM_DCC=y
|
|
CONFIG_XILINX_UARTLITE=y
|
|
CONFIG_ZYNQ_SERIAL=y
|
|
CONFIG_SPI=y
|
|
CONFIG_ZYNQ_SPI=y
|
|
CONFIG_ZYNQMP_GQSPI=y
|
|
CONFIG_SYSRESET=y
|
|
CONFIG_SYSRESET_CMD_POWEROFF=y
|
|
CONFIG_SYSRESET_PSCI=y
|
|
CONFIG_TPM2_TIS_SPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_XHCI_DWC3=y
|
|
CONFIG_USB_DWC3=y
|
|
CONFIG_USB_DWC3_GENERIC=y
|
|
CONFIG_USB_ULPI_VIEWPORT=y
|
|
CONFIG_USB_ULPI=y
|
|
CONFIG_USB_HOST_ETHER=y
|
|
CONFIG_USB_ETHER_ASIX=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
|
|
CONFIG_USB_FUNCTION_THOR=y
|
|
CONFIG_USB_ETHER=y
|
|
CONFIG_USB_ETH_CDC=y
|
|
CONFIG_DM_VIDEO=y
|
|
CONFIG_VIDEO_COPY=y
|
|
CONFIG_DISPLAY=y
|
|
CONFIG_VIDEO_SEPS525=y
|
|
CONFIG_LCD=y
|
|
CONFIG_SPLASH_SCREEN=y
|
|
CONFIG_BMP_16BPP=y
|
|
CONFIG_BMP_24BPP=y
|
|
CONFIG_BMP_32BPP=y
|
|
CONFIG_WDT=y
|
|
CONFIG_PANIC_HANG=y
|
|
CONFIG_TPM=y
|
|
CONFIG_SPL_GZIP=y
|
|
# CONFIG_SPL_HEXDUMP is not set
|
|
CONFIG_OF_LIBFDT_OVERLAY=y
|
|
CONFIG_EFI_SET_TIME=y
|
|
CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
|
|
CONFIG_EFI_CAPSULE_ON_DISK=y
|
|
CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
|
|
CONFIG_EFI_SECURE_BOOT=y
|