Skip to contentSkip to conversation

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

PATCH Superseded Michael PDQ 2 participants 2 messages Feb 9, 2022

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Michael PDQ

author
#0 lore raw

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

From: Oleksandr G Zhadan <[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

---

Signed-off-by Oleksandr Zhadan<[email protected]>
Signed-off-by Michael Durrant<[email protected]>
---
 board/arcturus/aarch64-ucls1012a/post-build.sh     |  2 --
 board/arcturus/aarch64-ucls1012a/readme.txt        |  5 +++--
 .../rootfs_overlay/etc/init.d/S09modload           | 14 --------------
 configs/arcturus_ucls1012a_defconfig               |  9 ++++-----
 4 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100755 board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload
board/arcturus/aarch64-ucls1012a/post-build.sh +0 -2
index f8ba78095f..ca3862988d 100755
@@ -1,5 +1,3 @@
 #!/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 +3 -2
index 483d5e9aef..cb91716b34 100644
@@ -23,14 +23,15 @@ Result of the build
 After building, you should obtain this tree:
 
     output/images/
+    +-- Image.gz
     +-- arc-ucls1012a.dtb
-    +-- Image
+    +-- br2-ucls1012a.its
     +-- part0-000000.itb
     +-- rootfs.cpio
     +-- rootfs.cpio.gz
     +-- rootfs.tar
     +-- u-boot.bin
-    +-- 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 -5
index fd33ebf1f6..2a9c1e0582 100644
@@ -1,22 +1,21 @@
 # Architecture
 BR2_aarch64=y
 
-# Linux headers same as kernel, a 4.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+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 +27,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
#1 lore raw

Hi Oleksander,

Quoted 2 lines · Michael PDQ

From: Oleksandr G Zhadan <[email protected]>

[0]

Quoted 9 lines

---
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

---

Please move the 2 SoBs above [0], otherwise they will be dropped since everything after the 3 dashes will be dropped and it's only useful for patch reviewing.

Quoted 25 lines
Signed-off-by Oleksandr Zhadan<[email protected]>
Signed-off-by Michael Durrant<[email protected]>
---
  board/arcturus/aarch64-ucls1012a/post-build.sh     |  2 --
  board/arcturus/aarch64-ucls1012a/readme.txt        |  5 +++--
  .../rootfs_overlay/etc/init.d/S09modload           | 14 --------------
  configs/arcturus_ucls1012a_defconfig               |  9 ++++-----
  4 files changed, 7 insertions(+), 23 deletions(-)

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

board/arcturus/aarch64-ucls1012a/post-build.sh +0 -2
index f8ba78095f..ca3862988d 100755
@@ -1,5 +1,3 @@
  #!/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 +0 -0
index 483d5e9aef..cb91716b34 100644

board/arcturus/aarch64-ucls1012a/readme.txt Result of the build · line 26

Quoted 4 lines
board/arcturus/aarch64-ucls1012a/readme.txt +1 -0
@@ -23,14 +23,15 @@ Result of the build
  After building, you should obtain this tree:
 
      output/images/
+    +-- Image.gz

This change ^^^ is worth to be mention in commit log

board/arcturus/aarch64-ucls1012a/readme.txt Result of the build · line 28

Quoted 3 lines
board/arcturus/aarch64-ucls1012a/readme.txt +1 -1
      +-- arc-ucls1012a.dtb
-    +-- Image
+    +-- br2-ucls1012a.its

Is there a reason why .its file changes name? If yes can you please write it in commit log?

board/arcturus/aarch64-ucls1012a/readme.txt Result of the build · line 34

Quoted 7 lines
board/arcturus/aarch64-ucls1012a/readme.txt +1 -1
      +-- part0-000000.itb
      +-- rootfs.cpio
      +-- rootfs.cpio.gz
      +-- rootfs.tar
      +-- u-boot.bin
-    +-- ucls1012a.its
+

This ^^^ newline is useless, please drop it

Quoted 12 lines
board/arcturus/aarch64-ucls1012a/readme.txt +0 -0
  Flashing
  --------
board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted +0 -4
deleted file mode 100755
index c87ffda14f..0000000000
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-case "$1" in
-       start)

board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload line 14

Quoted 10 lines
board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted +0 -10
-                modprobe pfe
-                ;;
-        stop)
-                ;;
-        restart|reload)
-                ;;
-        *)
-                echo "Usage: $0 {start|stop|restart}"
-                exit 1
-esac

You're removing this script and...

Quoted 7 lines
configs/arcturus_ucls1012a_defconfig +0 -0
index fd33ebf1f6..2a9c1e0582 100644
@@ -1,22 +1,21 @@
  # Architecture
  BR2_aarch64=y

configs/arcturus_ucls1012a_defconfig line 11

Quoted 10 lines
configs/arcturus_ucls1012a_defconfig +1 -3
 
-# Linux headers same as kernel, a 4.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+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"

...the overlay directory, can you explain why in commit log?

configs/arcturus_ucls1012a_defconfig line 18

Quoted 10 lines
configs/arcturus_ucls1012a_defconfig +2 -1
  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

This ^^^ is the reason of renaming to Image.gz but it's worth mention it in commit log

configs/arcturus_ucls1012a_defconfig BR2_TARGET_ROOTFS_CPIO_GZIP=y · line 33

Quoted 12 lines
configs/arcturus_ucls1012a_defconfig +1 -1
  BR2_LINUX_KERNEL_DTS_SUPPORT=y
  BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a"
 

@@ -28,7 +27,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

I've built it successfully in gitlab-ci docker, so I think you only need to fix those few stuff and send a V3 so I can re-test and give you my Reviewed-by and Tested-by:

Thank you!

Best regards

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