aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2022-04-06 11:39:34 +0200
committerStefan Roese <sr@denx.de>2022-05-02 07:47:26 +0200
commit9efc5b7a4b40bbb18689a2c3b5c73de3272c136e (patch)
treefdcc0208d3b46dde8b71df034fe758137c05e076
parent31f88018d924fffaa9b710017261e415850ef2b2 (diff)
downloadu-boot-9efc5b7a4b40bbb18689a2c3b5c73de3272c136e.zip
u-boot-9efc5b7a4b40bbb18689a2c3b5c73de3272c136e.tar.gz
u-boot-9efc5b7a4b40bbb18689a2c3b5c73de3272c136e.tar.bz2
arm: mvebu: turris_omnia: Always enable MMC, SCSI and USB boot targets
U-Boot for Turris Omnia is always compiled with MMC, SCSI and USB support, so always enable macros for booting from these devices. Signed-off-by: Pali Rohár <pali@kernel.org>
-rw-r--r--include/configs/turris_omnia.h24
1 files changed, 3 insertions, 21 deletions
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index e8130ac..f2fc374 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -52,28 +52,10 @@
/* Include the common distro boot environment */
#ifndef CONFIG_SPL_BUILD
-#ifdef CONFIG_MMC
-#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
-#else
-#define BOOT_TARGET_DEVICES_MMC(func)
-#endif
-
-#ifdef CONFIG_USB_STORAGE
-#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
-#else
-#define BOOT_TARGET_DEVICES_USB(func)
-#endif
-
-#ifdef CONFIG_SCSI
-#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
-#else
-#define BOOT_TARGET_DEVICES_SCSI(func)
-#endif
-
#define BOOT_TARGET_DEVICES(func) \
- BOOT_TARGET_DEVICES_MMC(func) \
- BOOT_TARGET_DEVICES_SCSI(func) \
- BOOT_TARGET_DEVICES_USB(func) \
+ func(MMC, mmc, 0) \
+ func(SCSI, scsi, 0) \
+ func(USB, usb, 0) \
func(PXE, pxe, na) \
func(DHCP, dhcp, na)