summaryrefslogtreecommitdiffstats
path: root/include/configs/rockchip-common.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-11-01 09:32:14 -0400
committerTom Rini <trini@konsulko.com>2017-11-01 09:32:14 -0400
commita0cdb534e121185a72c881e76fa802486eba0f4f (patch)
tree12291b8b8305ba467c759b40cfbdecdc8509ba47 /include/configs/rockchip-common.h
parent3c1af17c5eebc3718095907c254ae3eb8a3412f8 (diff)
parented6be4fcdfd4db56081e366c40dee7c3fb19ef59 (diff)
downloadu-boot-a0cdb534e121185a72c881e76fa802486eba0f4f.tar.gz
u-boot-a0cdb534e121185a72c881e76fa802486eba0f4f.tar.xz
u-boot-a0cdb534e121185a72c881e76fa802486eba0f4f.zip
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'include/configs/rockchip-common.h')
-rw-r--r--include/configs/rockchip-common.h43
1 files changed, 30 insertions, 13 deletions
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 5e9b6deb48..96b5fce46f 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -11,22 +11,39 @@
#ifndef CONFIG_SPL_BUILD
#include <config_distro_defaults.h>
-/* First try to boot from SD (index 0), then eMMC (index 1 */
-#ifdef CONFIG_CMD_USB
-#define BOOT_TARGET_DEVICES(func) \
- func(MMC, mmc, 0) \
- func(MMC, mmc, 1) \
- func(USB, usb, 0) \
- func(PXE, pxe, na) \
- func(DHCP, dchp, na)
+/* First try to boot from SD (index 0), then eMMC (index 1) */
+#if CONFIG_IS_ENABLED(CMD_MMC)
+ #define BOOT_TARGET_MMC(func) \
+ func(MMC, mmc, 0) \
+ func(MMC, mmc, 1)
#else
-#define BOOT_TARGET_DEVICES(func) \
- func(MMC, mmc, 0) \
- func(MMC, mmc, 1) \
- func(PXE, pxe, na) \
- func(DHCP, dchp, na)
+ #define BOOT_TARGET_MMC(func)
#endif
+#if CONFIG_IS_ENABLED(CMD_USB)
+ #define BOOT_TARGET_USB(func) func(USB, usb, 0)
+#else
+ #define BOOT_TARGET_USB(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_PXE)
+ #define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
+#else
+ #define BOOT_TARGET_PXE(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_DHCP)
+ #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
+#else
+ #define BOOT_TARGET_DHCP(func)
+#endif
+
+#define BOOT_TARGET_DEVICES(func) \
+ BOOT_TARGET_MMC(func) \
+ BOOT_TARGET_USB(func) \
+ BOOT_TARGET_PXE(func) \
+ BOOT_TARGET_DHCP(func)
+
#ifdef CONFIG_ARM64
#define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
#else