From ea1ffb63d0fc2bd010faa1e3264eb06acd32e079 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Thu, 11 Mar 2021 19:12:52 +0100 Subject: v7a: stm32mp: images: allow differing board names for FSBL and SSBL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So far, the two STM32MP1 boards we support had the same board name string within the file names of first stage (TF-A) and second stage (barebox) bootloaders. This will no longer be true when updating to a more recent barebox version, as the dk2 image's name has been changed to dkx to indicate support for both dk1 and dk2. Prepare for this by splitting up STM32MP_BOARD_NAME. No functional change. Signed-off-by: Ahmad Fatoum Signed-off-by: Uwe Kleine-König --- configs/platform-v7a/config/images/stm32mp.config | 6 +++--- configs/platform-v7a/rules/image-lxa-mc1.make | 3 ++- configs/platform-v7a/rules/image-stm32mp157c-dk2.make | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config index 6b915fd..cbf9658 100644 --- a/configs/platform-v7a/config/images/stm32mp.config +++ b/configs/platform-v7a/config/images/stm32mp.config @@ -5,15 +5,15 @@ image @IMAGE@ { gpt-no-backup = true } partition fsbl1 { - image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32" + image = "stm32mp1-tf-a-@STM32MP_BOARD_FSBL@.stm32" size = 256K } partition fsbl2 { - image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32" + image = "stm32mp1-tf-a-@STM32MP_BOARD_FSBL@.stm32" size = 256K } partition ssbl { - image = "barebox-@STM32MP_BOARD@.img" + image = "barebox-@STM32MP_BOARD_SSBL@.img" size = 1M } partition barebox-environment { diff --git a/configs/platform-v7a/rules/image-lxa-mc1.make b/configs/platform-v7a/rules/image-lxa-mc1.make index c08e246..058a9d1 100644 --- a/configs/platform-v7a/rules/image-lxa-mc1.make +++ b/configs/platform-v7a/rules/image-lxa-mc1.make @@ -12,7 +12,8 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_LXA_MC1) += image-lxa-mc1 IMAGE_LXA_MC1_ENV := \ - STM32MP_BOARD=stm32mp157c-lxa-mc1 + STM32MP_BOARD_FSBL=stm32mp157c-lxa-mc1 \ + STM32MP_BOARD_SSBL=stm32mp157c-lxa-mc1 # # Paths and names diff --git a/configs/platform-v7a/rules/image-stm32mp157c-dk2.make b/configs/platform-v7a/rules/image-stm32mp157c-dk2.make index 864c899..2c739d3 100644 --- a/configs/platform-v7a/rules/image-stm32mp157c-dk2.make +++ b/configs/platform-v7a/rules/image-stm32mp157c-dk2.make @@ -12,7 +12,8 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_STM32MP157C_DK2) += image-stm32mp157c-dk2 IMAGE_STM32MP157C_DK2_ENV := \ - STM32MP_BOARD=stm32mp157c-dk2 + STM32MP_BOARD_FSBL=stm32mp157c-dk2 \ + STM32MP_BOARD_SSBL=stm32mp157c-dk2 # # Paths and names -- cgit v1.2.3