* [U-Boot] [PATCH v4 1/2] rockchip: configs: only add available BOOT_TARGET_DEVICES
@ 2017-10-06 17:24 Klaus Goger
2017-10-06 17:24 ` [U-Boot] [PATCH v4 2/2] rockchip: configs: use rockchip-common.h for rk3368 Klaus Goger
2017-10-06 18:16 ` [U-Boot] [U-Boot, v4, 1/2] rockchip: configs: only add available BOOT_TARGET_DEVICES Philipp Tomsich
0 siblings, 2 replies; 4+ messages in thread
From: Klaus Goger @ 2017-10-06 17:24 UTC (permalink / raw)
To: u-boot
BOOT_TARGET_DEVICES should only be added if the corresponding u-boot
command is enabled.
Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---
Changes in v4:
- rebase on mаster
Changes in v3:
- Use CONFIG_IS_ENABLED macro instead of #ifdefs
- Add missing else path
Changes in v2:
- Add patch to series to prevent build errors if boards don't enable the
required u-boot command for distroboot
include/configs/rockchip-common.h | 43 +++++++++++++++++++++++++++------------
1 file 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
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v4 2/2] rockchip: configs: use rockchip-common.h for rk3368
2017-10-06 17:24 [U-Boot] [PATCH v4 1/2] rockchip: configs: only add available BOOT_TARGET_DEVICES Klaus Goger
@ 2017-10-06 17:24 ` Klaus Goger
2017-10-06 18:16 ` [U-Boot] [U-Boot, v4, " Philipp Tomsich
2017-10-06 18:16 ` [U-Boot] [U-Boot, v4, 1/2] rockchip: configs: only add available BOOT_TARGET_DEVICES Philipp Tomsich
1 sibling, 1 reply; 4+ messages in thread
From: Klaus Goger @ 2017-10-06 17:24 UTC (permalink / raw)
To: u-boot
rockchip-common.h already defines values that are missing from
rk3368_common.h
For example BOOT_TARGET_DEVICES was defined empty and therefore
distroboot had no boot targets.
Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
include/configs/rk3368_common.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 8b4155f37c..b643cc2464 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -7,6 +7,8 @@
#ifndef __CONFIG_RK3368_COMMON_H
#define __CONFIG_RK3368_COMMON_H
+#include "rockchip-common.h"
+
#define CONFIG_SYS_CACHELINE_SIZE 64
#include <asm/arch/hardware.h>
@@ -44,10 +46,6 @@
"kernel_addr_r=0x280000\0" \
"ramdisk_addr_r=0x5bf0000\0"
-#include <config_distro_defaults.h>
-
-#define BOOT_TARGET_DEVICES(func)
-
#include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [U-Boot, v4, 1/2] rockchip: configs: only add available BOOT_TARGET_DEVICES
2017-10-06 17:24 [U-Boot] [PATCH v4 1/2] rockchip: configs: only add available BOOT_TARGET_DEVICES Klaus Goger
2017-10-06 17:24 ` [U-Boot] [PATCH v4 2/2] rockchip: configs: use rockchip-common.h for rk3368 Klaus Goger
@ 2017-10-06 18:16 ` Philipp Tomsich
1 sibling, 0 replies; 4+ messages in thread
From: Philipp Tomsich @ 2017-10-06 18:16 UTC (permalink / raw)
To: u-boot
> BOOT_TARGET_DEVICES should only be added if the corresponding u-boot
> command is enabled.
>
> Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
>
> Changes in v4:
> - rebase on mаster
>
> Changes in v3:
> - Use CONFIG_IS_ENABLED macro instead of #ifdefs
> - Add missing else path
>
> Changes in v2:
> - Add patch to series to prevent build errors if boards don't enable the
> required u-boot command for distroboot
>
> include/configs/rockchip-common.h | 43 +++++++++++++++++++++++++++------------
> 1 file changed, 30 insertions(+), 13 deletions(-)
>
Applied to u-boot-rockchip, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [U-Boot, v4, 2/2] rockchip: configs: use rockchip-common.h for rk3368
2017-10-06 17:24 ` [U-Boot] [PATCH v4 2/2] rockchip: configs: use rockchip-common.h for rk3368 Klaus Goger
@ 2017-10-06 18:16 ` Philipp Tomsich
0 siblings, 0 replies; 4+ messages in thread
From: Philipp Tomsich @ 2017-10-06 18:16 UTC (permalink / raw)
To: u-boot
> rockchip-common.h already defines values that are missing from
> rk3368_common.h
>
> For example BOOT_TARGET_DEVICES was defined empty and therefore
> distroboot had no boot targets.
>
> Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
>
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
>
> include/configs/rk3368_common.h | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
Applied to u-boot-rockchip, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-06 18:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-06 17:24 [U-Boot] [PATCH v4 1/2] rockchip: configs: only add available BOOT_TARGET_DEVICES Klaus Goger
2017-10-06 17:24 ` [U-Boot] [PATCH v4 2/2] rockchip: configs: use rockchip-common.h for rk3368 Klaus Goger
2017-10-06 18:16 ` [U-Boot] [U-Boot, v4, " Philipp Tomsich
2017-10-06 18:16 ` [U-Boot] [U-Boot, v4, 1/2] rockchip: configs: only add available BOOT_TARGET_DEVICES Philipp Tomsich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.