| Message ID | 20230801072811.10354-2-eugen.hristev@collabora.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3588: add support for DFU in SPL | expand |
On 2023/8/1 15:28, 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> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > 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_ */
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_ */
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(-)