mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 07:31:15 +00:00
zynqmp: config: Add proper dependencies for USB
When CONFIG_CMD_USB and CONFIG_USB are disabled, still some compilation errors are seen as below. In file included from include/configs/xilinx_zynqmp.h:173, from include/config.h:3, from include/common.h:16, from env/common.c:10: include/config_distro_bootcmd.h:302:9: error: expected '}' before 'BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB' 302 | BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/config_distro_bootcmd.h:302:9: note: in definition of macro 'BOOTENV_DEV_NAME_USB' 302 | BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/configs/xilinx_zynqmp.h:77:41: note: in expansion of macro 'BOOTENV_DEV_NAME' 77 | # define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) func(USB, usb, 1) | ^~~~ include/configs/xilinx_zynqmp.h:168:9: note: in expansion of macro 'BOOT_TARGET_DEVICES_USB' 168 | BOOT_TARGET_DEVICES_USB(func) \ | ^~~~~~~~~~~~~~~~~~~~~~~ include/config_distro_bootcmd.h:454:25: note: in expansion of macro 'BOOT_TARGET_DEVICES' 454 | "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0" | ^~~~~~~~~~~~~~~~~~~ include/config_distro_bootcmd.h:474:9: note: in expansion of macro 'BOOTENV_BOOT_TARGETS' 474 | BOOTENV_BOOT_TARGETS \ | ^~~~~~~~~~~~~~~~~~~~ include/configs/xilinx_zynqmp.h:179:9: note: in expansion of macro 'BOOTENV' 179 | BOOTENV | ^~~~~~~ include/env_default.h:120:9: note: in expansion of macro 'CFG_EXTRA_ENV_SETTINGS' 120 | CFG_EXTRA_ENV_SETTINGS | ^~~~~~~~~~~~~~~~~~~~~~ In file included from env/common.c:32: include/env_default.h:27:36: note: to match this '{' 27 | const char default_environment[] = { | ^ scripts/Makefile.build:256: recipe for target 'env/common.o' failed make[1]: *** [env/common.o] Error 1 Makefile:1853: recipe for target 'env' failed make: *** [env] Error 2 make: *** Waiting for unfinished jobs.... Add CONFIG_USB_STORAGE as dependency for USB related macro's such as BOOT_TARGET_DEVICES_USB() and DFU_DEFAULT_POLL_TIMEOUT and CONFIG_THOR_RESET_OFF. Remove CONFIG_ZYNQMP_USB from Kconfig and also from defconfig since it is not used anywhere else. Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com> Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com> Link: https://lore.kernel.org/r/20230904031528.11817-3-venkatesh.abbarapu@amd.com Signed-off-by: Michal Simek <michal.simek@amd.com>
This commit is contained in:
parent
16794d3008
commit
b764e84f9f
3 changed files with 2 additions and 6 deletions
|
@ -84,9 +84,6 @@ config ZYNQMP_SPL_PM_CFG_OBJ_FILE
|
||||||
Leave this option empty if your PMU firmware has a hard-coded
|
Leave this option empty if your PMU firmware has a hard-coded
|
||||||
configuration object or you are loading it by any other means.
|
configuration object or you are loading it by any other means.
|
||||||
|
|
||||||
config ZYNQMP_USB
|
|
||||||
bool "Configure ZynqMP USB"
|
|
||||||
|
|
||||||
config ZYNQMP_NO_DDR
|
config ZYNQMP_NO_DDR
|
||||||
bool "Disable DDR MMU mapping"
|
bool "Disable DDR MMU mapping"
|
||||||
help
|
help
|
||||||
|
|
|
@ -16,7 +16,6 @@ CONFIG_ENV_OFFSET_REDUND=0x1E80000
|
||||||
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||||
CONFIG_SPL_SPI=y
|
CONFIG_SPL_SPI=y
|
||||||
CONFIG_CMD_FRU=y
|
CONFIG_CMD_FRU=y
|
||||||
CONFIG_ZYNQMP_USB=y
|
|
||||||
CONFIG_SYS_LOAD_ADDR=0x8000000
|
CONFIG_SYS_LOAD_ADDR=0x8000000
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
CONFIG_SYS_MEMTEST_START=0x00000000
|
CONFIG_SYS_MEMTEST_START=0x00000000
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
/* Miscellaneous configurable options */
|
/* Miscellaneous configurable options */
|
||||||
|
|
||||||
#if defined(CONFIG_ZYNQMP_USB)
|
#if defined(CONFIG_USB_STORAGE)
|
||||||
#define DFU_DEFAULT_POLL_TIMEOUT 300
|
#define DFU_DEFAULT_POLL_TIMEOUT 300
|
||||||
|
|
||||||
# define PARTS_DEFAULT \
|
# define PARTS_DEFAULT \
|
||||||
|
@ -77,7 +77,7 @@
|
||||||
# define BOOT_TARGET_DEVICES_SCSI(func)
|
# define BOOT_TARGET_DEVICES_SCSI(func)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_ZYNQMP_USB)
|
#if defined(CONFIG_USB_STORAGE)
|
||||||
# define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) func(USB, usb, 1)
|
# define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) func(USB, usb, 1)
|
||||||
#else
|
#else
|
||||||
# define BOOT_TARGET_DEVICES_USB(func)
|
# define BOOT_TARGET_DEVICES_USB(func)
|
||||||
|
|
Loading…
Reference in a new issue