orangepi: convert more boards to extlinux

PATCH Superseded Sergey Matyukevich 2 participants 7 messages Feb 23, 2022

lore

Share & tools

lore

Sergey Matyukevich

author

2022-02-23 19:14 UTC #0 lore raw

cover orangepi: convert more boards to extlinux

Hi all,

Recently extlinux infrastructure has been added for orangepi boards by Sergey Kuzminov: see commit c0312f71cc89 ("configs/orangepi_zero_defconfig:
switch to extlinux"). This patch series converts to extlinux some of the boards that I have at my disposal:
- orangepi-zero-plus2
- orangepi-pc-plus
- orangepi-one

All these changes have been build- and boot- tested. Also I added orangepi-zero-plus2 to my list in DEVELOPERS file to keep an eye on its build failures.

Regards,
Sergey

Sergey Matyukevich (4):
board/orangepi/orangepi-zero-plus2: switch to extlinux board/orangepi/orangepi-pc-plus: switch to extlinux board/orangepi/orangepi-one: switch to extlinux
DEVELOPERS: add myself for orangepi-zero-plus2

 DEVELOPERS                                    |  2 +
 board/orangepi/orangepi-one/boot.cmd          |  8 ----
 board/orangepi/orangepi-one/genimage.cfg      | 37 ----------------
 board/orangepi/orangepi-pc-plus/boot.cmd      |  8 ----
 board/orangepi/orangepi-pc-plus/genimage.cfg  | 43 -------------------
 board/orangepi/orangepi-zero-plus2/boot.cmd   |  6 ---
 .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 ------------------
 configs/orangepi_one_defconfig                |  9 ++--
 configs/orangepi_pc_plus_defconfig            |  9 ++--
 configs/orangepi_zero_plus2_defconfig         | 14 +++---
 10 files changed, 16 insertions(+), 161 deletions(-)
 delete mode 100644 board/orangepi/orangepi-one/boot.cmd
 delete mode 100644 board/orangepi/orangepi-one/genimage.cfg
 delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd
 delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg
 delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd
 delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg

Signature · 6 lines

2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Sergey Matyukevich

author

2022-02-23 19:14 UTC #1 lore raw

PATCH 1/4 board/orangepi/orangepi-zero-plus2: switch to extlinux

Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common.

Signed-off-by Sergey Matyukevich <[email protected]>

---
 board/orangepi/orangepi-zero-plus2/boot.cmd   |  6 ---
 .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 -------------------
 configs/orangepi_zero_plus2_defconfig         | 14 ++++---
 3 files changed, 8 insertions(+), 53 deletions(-)
 delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd
 delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg

board/orangepi/orangepi-zero-plus2/boot.cmd deleted +0 -6

deleted file mode 100644
index aa5162004b..0000000000
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb
-
-booti $kernel_addr_r - $fdt_addr_r

board/orangepi/orangepi-zero-plus2/genimage.cfg deleted +0 ~~-41~~

41 lines not on this page · raw message

configs/orangepi_zero_plus2_defconfig +8 -6

index 9d88b37ac9..ef171c3ad3 100644
@@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
-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-plus2/boot.cmd"
 
 # Kernel
 BR2_LINUX_KERNEL=y

@@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y
 
 # wireless firmware
 BR2_PACKAGE_LINUX_FIRMWARE=y

@@ -58,8 +57,11 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
+
+# host tools
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
+
+# image scripts
+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-plus2/genimage.cfg"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg"

Signature · 6 lines

2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Giulio Benetti

2022-02-23 19:48 UTC #2 lore raw

Re: [Buildroot] [PATCH 1/4] board/orangepi/orangepi-zero-plus2: switch to extlinux

Hi Sergey,

Quoted 3 lines · Sergey Matyukevich

Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common.

Commit log in this patch must be improved since you do more things than in patches 2-3/4, check below

Quoted 83 lines

Signed-off-by Sergey Matyukevich <[email protected]>

---
  board/orangepi/orangepi-zero-plus2/boot.cmd   |  6 ---
  .../orangepi/orangepi-zero-plus2/genimage.cfg | 41 -------------------
  configs/orangepi_zero_plus2_defconfig         | 14 ++++---
  3 files changed, 8 insertions(+), 53 deletions(-)

delete mode 100644 board/orangepi/orangepi-zero-plus2/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus2/genimage.cfg

board/orangepi/orangepi-zero-plus2/boot.cmd deleted +0 -6

deleted file mode 100644
index aa5162004b..0000000000
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb
-
-booti $kernel_addr_r - $fdt_addr_r

board/orangepi/orangepi-zero-plus2/genimage.cfg deleted +0 ~~-41~~

deleted file mode 100644
index 5a7ee7707a..0000000000
@@ -1,41 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-h5-orangepi-zero-plus2.dtb",
-			"boot.scr"
-		}
-	}
-
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-		# for root=PARTLABEL support
-		partition-table-type = "gpt"
-		# default GPT location conflicts with bootloaders, move it after
-		gpt-location = 1M
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
-	}
-
-	partition boot {
-		partition-type-uuid = "F"
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	# 'rootfs' will be used as the partition label, used
-	# with root=PARTLABEL=rootfs kernel command line
-	partition rootfs {
-		partition-type-uuid = "L"
-		image = "rootfs.ext4"
-		size = 256M
-	}
-}

configs/orangepi_zero_plus2_defconfig +0 -3

index 9d88b37ac9..ef171c3ad3 100644
@@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
  BR2_TARGET_UBOOT_SPL=y
  BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
  BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
-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-plus2/boot.cmd"
 
  # Kernel
  BR2_LINUX_KERNEL=y

configs/orangepi_zero_plus2_defconfig BR2_LINUX_KERNEL_DTS_SUPPORT=y · line 41

Quoted 5 lines

configs/orangepi_zero_plus2_defconfig +2 -0

@@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
  BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2"
  BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config"
  BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y

Is this ^^^ needed only for this board? Because on the others there is not

configs/orangepi_zero_plus2_defconfig BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" · line 61

Quoted 9 lines

configs/orangepi_zero_plus2_defconfig +2 -1

  # wireless firmware
  BR2_PACKAGE_LINUX_FIRMWARE=y

@@ -58,8 +57,11 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2"
  BR2_TARGET_ROOTFS_EXT2=y
  BR2_TARGET_ROOTFS_EXT2_4=y
  BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
+
+# host tools

Here you beautify

configs/orangepi_zero_plus2_defconfig BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" · line 64

Quoted 4 lines

configs/orangepi_zero_plus2_defconfig +2 -1
  BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
+
+# image scripts

Ditto, so worth mention it in commit log

configs/orangepi_zero_plus2_defconfig BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" · line 67

Quoted 4 lines

configs/orangepi_zero_plus2_defconfig +2 -1

+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-plus2/genimage.cfg"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg"

Best regards

Signature · 6 lines

Giulio Benetti
Benetti Engineering sas
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Sergey Matyukevich

author

2022-02-23 19:15 UTC #3 lore raw

PATCH 2/4 board/orangepi/orangepi-pc-plus: switch to extlinux

In reply to Sergey Matyukevich

Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common.

Signed-off-by Sergey Matyukevich <[email protected]>

---
 board/orangepi/orangepi-pc-plus/boot.cmd     |  8 ----
 board/orangepi/orangepi-pc-plus/genimage.cfg | 43 --------------------
 configs/orangepi_pc_plus_defconfig           |  9 ++--
 3 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd
 delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg

board/orangepi/orangepi-pc-plus/boot.cmd deleted +0 -8

deleted file mode 100644
index c91f77942f..0000000000
@@ -1,8 +0,0 @@
-setenv fdt_high ffffffff
-
-setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait
-
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r

board/orangepi/orangepi-pc-plus/genimage.cfg deleted +0 ~~-43~~

43 lines not on this page · raw message

configs/orangepi_pc_plus_defconfig +3 -6

index c3ff8bc417..ba946e5285 100644
@@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set

@@ -27,14 +28,10 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd"
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+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-pc-plus/genimage.cfg"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg"
 
 # wireless driver and firmware
 BR2_PACKAGE_RTL8189FS=y

Signature · 6 lines

2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Sergey Matyukevich

author

2022-02-23 19:15 UTC #4 lore raw

PATCH 3/4 board/orangepi/orangepi-one: switch to extlinux

In reply to Sergey Matyukevich

Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common.

Signed-off-by Sergey Matyukevich <[email protected]>

---
 board/orangepi/orangepi-one/boot.cmd     |  8 -----
 board/orangepi/orangepi-one/genimage.cfg | 37 ------------------------
 configs/orangepi_one_defconfig           |  9 ++----
 3 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 board/orangepi/orangepi-one/boot.cmd
 delete mode 100644 board/orangepi/orangepi-one/genimage.cfg

board/orangepi/orangepi-one/boot.cmd deleted +0 -8

deleted file mode 100644
index ab616e6ac9..0000000000
@@ -1,8 +0,0 @@
-setenv fdt_high ffffffff
-
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r

board/orangepi/orangepi-one/genimage.cfg deleted +0 ~~-37~~

deleted file mode 100644
index 2a14dcdec2..0000000000
@@ -1,37 +0,0 @@
-# Minimal SD card image for the OrangePi PC
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-h3-orangepi-one.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
-	}
-}

configs/orangepi_one_defconfig +3 -6

index 1a2772a307..ba128424a0 100644
@@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set

@@ -25,11 +26,7 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
-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-one/boot.cmd"
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
+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-one/genimage.cfg"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg"

Signature · 6 lines

2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Sergey Matyukevich

author

2022-02-23 19:15 UTC #5 lore raw

PATCH 4/4 DEVELOPERS: add myself for orangepi-zero-plus2

In reply to Sergey Matyukevich

Signed-off-by Sergey Matyukevich <[email protected]>

---
 DEVELOPERS | 2 ++
 1 file changed, 2 insertions(+)

DEVELOPERS +2 -0

index ac702d8d0f..f29e889c52 100644
@@ -2545,10 +2545,12 @@ F:	board/linksprite/pcduino
 F:	board/orangepi/orangepi-zero
 F:	board/orangepi/orangepi-one
 F:	board/orangepi/orangepi-pc-plus/
+F:	board/orangepi/orangepi-zero-plus2/
 F:	configs/linksprite_pcduino_defconfig
 F:	configs/orangepi_one_defconfig
 F:	configs/orangepi_pc_plus_defconfig
 F:	configs/orangepi_zero_defconfig
+F:	configs/orangepi_zero_plus2_defconfig
 F:	package/armbian-firmware/
 F:	package/hostapd/
 F:	package/rtl8189fs/

Signature · 6 lines

2.35.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Giulio Benetti

2022-02-23 19:40 UTC #6 lore raw

Re: [Buildroot] [PATCH 4/4] DEVELOPERS: add myself for orangepi-zero-plus2

Hi Sergey,

please change the subject into:
'DEVELOPERS: add Sergey Matyukevich for orangepi-zero-plus2'

because if you issue:

$ git log --oneline
you can't know who has been added.
So please send a V2.

Thank you!

Signature · 2 lines

Giulio Benetti
Benetti Engineering sas

Quoted 12 lines · Sergey Matyukevich

Signed-off-by Sergey Matyukevich <[email protected]>

---
  DEVELOPERS | 2 ++
  1 file changed, 2 insertions(+)

DEVELOPERS +0 -0

index ac702d8d0f..f29e889c52 100644
@@ -2545,10 +2545,12 @@ F:	board/linksprite/pcduino
  F:	board/orangepi/orangepi-zero
  F:	board/orangepi/orangepi-one

DEVELOPERS F: board/linksprite/pcduino · line 2556

Quoted 10 lines

DEVELOPERS +2 -0

  F:	board/orangepi/orangepi-pc-plus/
+F:	board/orangepi/orangepi-zero-plus2/
  F:	configs/linksprite_pcduino_defconfig
  F:	configs/orangepi_one_defconfig
  F:	configs/orangepi_pc_plus_defconfig
  F:	configs/orangepi_zero_defconfig
+F:	configs/orangepi_zero_plus2_defconfig
  F:	package/armbian-firmware/
  F:	package/hostapd/
  F:	package/rtl8189fs/

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot