| Message ID | 20240809112739.690823-2-gael.portay@rtone.fr |
|---|---|
| State | New |
| Headers | show |
| Series | configs: add Raspberry Pi Zero 2 W 64-bit defconfig | expand |
Gaël, All, On 2024-08-09 13:27 +0200, Gaël PORTAY spake thusly: > The raspberrypi symlinks in board have appeared since commit 7a0c134e7c > (boards/raspberrypi: update instructions for Raspberry Pi 2); every new > defconfig adds its symlink since then, and they are unnecessary. > > Furthermore, the commit 47da55f969 (configs/raspberrypi: add hashes) > sets BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" to every defconfig > without distinction of the raspberrypi. > > This removes the unnecessary symlinks in board/ and updates the > raspberrypi defconfigs accordingly. The post-image script uses the directory name with which it was called as, to pick the appropriate genimage-*.cfg config: 5 BOARD_DIR="$(dirname $0)" 6 BOARD_NAME="$(basename ${BOARD_DIR})" 7 GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" So by removing the symlinks while make the post-image script to always use the same file. Except that there does not exist any such config file, they are all generated from the template by hte post-iamge script itself. So this is all a bit misleading. I think the post-iamge script should be simplified to not expect a per-board genimage.cfg, and unconditionally generate one from the template. Regards, Yann E. MORIN. > Spotted by: > > $ tig grep board/raspberrypi[^/] > > Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr> > --- > board/raspberrypi0 | 1 - > board/raspberrypi0w | 1 - > board/raspberrypi2 | 1 - > board/raspberrypi3 | 1 - > board/raspberrypi3-64 | 1 - > board/raspberrypi4 | 1 - > board/raspberrypi4-64 | 1 - > board/raspberrypi5 | 1 - > board/raspberrypicm4io | 1 - > board/raspberrypicm4io-64 | 1 - > board/raspberrypizero2w | 1 - > configs/raspberrypi0_defconfig | 6 +++--- > configs/raspberrypi0w_defconfig | 6 +++--- > configs/raspberrypi2_defconfig | 4 ++-- > configs/raspberrypi3_64_defconfig | 6 +++--- > configs/raspberrypi3_defconfig | 6 +++--- > configs/raspberrypi3_qt5we_defconfig | 6 +++--- > configs/raspberrypi4_64_defconfig | 6 +++--- > configs/raspberrypi4_defconfig | 6 +++--- > configs/raspberrypi5_defconfig | 8 ++++---- > configs/raspberrypicm4io_64_defconfig | 6 +++--- > configs/raspberrypicm4io_defconfig | 6 +++--- > configs/raspberrypizero2w_defconfig | 6 +++--- > 23 files changed, 36 insertions(+), 47 deletions(-) > delete mode 120000 board/raspberrypi0 > delete mode 120000 board/raspberrypi0w > delete mode 120000 board/raspberrypi2 > delete mode 120000 board/raspberrypi3 > delete mode 120000 board/raspberrypi3-64 > delete mode 120000 board/raspberrypi4 > delete mode 120000 board/raspberrypi4-64 > delete mode 120000 board/raspberrypi5 > delete mode 120000 board/raspberrypicm4io > delete mode 120000 board/raspberrypicm4io-64 > delete mode 120000 board/raspberrypizero2w > > diff --git a/board/raspberrypi0 b/board/raspberrypi0 > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypi0 > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypi0w b/board/raspberrypi0w > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypi0w > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypi2 b/board/raspberrypi2 > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypi2 > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypi3 b/board/raspberrypi3 > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypi3 > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypi3-64 b/board/raspberrypi3-64 > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypi3-64 > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypi4 b/board/raspberrypi4 > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypi4 > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypi4-64 b/board/raspberrypi4-64 > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypi4-64 > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypi5 b/board/raspberrypi5 > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypi5 > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypicm4io b/board/raspberrypicm4io > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypicm4io > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypicm4io-64 b/board/raspberrypicm4io-64 > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypicm4io-64 > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/board/raspberrypizero2w b/board/raspberrypizero2w > deleted file mode 120000 > index fcdafc81ed..0000000000 > --- a/board/raspberrypizero2w > +++ /dev/null > @@ -1 +0,0 @@ > -raspberrypi > \ No newline at end of file > diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig > index 23ea25eb6f..891d7cc409 100644 > --- a/configs/raspberrypi0_defconfig > +++ b/configs/raspberrypi0_defconfig > @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi0/config_default.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_default.txt" > # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set > > # Required tools to create the SD image > @@ -36,8 +36,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig > index fc40471b77..d1166ac207 100644 > --- a/configs/raspberrypi0w_defconfig > +++ b/configs/raspberrypi0w_defconfig > @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi0w/config_0w.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_0w.txt" > > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > @@ -35,8 +35,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig > index 30b7ff9fde..d56d7de818 100644 > --- a/configs/raspberrypi2_defconfig > +++ b/configs/raspberrypi2_defconfig > @@ -39,8 +39,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig > index bfef4683b3..62b38ef501 100644 > --- a/configs/raspberrypi3_64_defconfig > +++ b/configs/raspberrypi3_64_defconfig > @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_3_64bit.txt" > > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > @@ -37,8 +37,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig > index d55410777d..0b71de574c 100644 > --- a/configs/raspberrypi3_defconfig > +++ b/configs/raspberrypi3_defconfig > @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_3.txt" > > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > @@ -37,8 +37,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig > index 826181a2ec..bcc40c2357 100644 > --- a/configs/raspberrypi3_qt5we_defconfig > +++ b/configs/raspberrypi3_qt5we_defconfig > @@ -39,7 +39,7 @@ BR2_PACKAGE_NTP=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3_qt5we.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_3_qt5we.txt" > > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > @@ -52,8 +52,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="400M" > # BR2_TARGET_ROOTFS_TAR is not set > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > index d5fa72d57d..af2ba0b2d5 100644 > --- a/configs/raspberrypi4_64_defconfig > +++ b/configs/raspberrypi4_64_defconfig > @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_4_64bit.txt" > > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > @@ -36,8 +36,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > index d7d5ec2499..ada38899df 100644 > --- a/configs/raspberrypi4_defconfig > +++ b/configs/raspberrypi4_defconfig > @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_4.txt" > > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > @@ -36,8 +36,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig > index 268bf2892a..0d753399e2 100644 > --- a/configs/raspberrypi5_defconfig > +++ b/configs/raspberrypi5_defconfig > @@ -24,8 +24,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rp > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_PACKAGE_RPI_FIRMWARE=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" > -BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_5.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi/cmdline_5.txt" > # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set > > # Required tools to create the SD image > @@ -38,8 +38,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig > index cff9270ed6..7db91aae9d 100644 > --- a/configs/raspberrypicm4io_64_defconfig > +++ b/configs/raspberrypicm4io_64_defconfig > @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm4io-64/config_cm4io_64bit.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_cm4io_64bit.txt" > > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > @@ -39,8 +39,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig > index 2972419ac7..acc3b391cf 100644 > --- a/configs/raspberrypicm4io_defconfig > +++ b/configs/raspberrypicm4io_defconfig > @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm4io-64/config_cm4io.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_cm4io.txt" > > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > @@ -39,8 +39,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig > index 7f83e9a258..23d4b62720 100644 > --- a/configs/raspberrypizero2w_defconfig > +++ b/configs/raspberrypizero2w_defconfig > @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_PACKAGE_RPI_FIRMWARE=y > BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y > BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y > -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypizero2w/config_zero2w.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_zero2w.txt" > > # Required tools to create the SD image > BR2_PACKAGE_HOST_DOSFSTOOLS=y > @@ -37,8 +37,8 @@ BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w/post-build.sh" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w/post-image.sh" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" > > # Enable compressed kernel module support > BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > -- > 2.46.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Yann, On Thu Aug 15, 2024 at 10:15 PM CEST, Yann E. MORIN wrote: > Gaël, All, > > On 2024-08-09 13:27 +0200, Gaël PORTAY spake thusly: > > The raspberrypi symlinks in board have appeared since commit 7a0c134e7c > > (boards/raspberrypi: update instructions for Raspberry Pi 2); every new > > defconfig adds its symlink since then, and they are unnecessary. > > > > Furthermore, the commit 47da55f969 (configs/raspberrypi: add hashes) > > sets BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" to every defconfig > > without distinction of the raspberrypi. > > > > This removes the unnecessary symlinks in board/ and updates the > > raspberrypi defconfigs accordingly. > > The post-image script uses the directory name with which it was called > as, to pick the appropriate genimage-*.cfg config: > > 5 BOARD_DIR="$(dirname $0)" > 6 BOARD_NAME="$(basename ${BOARD_DIR})" > 7 GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" > > So by removing the symlinks while make the post-image script to always > use the same file. > > Except that there does not exist any such config file, they are all > generated from the template by hte post-iamge script itself. > > So this is all a bit misleading. I think the post-iamge script should be > simplified to not expect a per-board genimage.cfg, and unconditionally > generate one from the template. > Oh, nice catch! I am on Holiday starting by today; I will fix this once I took by deserved breizh of air (early september). > Regards, > Yann E. MORIN. > Regards, Gaël
diff --git a/board/raspberrypi0 b/board/raspberrypi0 deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypi0 +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypi0w b/board/raspberrypi0w deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypi0w +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypi2 b/board/raspberrypi2 deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypi2 +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypi3 b/board/raspberrypi3 deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypi3 +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypi3-64 b/board/raspberrypi3-64 deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypi3-64 +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypi4 b/board/raspberrypi4 deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypi4 +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypi4-64 b/board/raspberrypi4-64 deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypi4-64 +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypi5 b/board/raspberrypi5 deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypi5 +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypicm4io b/board/raspberrypicm4io deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypicm4io +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypicm4io-64 b/board/raspberrypicm4io-64 deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypicm4io-64 +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/board/raspberrypizero2w b/board/raspberrypizero2w deleted file mode 120000 index fcdafc81ed..0000000000 --- a/board/raspberrypizero2w +++ /dev/null @@ -1 +0,0 @@ -raspberrypi \ No newline at end of file diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 23ea25eb6f..891d7cc409 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi0/config_default.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_default.txt" # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set # Required tools to create the SD image @@ -36,8 +36,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index fc40471b77..d1166ac207 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi0w/config_0w.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_0w.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -35,8 +35,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 30b7ff9fde..d56d7de818 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -39,8 +39,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index bfef4683b3..62b38ef501 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_3_64bit.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -37,8 +37,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index d55410777d..0b71de574c 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_3.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -37,8 +37,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 826181a2ec..bcc40c2357 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -39,7 +39,7 @@ BR2_PACKAGE_NTP=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3_qt5we.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_3_qt5we.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -52,8 +52,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="400M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index d5fa72d57d..af2ba0b2d5 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_4_64bit.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -36,8 +36,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index d7d5ec2499..ada38899df 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_4.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -36,8 +36,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig index 268bf2892a..0d753399e2 100644 --- a/configs/raspberrypi5_defconfig +++ b/configs/raspberrypi5_defconfig @@ -24,8 +24,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rp BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" -BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_5.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi/cmdline_5.txt" # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set # Required tools to create the SD image @@ -38,8 +38,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index cff9270ed6..7db91aae9d 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm4io-64/config_cm4io_64bit.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_cm4io_64bit.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -39,8 +39,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 2972419ac7..acc3b391cf 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -24,7 +24,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm4io-64/config_cm4io.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_cm4io.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -39,8 +39,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index 7f83e9a258..23d4b62720 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypizero2w/config_zero2w.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_zero2w.txt" # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -37,8 +37,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" # Enable compressed kernel module support BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
The raspberrypi symlinks in board have appeared since commit 7a0c134e7c (boards/raspberrypi: update instructions for Raspberry Pi 2); every new defconfig adds its symlink since then, and they are unnecessary. Furthermore, the commit 47da55f969 (configs/raspberrypi: add hashes) sets BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" to every defconfig without distinction of the raspberrypi. This removes the unnecessary symlinks in board/ and updates the raspberrypi defconfigs accordingly. Spotted by: $ tig grep board/raspberrypi[^/] Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr> --- board/raspberrypi0 | 1 - board/raspberrypi0w | 1 - board/raspberrypi2 | 1 - board/raspberrypi3 | 1 - board/raspberrypi3-64 | 1 - board/raspberrypi4 | 1 - board/raspberrypi4-64 | 1 - board/raspberrypi5 | 1 - board/raspberrypicm4io | 1 - board/raspberrypicm4io-64 | 1 - board/raspberrypizero2w | 1 - configs/raspberrypi0_defconfig | 6 +++--- configs/raspberrypi0w_defconfig | 6 +++--- configs/raspberrypi2_defconfig | 4 ++-- configs/raspberrypi3_64_defconfig | 6 +++--- configs/raspberrypi3_defconfig | 6 +++--- configs/raspberrypi3_qt5we_defconfig | 6 +++--- configs/raspberrypi4_64_defconfig | 6 +++--- configs/raspberrypi4_defconfig | 6 +++--- configs/raspberrypi5_defconfig | 8 ++++---- configs/raspberrypicm4io_64_defconfig | 6 +++--- configs/raspberrypicm4io_defconfig | 6 +++--- configs/raspberrypizero2w_defconfig | 6 +++--- 23 files changed, 36 insertions(+), 47 deletions(-) delete mode 120000 board/raspberrypi0 delete mode 120000 board/raspberrypi0w delete mode 120000 board/raspberrypi2 delete mode 120000 board/raspberrypi3 delete mode 120000 board/raspberrypi3-64 delete mode 120000 board/raspberrypi4 delete mode 120000 board/raspberrypi4-64 delete mode 120000 board/raspberrypi5 delete mode 120000 board/raspberrypicm4io delete mode 120000 board/raspberrypicm4io-64 delete mode 120000 board/raspberrypizero2w