[U-Boot] [PATCH] rockchip: configs: use rockchip-common.h for rk3368
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
---
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 \
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
include/configs/rk3368_common.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
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
include/configs/rk3368_common.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
Klaus,
On 6 Oct 2017, at 10:12, Klaus Goger klaus.goger@theobroma-systems.com wrote:
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
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
This causes build-failures in buildman; please fix & resubmit:
Building current source for 25 boards (4 threads, 1 job per thread) aarch64: + geekbox +In file included from include/configs/rk3368_common.h:49:0, + from include/configs/geekbox.h:10, + from include/config.h:5, + from include/common.h:21, + from env/common.c:11: +include/config_distro_bootcmd.h:68:2: error: expected '}' before 'BOOT_TARGET_DEVICES_references_MMC_without_CONFIG_CMD_MMC' + BOOT_TARGET_DEVICES_references_MMC_without_CONFIG_CMD_MMC + ^ +include/config_distro_bootcmd.h:68:2: note: in definition of macro 'BOOTENV_DEV_NAME_MMC' + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +include/configs/rockchip-common.h:24:2: note: in expansion of macro 'BOOTENV_DEV_NAME' + func(MMC, mmc, 0) \ + ^~~~ +include/config_distro_bootcmd.h:316:18: note: in expansion of macro 'BOOT_TARGET_DEVICES' + "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0" + ^~~~~~~~~~~~~~~~~~~ +include/config_distro_bootcmd.h:333:2: note: in expansion of macro 'BOOTENV_BOOT_TARGETS' + BOOTENV_BOOT_TARGETS \ + ^~~~~~~~~~~~~~~~~~~~ +include/configs/rk3368_common.h:53:2: note: in expansion of macro 'BOOTENV' + BOOTENV + ^~~~~~~ +include/env_default.h:108:2: note: in expansion of macro 'CONFIG_EXTRA_ENV_SETTINGS' + CONFIG_EXTRA_ENV_SETTINGS + ^~~~~~~~~~~~~~~~~~~~~~~~~ +make[2]: *** [env/common.o] Error 1 +make[1]: *** [env] Error 2 +make: *** [sub-make] Error 2
participants (3)
-
Dr. Philipp Tomsich -
Klaus Goger -
Philipp Tomsich