| Message ID | 20230703160149.2302949-2-dario.binacchi@amarulasolutions.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] boot/u-boot: fix u-boot.stm32 creation on newer version | expand |
On Mon, 3 Jul 2023 18:01:49 +0200 Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote: > The u-boot.stm32 image is now created by binman tool, so the > BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY configuration needs to be > disabled. > > Tested on stm32mp157f_dk2 > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > configs/stm32mp157a_dk1_defconfig | 3 +-- > configs/stm32mp157c_dk2_defconfig | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig > index 3b8fdea993ac..2ec063b51c61 100644 > --- a/configs/stm32mp157a_dk1_defconfig > +++ b/configs/stm32mp157a_dk1_defconfig > @@ -36,11 +36,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" > # BR2_TARGET_UBOOT_FORMAT_BIN is not set > BR2_TARGET_UBOOT_FORMAT_STM32=y > -BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1" This was not sufficient: as binman is now used, it needs pylibfdt, so the option BR2_TARGET_UBOOT_NEEDS_PYLIBFDT had to be enabled as well. I did that for both defconfigs, and verified that uboot was building fine inside a minimal Docker container. Thanks! Thomas
diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index 3b8fdea993ac..2ec063b51c61 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -36,11 +36,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_STM32=y -BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1" diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index 8b83bfe44353..4427289ef2ae 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -36,11 +36,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_STM32=y -BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2"
The u-boot.stm32 image is now created by binman tool, so the BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY configuration needs to be disabled. Tested on stm32mp157f_dk2 Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- configs/stm32mp157a_dk1_defconfig | 3 +-- configs/stm32mp157c_dk2_defconfig | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)