[PATCH] rockchip: allow env defines for SPL build
For environment in SPL, all these defines are required, otherwise build fails:
[...] 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: [...]
Environment in SPL is needed e.g. for DFU, as dfu_alt is kept as env variable.
Signed-off-by: Eugen Hristev eugen.hristev@collabora.com --- include/configs/rockchip-common.h | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 9121bba37384..be20b135066e 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -11,8 +11,6 @@ #define CFG_CPUID_OFFSET 0x7 #endif
-#ifndef CONFIG_SPL_BUILD - #define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
#ifdef CONFIG_ARM64 @@ -28,6 +26,4 @@ "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid="ROOT_UUID
-#endif - #endif /* _ROCKCHIP_COMMON_H_ */
Hi Eugen,
On 2023/6/16 16:55, Eugen Hristev wrote:
For environment in SPL, all these defines are required, otherwise build fails:
[...] 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: [...]
Environment in SPL is needed e.g. for DFU, as dfu_alt is kept as env variable.
Signed-off-by: Eugen Hristev eugen.hristev@collabora.com
include/configs/rockchip-common.h | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 9121bba37384..be20b135066e 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -11,8 +11,6 @@ #define CFG_CPUID_OFFSET 0x7 #endif
-#ifndef CONFIG_SPL_BUILD
- #define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
These boot targets are for U-Boot proper only, not available for SPL, so I don't think remove
the SPL_BUILD limit is correct.
The DFU you mentioned is also used in U-Boot instead of SPL for most of the project.
Thanks, - Kever
#ifdef CONFIG_ARM64 @@ -28,6 +26,4 @@ "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid="ROOT_UUID
-#endif
- #endif /* _ROCKCHIP_COMMON_H_ */
On 6/17/23 10:56, Kever Yang wrote:
Hi Eugen,
On 2023/6/16 16:55, Eugen Hristev wrote:
For environment in SPL, all these defines are required, otherwise build fails:
[...] 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: [...]
Environment in SPL is needed e.g. for DFU, as dfu_alt is kept as env variable.
Signed-off-by: Eugen Hristev eugen.hristev@collabora.com
include/configs/rockchip-common.h | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 9121bba37384..be20b135066e 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -11,8 +11,6 @@ #define CFG_CPUID_OFFSET 0x7 #endif -#ifndef CONFIG_SPL_BUILD
#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
These boot targets are for U-Boot proper only, not available for SPL, so I don't think remove
the SPL_BUILD limit is correct.
The DFU you mentioned is also used in U-Boot instead of SPL for most of the project.
Hi Kever,
The plan is to get DFU working in SPL. This is why the defines are required in SPL
To make more sense, I will include this patch in a series that enables DFU in SPL, and I will send it all together soon.
Thanks
Thanks,
- Kever
#ifdef CONFIG_ARM64 @@ -28,6 +26,4 @@ "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid="ROOT_UUID -#endif
#endif /* _ROCKCHIP_COMMON_H_ */
participants (2)
-
Eugen Hristev -
Kever Yang