| Message ID | 20220210174739.15866-1-mdurrant@arcturusnetworks.com |
|---|---|
| State | Superseded |
| Delegated to: | Thomas Petazzoni |
| Headers | show |
| Series | [v3] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version | expand |
Hi Michale, Oleksandr, On 10/02/22 18:47, Michael Durrant wrote: > From: Oleksandr G Zhadan <oleks@arcturusnetworks.com> Here we're missing the real commit log. I think you've added only to change log some stuff that should go here. Below you only need to point the changes between patches. But here there will be the commit log. So please list here what this patch changes and below only the changes between patches(that looks good actually). What about: ``` - 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 actual bug that didn't allow to obtain part0-000000.itb file ``` > Signed-off-by: Oleksandr Zhadan <oleks@arcturusnetworks.com> > Signed-off-by: Michael Durrant <mdurrant@arcturusnetworks.com> > --- > V1->V2: > - Bump the kernel to "Linux version 5.4.137" > - Bootloader version is still "U-Boot 2019.10" but new targets added. Why do you need new targets? I mean, this defconfig build for only 1 target, isn't it? > - 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. Ah, so actually this board doesn't work, right? > - 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. So here on V4 you only need to write: V3->V4: - Improved commit log by listing all the changed as suggested by Giulio I also see that you have post-build.sh and post-image.sh, but you can move the content of post-build.sh into post-image.sh, or better, the content of post-image.sh back to post-build.sh. This because you don't actually create a final image(like image.img or something else) as I can see. For the rest it looks good to me. I wait for V4. PS: have you thought about also creating a final image by using genimage? That way you could flash the NOR using only 1 file. Does NXP QorIQ® LS1012A processor has some kind of tool to flash directly NOR? Thank you! Best regards
diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f..ca3862988d 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -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}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef..cb91716b34 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -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 -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f..0000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f6..2a9c1e0582 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -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