board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version

PATCH Superseded Michael Durrant 2 participants 2 messages Feb 18, 2022 – Feb 19, 2022

Share & tools

Michael Durrant

author

2022-02-18 22:09 UTC #0 lore raw

PATCH v4 1/1 board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version

- Bump Linux to version 5.4.137
- Bump U-Boot to add new targets, version remains the same
- Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel
- Use Image.gz instead of Image to have a compressed kernel
- Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file.

Signed-off-by Oleksandr Zhadan <[email protected]>

Signed-off-by Michael Durrant <[email protected]>

---
V1->V2:
- Bump the kernel to "Linux version 5.4.137"
- Bootloader version is still "U-Boot 2019.10" but new targets added.
- Remove the /etc/init.d/S09modload script to load the pfe firmware module because now the pfe firmware module is loaded by the kernel
- New compressed Image.gz is used
V2->V3:
- Moved SoB to top of patch
- The use of Image.gz replace Image to force use of compression.
- Our scripts use br2-ucls1012a.its in error ucls1012a.its was used in original readme.
- Removing extra newline
- The NXP Packet Forward Engine (PFE) firmware loader was the only file used in the overlay. As the PFE is now loaded directly by the kernel the BR2_ROOTFS_OVERLAY script has been removed.
V3->V4:
- Improved commit log by listing all the changed as suggested by Giulio.
- Updated header version comment in defconfig to reflect 5.4 series.

---
 board/arcturus/aarch64-ucls1012a/post-build.sh     |  1 -
 board/arcturus/aarch64-ucls1012a/readme.txt        |  4 ++--
 .../rootfs_overlay/etc/init.d/S09modload           | 14 --------------
 configs/arcturus_ucls1012a_defconfig               | 10 +++++-----
 4 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload

board/arcturus/aarch64-ucls1012a/post-build.sh +0 -1

index f8ba78095f..372df59c61 100755
@@ -1,5 +1,4 @@
 #!/bin/sh
 
 mkdir -p ${TARGET_DIR}/lib/firmware
-cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/
 cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/

board/arcturus/aarch64-ucls1012a/readme.txt +2 -2

index 483d5e9aef..b486ecebc7 100644
@@ -24,13 +24,13 @@ After building, you should obtain this tree:
 
     output/images/
     +-- arc-ucls1012a.dtb
-    +-- Image
+    +-- Image.gz
     +-- part0-000000.itb
     +-- rootfs.cpio
     +-- rootfs.cpio.gz
     +-- rootfs.tar
     +-- u-boot.bin
-    +-- ucls1012a.its
+    +-- br2-ucls1012a.its
 
 Flashing
 --------

board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted +0 ~~-14~~

deleted file mode 100755
index c87ffda14f..0000000000
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-case "$1" in
-       start)
-                modprobe pfe
-                ;;
-        stop)
-                ;;
-        restart|reload)
-                ;;
-        *)
-                echo "Usage: $0 {start|stop|restart}"
-                exit 1
-esac

configs/arcturus_ucls1012a_defconfig +5 -5

index fd33ebf1f6..124cc3ff94 100644
@@ -1,22 +1,22 @@
 # Architecture
 BR2_aarch64=y
 
-# Linux headers same as kernel, a 4.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+# Linux headers same as kernel, a 5.4 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 
 # System settings
 BR2_TARGET_GENERIC_HOSTNAME="ucls1012a"
 BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM"
 BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a"
+BR2_LINUX_KERNEL_IMAGEGZ=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a"

@@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128"
 
 # Tools

Signature · 6 lines

2.26.2

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

Giulio Benetti

Reviewed-by Tested-by on v4 1/1

2022-02-19 21:07 UTC #1 lore raw

Hi Michael,

Quoted 5 lines · Michael Durrant

- Bump Linux to version 5.4.137
- Bump U-Boot to add new targets, version remains the same
- Drop BR2_ROOTFS_OVERLAY and remove S09modload script because it was only used by PFE and now PFE is loaded directly by the kernel
- Use Image.gz instead of Image to have a compressed kernel
- Rename ucls1012a.its to br2-ucls1012a.its since post-build.sh and post-image.sh use different name. This fixes the bug that didn't allow the creation of the part0-000000.itb file.

Please wrap your commit log at 72th column. Give a try by auto-sending the patch to yourself and download it so you can verify commit log wraps at 72.

Quoted 2 lines

Signed-off-by Oleksandr Zhadan <[email protected]>
Signed-off-by Michael Durrant <[email protected]>

I've built the defconfig successfully using the gitlab-CI docker and except commit log carriage return:

Reviewed-by Giulio Benetti <[email protected]>

Tested-by Giulio Benetti <[email protected]>

[Giulio: build tested]

So please send a V5 with above correction including my tags ^^^ after your SoBs.

Thank you!

Best regards

Signature · 2 lines

Giulio Benetti
Benetti Engineering sas

Quoted 109 lines

---
  board/arcturus/aarch64-ucls1012a/post-build.sh     |  1 -
  board/arcturus/aarch64-ucls1012a/readme.txt        |  4 ++--
  .../rootfs_overlay/etc/init.d/S09modload           | 14 --------------
  configs/arcturus_ucls1012a_defconfig               | 10 +++++-----
  4 files changed, 7 insertions(+), 22 deletions(-)

delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload

board/arcturus/aarch64-ucls1012a/post-build.sh +0 -1

index f8ba78095f..372df59c61 100755
@@ -1,5 +1,4 @@
  #!/bin/sh
 
  mkdir -p ${TARGET_DIR}/lib/firmware
-cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/
  cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/

board/arcturus/aarch64-ucls1012a/readme.txt +2 -2

index 483d5e9aef..b486ecebc7 100644
@@ -24,13 +24,13 @@ After building, you should obtain this tree:
 
      output/images/
      +-- arc-ucls1012a.dtb
-    +-- Image
+    +-- Image.gz
      +-- part0-000000.itb
      +-- rootfs.cpio
      +-- rootfs.cpio.gz
      +-- rootfs.tar
      +-- u-boot.bin
-    +-- ucls1012a.its
+    +-- br2-ucls1012a.its
 
  Flashing
  --------

board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted +0 ~~-14~~

deleted file mode 100755
index c87ffda14f..0000000000
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-case "$1" in
-       start)
-                modprobe pfe
-                ;;
-        stop)
-                ;;
-        restart|reload)
-                ;;
-        *)
-                echo "Usage: $0 {start|stop|restart}"
-                exit 1
-esac

configs/arcturus_ucls1012a_defconfig +4 -4

index fd33ebf1f6..124cc3ff94 100644
@@ -1,22 +1,22 @@
  # Architecture
  BR2_aarch64=y
 
-# Linux headers same as kernel, a 4.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+# Linux headers same as kernel, a 5.4 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 
  # System settings
  BR2_TARGET_GENERIC_HOSTNAME="ucls1012a"
  BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM"
  BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay"
  BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh"
  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh"
 
  # Kernel
  BR2_LINUX_KERNEL=y
  BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz"
  BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a"
+BR2_LINUX_KERNEL_IMAGEGZ=y
  BR2_LINUX_KERNEL_DTS_SUPPORT=y
  BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a"

configs/arcturus_ucls1012a_defconfig BR2_TARGET_ROOTFS_CPIO_GZIP=y · line 34

Quoted 8 lines

configs/arcturus_ucls1012a_defconfig +1 -1

@@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y
  BR2_TARGET_UBOOT=y
  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
  BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz"
  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128"
 
  # Tools

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