diff mbox series

[2/2] configs/stm32mp157c_dk2: add hashes

Message ID 20240713215218.2665512-2-dario.binacchi@amarulasolutions.com
State New
Headers
Series [1/2] configs/stm32mp157a_dk1: bump Linux to 6.9.8 and TF-A to 2.9 |

Commit Message

Dario Binacchi July 13, 2024, 9:52 p.m. UTC 
Now that the configurations of boards stm32mp157a-dk1 and stm32mp157c-dk2
have the same software versions, it is possible to share the hash files as
well.
The patch uses the hash files for Arm Trusted Firmware, Linux, Linux
headers and U-Boot of stm32mp175a_dk1 also for stm32mp175c_dk2, and then
enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the
defconfig from .checkpackageignore.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .checkpackageignore                                             | 1 -
 .../patches/arm-trusted-firmware/arm-trusted-firmware.hash      | 0
 .../stm32mp157}/patches/linux-headers/linux-headers.hash        | 0
 .../stm32mp157}/patches/linux/linux.hash                        | 0
 .../stm32mp157}/patches/uboot/uboot.hash                        | 0
 configs/stm32mp157a_dk1_defconfig                               | 2 +-
 configs/stm32mp157c_dk2_defconfig                               | 2 ++
 7 files changed, 3 insertions(+), 2 deletions(-)
 rename board/stmicroelectronics/{stm32mp157a-dk1 => common/stm32mp157}/patches/arm-trusted-firmware/arm-trusted-firmware.hash (100%)
 rename board/stmicroelectronics/{stm32mp157a-dk1 => common/stm32mp157}/patches/linux-headers/linux-headers.hash (100%)
 rename board/stmicroelectronics/{stm32mp157a-dk1 => common/stm32mp157}/patches/linux/linux.hash (100%)
 rename board/stmicroelectronics/{stm32mp157a-dk1 => common/stm32mp157}/patches/uboot/uboot.hash (100%)
diff mbox series

Patch

diff --git a/.checkpackageignore b/.checkpackageignore
index db28680f40e8..da5fa2685ae6 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -278,7 +278,6 @@  configs/socrates_cyclone5_defconfig lib_defconfig.ForceCheckHash
 configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash
 configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash
 configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash
-configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash
 configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash
 configs/terasic_de10nano_cyclone5_defconfig lib_defconfig.ForceCheckHash
 configs/toradex_apalis_imx6_defconfig lib_defconfig.ForceCheckHash
diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash
similarity index 100%
rename from board/stmicroelectronics/stm32mp157a-dk1/patches/arm-trusted-firmware/arm-trusted-firmware.hash
rename to board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash
diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/common/stm32mp157/patches/linux-headers/linux-headers.hash
similarity index 100%
rename from board/stmicroelectronics/stm32mp157a-dk1/patches/linux-headers/linux-headers.hash
rename to board/stmicroelectronics/common/stm32mp157/patches/linux-headers/linux-headers.hash
diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash b/board/stmicroelectronics/common/stm32mp157/patches/linux/linux.hash
similarity index 100%
rename from board/stmicroelectronics/stm32mp157a-dk1/patches/linux/linux.hash
rename to board/stmicroelectronics/common/stm32mp157/patches/linux/linux.hash
diff --git a/board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash b/board/stmicroelectronics/common/stm32mp157/patches/uboot/uboot.hash
similarity index 100%
rename from board/stmicroelectronics/stm32mp157a-dk1/patches/uboot/uboot.hash
rename to board/stmicroelectronics/common/stm32mp157/patches/uboot/uboot.hash
diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig
index cf42b29a7c0b..310e179cf782 100644
--- a/configs/stm32mp157a_dk1_defconfig
+++ b/configs/stm32mp157a_dk1_defconfig
@@ -6,7 +6,7 @@  BR2_cortex_a7=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
 
 # System configuration
-BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32mp157a-dk1/patches"
+BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp157/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh"
diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig
index c923d2cd60bb..2a9c31df37c2 100644
--- a/configs/stm32mp157c_dk2_defconfig
+++ b/configs/stm32mp157c_dk2_defconfig
@@ -6,6 +6,8 @@  BR2_cortex_a7=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y
 
 # System configuration
+BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp157/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh"