From f21db2bd83bf3073a50b8bcd79af6e7aed6fb000 Mon Sep 17 00:00:00 2001 From: Raphael Gallais-Pou Date: Wed, 14 Aug 2024 20:37:02 +0200 Subject: [PATCH] board/stmicroelectronics/common/stm32mp157: rename folder STM32MP15x and STM32MP13 can use almost of the same configuration regarding bootloaders and the Linux kernel. To make profit of the commont folder, rename it to 'stm32mp1xx' and change dependencies accordingly. Signed-off-by: Raphael Gallais-Pou Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- DEVELOPERS | 2 +- .../common/{stm32mp157 => stm32mp1xx}/genimage.cfg.template | 0 .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 0 .../patches/linux-headers/linux-headers.hash | 0 .../{stm32mp157 => stm32mp1xx}/patches/linux/linux.hash | 0 .../{stm32mp157 => stm32mp1xx}/patches/uboot/uboot.hash | 0 .../common/{stm32mp157 => stm32mp1xx}/post-image.sh | 2 +- configs/avenger96_defconfig | 2 +- configs/stm32mp157a_dk1_defconfig | 4 ++-- configs/stm32mp157c_dk2_defconfig | 4 ++-- 11 files changed, 8 insertions(+), 8 deletions(-) rename board/stmicroelectronics/common/{stm32mp157 => stm32mp1xx}/genimage.cfg.template (100%) rename board/stmicroelectronics/common/{stm32mp157 => stm32mp1xx}/patches/arm-trusted-firmware/arm-trusted-firmware.hash (100%) rename board/stmicroelectronics/common/{stm32mp157 => stm32mp1xx}/patches/linux-headers/linux-headers.hash (100%) rename board/stmicroelectronics/common/{stm32mp157 => stm32mp1xx}/patches/linux/linux.hash (100%) rename board/stmicroelectronics/common/{stm32mp157 => stm32mp1xx}/patches/uboot/uboot.hash (100%) rename board/stmicroelectronics/common/{stm32mp157 => stm32mp1xx}/post-image.sh (93%) diff --git a/.checkpackageignore b/.checkpackageignore index a44817578d..203cfb4a2c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -82,7 +82,7 @@ board/solidrun/clearfog/post-build.sh Shellcheck board/solidrun/macchiatobin/post-build-mainline.sh Shellcheck board/solidrun/macchiatobin/post-build.sh Shellcheck board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh Shellcheck -board/stmicroelectronics/common/stm32mp157/post-image.sh Shellcheck +board/stmicroelectronics/common/stm32mp1xx/post-image.sh Shellcheck board/stmicroelectronics/stm32f429-disco/flash.sh Shellcheck board/stmicroelectronics/stm32f469-disco/flash_sd.sh Shellcheck board/stmicroelectronics/stm32f469-disco/flash_xip.sh Shellcheck diff --git a/DEVELOPERS b/DEVELOPERS index 754f153b39..837d42bb4f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2240,7 +2240,7 @@ F: configs/qemu_riscv32_virt_defconfig F: configs/qemu_riscv64_virt_defconfig N: Marleen Vos -F: board/stmicroelectronics/common/stm32mp157/ +F: board/stmicroelectronics/common/stm32mp1xx/ F: configs/avenger96_defconfig F: configs/stm32mp157a_dk1_defconfig F: configs/stm32mp157c_dk2_defconfig diff --git a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template b/board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/genimage.cfg.template rename to board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template diff --git a/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash rename to board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash diff --git a/board/stmicroelectronics/common/stm32mp157/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/linux-headers/linux-headers.hash similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/patches/linux-headers/linux-headers.hash rename to board/stmicroelectronics/common/stm32mp1xx/patches/linux-headers/linux-headers.hash diff --git a/board/stmicroelectronics/common/stm32mp157/patches/linux/linux.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/patches/linux/linux.hash rename to board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash diff --git a/board/stmicroelectronics/common/stm32mp157/patches/uboot/uboot.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/patches/uboot/uboot.hash rename to board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash diff --git a/board/stmicroelectronics/common/stm32mp157/post-image.sh b/board/stmicroelectronics/common/stm32mp1xx/post-image.sh similarity index 93% rename from board/stmicroelectronics/common/stm32mp157/post-image.sh rename to board/stmicroelectronics/common/stm32mp1xx/post-image.sh index 0cf52f4564..77547832ab 100755 --- a/board/stmicroelectronics/common/stm32mp157/post-image.sh +++ b/board/stmicroelectronics/common/stm32mp1xx/post-image.sh @@ -22,7 +22,7 @@ main() GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" sed -e "s/%ATFBIN%/${ATFBIN}/" \ - board/stmicroelectronics/common/stm32mp157/genimage.cfg.template > ${GENIMAGE_CFG} + board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template > ${GENIMAGE_CFG} support/scripts/genimage.sh -c ${GENIMAGE_CFG} diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 64cfb3c2b0..3b471109f7 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -7,7 +7,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System configuration BR2_ROOTFS_OVERLAY="board/arrow/avenger96/overlay/" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index 310e179cf7..e2dd48bb17 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -6,10 +6,10 @@ 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_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/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" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index 2a9c31df37..d6085583d3 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -6,10 +6,10 @@ 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_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/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" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" # Kernel BR2_LINUX_KERNEL=y