| Message ID | 20220205232918.27091-1-kuzminov.sergey81@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3] configs/orangepi_zero_defconfig: switch to extlinux | expand |
> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov <kuzminov.sergey81@gmail.com> ha scritto: > > Changes: > * Exclude FAT partition, it is no longer needed for U-Boot. > * Switch the rootfs partition from MBR to GPT for partition-uuid to work. > * Switch to extlinux, this is convenient for debugging. > * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. > * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. Your SoB goes here along my Reviewed-by and Tested-by(one per line) I’ve given you on V1. > --- > V1->V2: > * improved commit log > * removed commented line in extlinux.conf > * removed one boot option from extlinux.conf > > V2->V3: > * improved commit log > * removed comment from board/orangepi/common/genimage.cfg > > Signed-off-by: Sergey Kuzminov <kuzminov.sergey81@gmail.com> And here you remove your SoB ^^^ Please send a V4 pointing you’ve fixed your Signed-off-by position and we’re done :-) Giulio > --- > board/orangepi/common/extlinux.conf | 4 +++ > board/orangepi/common/genimage.cfg | 20 +++++++++++++ > board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ > board/orangepi/orangepi-zero/boot.cmd | 9 ------ > board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- > configs/orangepi_zero_defconfig | 11 ++++--- > 6 files changed, 63 insertions(+), 51 deletions(-) > create mode 100644 board/orangepi/common/extlinux.conf > create mode 100644 board/orangepi/common/genimage.cfg > create mode 100755 board/orangepi/common/post-build.sh > delete mode 100644 board/orangepi/orangepi-zero/boot.cmd > delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg > > diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf > new file mode 100644 > index 0000000000..12f496b1fa > --- /dev/null > +++ b/board/orangepi/common/extlinux.conf > @@ -0,0 +1,4 @@ > +LABEL default > + kernel /boot/%LINUXIMAGE% > + devicetreedir /boot > + append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 > diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg > new file mode 100644 > index 0000000000..a61c4a039f > --- /dev/null > +++ b/board/orangepi/common/genimage.cfg > @@ -0,0 +1,20 @@ > +image sdcard.img { > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) > + } > + > + hdimage { > + partition-table-type = gpt > + gpt-location = 1008K # 1MB - 16KB(GPT) > + gpt-no-backup = true > + } > + > + partition rootfs { > + offset = 1M > + image = "rootfs.ext4" > + partition-uuid = %PARTUUID% > + } > +} > diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh > new file mode 100755 > index 0000000000..296f94b174 > --- /dev/null > +++ b/board/orangepi/common/post-build.sh > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +linux_image() > +{ > + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then > + echo "uImage" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then > + echo "Image" > + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then > + echo "Image.gz" > + else > + echo "zImage" > + fi > +} > + > +generic_getty() > +{ > + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then > + echo "" > + else > + echo "s/\s*console=\S*//" > + fi > +} > + > +PARTUUID="$($HOST_DIR/bin/uuidgen)" > + > +install -d "$TARGET_DIR/boot/extlinux/" > + > +sed -e "$(generic_getty)" \ > + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ > + -e "s/%PARTUUID%/$PARTUUID/g" \ > + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" > + > +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" > diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd > deleted file mode 100644 > index d094a64fe5..0000000000 > --- a/board/orangepi/orangepi-zero/boot.cmd > +++ /dev/null > @@ -1,9 +0,0 @@ > -setenv fdt_high ffffffff > - > -part uuid mmc 0:2 uuid > -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait > - > -fatload mmc 0 $kernel_addr_r zImage > -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb > - > -bootz $kernel_addr_r - $fdt_addr_r > diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg > deleted file mode 100644 > index 32f5454ae6..0000000000 > --- a/board/orangepi/orangepi-zero/genimage.cfg > +++ /dev/null > @@ -1,36 +0,0 @@ > -# Minimal SD card image for the OrangePi Zero > -# > -image boot.vfat { > - vfat { > - files = { > - "zImage", > - "sun8i-h2-plus-orangepi-zero.dtb", > - "boot.scr" > - } > - } > - size = 10M > -} > - > -image sdcard.img { > - hdimage { > - } > - > - partition u-boot { > - in-partition-table = "no" > - image = "u-boot-sunxi-with-spl.bin" > - offset = 8K > - size = 1016K # 1MB - 8KB > - } > - > - partition boot { > - partition-type = 0xC > - bootable = "true" > - image = "boot.vfat" > - } > - > - partition rootfs { > - partition-type = 0x83 > - image = "rootfs.ext4" > - size = 512M > - } > -} > diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig > index 5aaa1566c5..96f0c3f600 100644 > --- a/configs/orangepi_zero_defconfig > +++ b/configs/orangepi_zero_defconfig > @@ -20,10 +20,13 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > # Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" > +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y > # BR2_TARGET_ROOTFS_TAR is not set > > # Bootloader > @@ -39,16 +42,12 @@ BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > > # Required tools to create the SD image > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" > -BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_MTOOLS=y > > # Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" > > # Wireless driver and firmware > BR2_PACKAGE_XR819_XRADIO=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
06.02.2022 02:34, Giulio Benetti: >> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov<kuzminov.sergey81@gmail.com> ha scritto: >> >> Changes: >> * Exclude FAT partition, it is no longer needed for U-Boot. >> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >> * Switch to extlinux, this is convenient for debugging. >> * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > Your SoB goes here along my Reviewed-by and Tested-by(one per line) I’ve given you on V1. > >> --- >> V1->V2: >> * improved commit log >> * removed commented line in extlinux.conf >> * removed one boot option from extlinux.conf >> >> V2->V3: >> * improved commit log >> * removed comment from board/orangepi/common/genimage.cfg >> >> Signed-off-by: Sergey Kuzminov<kuzminov.sergey81@gmail.com> > And here you remove your SoB ^^^ > > Please send a V4 pointing you’ve fixed your Signed-off-by position and we’re done:-) I don't understand how to do what you are asking.
Hi Sergey, > Il giorno 6 feb 2022, alle ore 00:50, Sergey Kuzminov <kuzminov.sergey81@gmail.com> ha scritto: > > 06.02.2022 02:34, Giulio Benetti: >>>> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov<kuzminov.sergey81@gmail.com> ha scritto: >>> >>> Changes: >>> * Exclude FAT partition, it is no longer needed for U-Boot. >>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>> * Switch to extlinux, this is convenient for debugging. >>> * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. Move your Signed-off-by here(before the 3 dashes) and that’s all. This is because everything between the two sets of 3 dashes won’t be part of the commit. So we need your SoB here. >> Your SoB goes here along my Reviewed-by and Tested-by(one per line) I’ve given you on V1. >>> --- While here until next 3 dashes won’t be part of the commit log, but we need it for Mailing list to track the changes. >>> V1->V2: >>> * improved commit log >>> * removed commented line in extlinux.conf >>> * removed one boot option from extlinux.conf >>> >>> V2->V3: >>> * improved commit log >>> * removed comment from board/orangepi/common/genimage.cfg >>> >>> Signed-off-by: Sergey Kuzminov<kuzminov.sergey81@gmail.com> So if you keep your SoB here ^^^ won’t be part of the commit and that’s not what we want. >> And here you remove your SoB ^^^ >> Please send a V4 pointing you’ve fixed your Signed-off-by position and we’re done:-) > > I don't understand how to do what you are asking. All clear now? Kind regards Giulio > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Giulio, 06.02.2022 10:13, Giulio Benetti: > Hi Sergey, > >> Il giorno 6 feb 2022, alle ore 00:50, Sergey Kuzminov <kuzminov.sergey81@gmail.com> ha scritto: >> >> 06.02.2022 02:34, Giulio Benetti: >>>>> Il giorno 6 feb 2022, alle ore 00:29, Sergey Kuzminov<kuzminov.sergey81@gmail.com> ha scritto: >>>> >>>> Changes: >>>> * Exclude FAT partition, it is no longer needed for U-Boot. >>>> * Switch the rootfs partition from MBR to GPT for partition-uuid to work. >>>> * Switch to extlinux, this is convenient for debugging. >>>> * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. >>>> * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. > > Move your Signed-off-by here(before the 3 dashes) and that’s all. > This is because everything between the two sets of 3 dashes won’t be part of the commit. > So we need your SoB here. > >>> Your SoB goes here along my Reviewed-by and Tested-by(one per line) I’ve given you on V1. >>>> --- > While here until next 3 dashes won’t be part of the commit log, but we need it for Mailing list to track the changes. >>>> V1->V2: >>>> * improved commit log >>>> * removed commented line in extlinux.conf >>>> * removed one boot option from extlinux.conf >>>> >>>> V2->V3: >>>> * improved commit log >>>> * removed comment from board/orangepi/common/genimage.cfg >>>> >>>> Signed-off-by: Sergey Kuzminov<kuzminov.sergey81@gmail.com> > > So if you keep your SoB here ^^^ won’t be part of the commit and that’s not what we want. > >>> And here you remove your SoB ^^^ >>> Please send a V4 pointing you’ve fixed your Signed-off-by position and we’re done:-) >> >> I don't understand how to do what you are asking. > > All clear now? > > Kind regards > Giulio > >> _______________________________________________ >> buildroot mailing list >> buildroot@buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > Now I understand. Thank you.
diff --git a/board/orangepi/common/extlinux.conf b/board/orangepi/common/extlinux.conf new file mode 100644 index 0000000000..12f496b1fa --- /dev/null +++ b/board/orangepi/common/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/%LINUXIMAGE% + devicetreedir /boot + append root=PARTUUID=%PARTUUID% rootwait console=${console} rootfstype=ext4 quiet panic=10 diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg new file mode 100644 index 0000000000..a61c4a039f --- /dev/null +++ b/board/orangepi/common/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = gpt + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + } + + partition rootfs { + offset = 1M + image = "rootfs.ext4" + partition-uuid = %PARTUUID% + } +} diff --git a/board/orangepi/common/post-build.sh b/board/orangepi/common/post-build.sh new file mode 100755 index 0000000000..296f94b174 --- /dev/null +++ b/board/orangepi/common/post-build.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +linux_image() +{ + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + echo "uImage" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + echo "Image" + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + echo "Image.gz" + else + echo "zImage" + fi +} + +generic_getty() +{ + if grep -Eq "^BR2_TARGET_GENERIC_GETTY=y$" ${BR2_CONFIG}; then + echo "" + else + echo "s/\s*console=\S*//" + fi +} + +PARTUUID="$($HOST_DIR/bin/uuidgen)" + +install -d "$TARGET_DIR/boot/extlinux/" + +sed -e "$(generic_getty)" \ + -e "s/%LINUXIMAGE%/$(linux_image)/g" \ + -e "s/%PARTUUID%/$PARTUUID/g" \ + "board/orangepi/common/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf" + +sed "s/%PARTUUID%/$PARTUUID/g" "board/orangepi/common/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/orangepi/orangepi-zero/boot.cmd b/board/orangepi/orangepi-zero/boot.cmd deleted file mode 100644 index d094a64fe5..0000000000 --- a/board/orangepi/orangepi-zero/boot.cmd +++ /dev/null @@ -1,9 +0,0 @@ -setenv fdt_high ffffffff - -part uuid mmc 0:2 uuid -setenv bootargs console=ttyS0,115200 root=PARTUUID=${uuid} rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero/genimage.cfg b/board/orangepi/orangepi-zero/genimage.cfg deleted file mode 100644 index 32f5454ae6..0000000000 --- a/board/orangepi/orangepi-zero/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Zero -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h2-plus-orangepi-zero.dtb", - "boot.scr" - } - } - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 5aaa1566c5..96f0c3f600 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -20,10 +20,13 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="63M" +BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y # BR2_TARGET_ROOTFS_TAR is not set # Bootloader @@ -39,16 +42,12 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Required tools to create the SD image -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y # Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # Wireless driver and firmware BR2_PACKAGE_XR819_XRADIO=y
Changes: * Exclude FAT partition, it is no longer needed for U-Boot. * Switch the rootfs partition from MBR to GPT for partition-uuid to work. * Switch to extlinux, this is convenient for debugging. * Create common scenarios for multiple boards to create an SD image: board/orangepi/common. * Add BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y, remount root filesystem read-write during boot. --- V1->V2: * improved commit log * removed commented line in extlinux.conf * removed one boot option from extlinux.conf V2->V3: * improved commit log * removed comment from board/orangepi/common/genimage.cfg Signed-off-by: Sergey Kuzminov <kuzminov.sergey81@gmail.com> --- board/orangepi/common/extlinux.conf | 4 +++ board/orangepi/common/genimage.cfg | 20 +++++++++++++ board/orangepi/common/post-build.sh | 34 +++++++++++++++++++++ board/orangepi/orangepi-zero/boot.cmd | 9 ------ board/orangepi/orangepi-zero/genimage.cfg | 36 ----------------------- configs/orangepi_zero_defconfig | 11 ++++--- 6 files changed, 63 insertions(+), 51 deletions(-) create mode 100644 board/orangepi/common/extlinux.conf create mode 100644 board/orangepi/common/genimage.cfg create mode 100755 board/orangepi/common/post-build.sh delete mode 100644 board/orangepi/orangepi-zero/boot.cmd delete mode 100644 board/orangepi/orangepi-zero/genimage.cfg