Skip to contentSkip to conversation

rockchip: allow env defines for SPL build

PATCH In review Eugen Hristev 2 participants 3 messages Jun 16, 2023 – Jun 19, 2023 Arm Rockchip

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 include/configs/rockchip-common.h | 4 ----
 1 file changed, 4 deletions(-)
include/configs/rockchip-common.h +0 -4
index 9121bba37384..be20b135066e 100644
@@ -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_ */
Signature · 1 line
2.34.1
#1 lore raw

Hi Eugen,

Quoted 23 lines · Eugen Hristev

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.

---
  include/configs/rockchip-common.h | 4 ----
  1 file changed, 4 deletions(-)
include/configs/rockchip-common.h +0 -0
index 9121bba37384..be20b135066e 100644

include/configs/rockchip-common.h line 14

Quoted 6 lines
include/configs/rockchip-common.h +0 -2
@@ -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

Quoted 9 lines
include/configs/rockchip-common.h +0 -2
  #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_ */
#2 lore raw
Quoted 34 lines · Kever Yang

Hi Eugen,

Quoted 23 lines · Eugen Hristev

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.

---
  include/configs/rockchip-common.h | 4 ----

  1 file changed, 4 deletions(-)
include/configs/rockchip-common.h +0 -0
index 9121bba37384..be20b135066e 100644

include/configs/rockchip-common.h line 13

Quoted 5 lines
include/configs/rockchip-common.h +0 -2
@@ -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

Quoted 4 lines

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

Quoted 10 lines

Thanks,
- Kever

Quoted 7 lines
include/configs/rockchip-common.h +0 -0
   #ifdef CONFIG_ARM64
@@ -28,6 +26,4 @@
       "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \

      "name=rootfs,size=-,uuid="ROOT_UUID

include/configs/rockchip-common.h +0 -2
-#endif
-

  #endif /* _ROCKCHIP_COMMON_H_ */