[Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version
Oleksandr G Zhadan
oleks at arcturusnetworks.com
Tue Feb 8 17:31:56 UTC 2022
Hi Giulio,
Thanks for the quick response and your notes.
New V2 patch file attached. The patches are based on today's `git clone
https://git.buildroot.net/buildroot`.
Patches created with the options you suggested: `git format-patch -M -s
-o . -1`
Unfortunately I can't send it now with 'git send-email --to "buildroot
<buildroot at buildroot.org>" 0001-xxxx.patch`. If it doesn't work for you,
we'll send it later.
Kind Regards,
Oleks
On 2/7/22 12:29, Giulio Benetti wrote:
> Hi Oleksandr,
>
> can you improve commit log? Looking at what you do below I see you do
> more than just bumping u-boot and linux. Also please specify the
> versions you're bumping to,
>
> On 07/02/22 16:53, Oleksandr G Zhadan wrote:
>> Signed-off-by: Oleksandr G Zhadan <oleks at ArcturusGroup.com>
>> Signed-off-by: Michael Durrant<mdurrant at arcturusnetworks.com>
>> ---
>> board/arcturus/aarch64-ucls1012a/post-build.sh | 2 --
>> board/arcturus/aarch64-ucls1012a/readme.txt | 8 ++++----
>> .../rootfs_overlay/etc/init.d/S09modload | 14 --------------
>> configs/arcturus_ucls1012a_defconfig | 15
>> +++++++--------
>> 4 files changed, 11 insertions(+), 28 deletions(-)
>> delete mode 100755
>> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload
>>
>> 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..f892fc4abc 100644
>> --- a/board/arcturus/aarch64-ucls1012a/readme.txt
>> +++ b/board/arcturus/aarch64-ucls1012a/readme.txt
>> @@ -23,14 +23,14 @@ Result of the build
>> After building, you should obtain this tree:
>>
>> output/images/
>> - +-- arc-ucls1012a.dtb
>> - +-- Image
>> + +-- br2-ucls1012a.its
>> + +-- Image.gz
>> +-- part0-000000.itb
>> +-- rootfs.cpio
>> +-- rootfs.cpio.gz
>> +-- rootfs.tar
>> +-- u-boot.bin
>> - +-- ucls1012a.its
>> + +-- ucls1012a-som.dtb
>>
>> Flashing
>> --------
>> @@ -60,7 +60,7 @@ u-boot shell.
>> 4. Program the ITB image (includes Kernel, DTB and Ramdisk)
>>
>> B$ tftp part0-000000.itb
>> - B$ run iprogram
>> + B$ run program0
>>
>> 5. Booting your new system
>>
>> 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
>
> Here you remove this file for modprobe() fpe, why? Can you elabore in
> commit log?
>
>> diff --git a/configs/arcturus_ucls1012a_defconfig
>> b/configs/arcturus_ucls1012a_defconfig
>> index fd33ebf1f6..f544a5240a 100644
>> --- a/configs/arcturus_ucls1012a_defconfig
>> +++ b/configs/arcturus_ucls1012a_defconfig
>> @@ -1,24 +1,23 @@
>> # 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_DEFCONFIG="ucls1012a"
>> +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call
>> github,ArcturusNetworks,uCLS1012A-kernel,v.22.05)/linux-v.22.05.tar.gz"
>> +BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a_som"
>
> Here ^^^ you also change the defconfig name, another thing to add to
> commit log and the reason
>
>> +BR2_LINUX_KERNEL_IMAGEGZ=y
>
> Here ^^^ you change to zImage, another thing to add to commit log
>
>> BR2_LINUX_KERNEL_DTS_SUPPORT=y
>> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a"
>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/ucls1012a-som"
>>
>> # Filesystem
>> BR2_TARGET_ROOTFS_CPIO=y
>> @@ -28,8 +27,8 @@ 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_BOARD_DEFCONFIG="UCLS1012A_QSPI128"
>> +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call
>> github,ArcturusNetworks,uCLS1012A-uboot,v.22.05)/uboot-v.22.05.tar.gz"
>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_SOM"
>
> Ditto
>
>> # Tools
>> BR2_PACKAGE_HOST_UBOOT_TOOLS=y
>
> Also, which Buildroot version do you use to create patch?
> And which specific command do you use? I ask you this because patch
> results malformed:
> ```
> patch -p1 <
> ~/Downloads/1-1-board-arcturus-aarch64-ucls1012a-bump-u-boot-and-kernel-version.patch
> patching file board/arcturus/aarch64-ucls1012a/post-build.sh
> Hunk #1 succeeded at 1 with fuzz 2.
> patching file board/arcturus/aarch64-ucls1012a/readme.txt
> Hunk #1 FAILED at 23.
> Hunk #2 FAILED at 60.
> 2 out of 2 hunks FAILED -- saving rejects to file
> board/arcturus/aarch64-ucls1012a/readme.txt.rej
> patching file
> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload
> Reversed (or previously applied) patch detected! Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file
> board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload.rej
> patching file configs/arcturus_ucls1012a_defconfig
> patch: **** malformed patch at line 201:
> github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz"
> ```
>
> I've tried applying with:
> git am xxx.patch
> and then with:
> patch -p1 < xxx.patch
>
> but that gave me the malformed patch error.
>
> Usually this is how I do:
> Rebase
> # git pull --rebase upstream master
> Create the patch assuming it is on top of the commits
> # git format-patch -M -s -o . -1
> Then I send it with:
> # git send-email --to "buildroot <buildroot at buildroot.org>"
> 0001-xxxx.patch
>
> Can you please check? Because I want to give a build and check in
> buildroot docker.
>
> Thank you!
>
> Best regards
--
Oleksandr Zhadan
oleks at arcturusnetworks.com
416.621.0125 x.235
}|{/\|)/\|-|
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Buildroot-PATCH-V2-1-1-board-arcturus-aarch64-ucls10.patch
Type: text/x-patch
Size: 4483 bytes
Desc: not available
URL: <http://lists.buildroot.org/pipermail/buildroot/attachments/20220208/9259dd0f/attachment-0001.bin>
More information about the buildroot
mailing list