* [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version
@ 2022-02-07 15:53 Oleksandr G Zhadan
2022-02-07 17:29 ` Giulio Benetti
0 siblings, 1 reply; 5+ messages in thread
From: Oleksandr G Zhadan @ 2022-02-07 15:53 UTC (permalink / raw)
To: buildroot; +Cc: Michael Durrant
Signed-off-by: Oleksandr G Zhadan <oleks@ArcturusGroup.com>
Signed-off-by: Michael Durrant<mdurrant@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
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"
+BR2_LINUX_KERNEL_IMAGEGZ=y
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"
# Tools
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
--
2.26.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version
2022-02-07 15:53 [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Oleksandr G Zhadan
@ 2022-02-07 17:29 ` Giulio Benetti
2022-02-08 17:31 ` Oleksandr G Zhadan
0 siblings, 1 reply; 5+ messages in thread
From: Giulio Benetti @ 2022-02-07 17:29 UTC (permalink / raw)
To: Oleksandr G Zhadan, buildroot; +Cc: Michael Durrant
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@ArcturusGroup.com>
> Signed-off-by: Michael Durrant<mdurrant@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@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
--
Giulio Benetti
Benetti Engineering sas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version
2022-02-07 17:29 ` Giulio Benetti
@ 2022-02-08 17:31 ` Oleksandr G Zhadan
2022-02-08 18:25 ` Giulio Benetti
0 siblings, 1 reply; 5+ messages in thread
From: Oleksandr G Zhadan @ 2022-02-08 17:31 UTC (permalink / raw)
To: Giulio Benetti, buildroot; +Cc: Michael Durrant
[-- Attachment #1: Type: text/plain, Size: 7716 bytes --]
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@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@ArcturusGroup.com>
>> Signed-off-by: Michael Durrant<mdurrant@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@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@arcturusnetworks.com
416.621.0125 x.235
}|{/\|)/\|-|
[-- Attachment #2: 0001-Buildroot-PATCH-V2-1-1-board-arcturus-aarch64-ucls10.patch --]
[-- Type: text/x-patch, Size: 4483 bytes --]
From 7a03f971a14a622a052a251e4c3a6a8474a994d6 Mon Sep 17 00:00:00 2001
From: Oleksandr G Zhadan <oleks@ArcturusGroup.com>
Date: Tue, 8 Feb 2022 11:57:37 -0500
Subject: [PATCH] [Buildroot] [PATCH V2 1/1] board/arcturus/aarch64-ucls1012a:
bump u-boot and kernel version
Signed-off-by: Oleksandr Zhadan<oleks@arcturusnetworks.com>
Signed-off-by: Michael Durrant<mdurrant@arcturusnetworks.com>
---
V2:
- Bump kernel to "Linux version 5.4.137"
- Bootloader version still "U-Boot 2019.10", but new targets added.
- Remove /etc/init.d/S09modload script to load pfe firmware module
because now pfe firmware module loads by kernel itself
- New compressed Image.gz is used
---
Signed-off-by: Oleksandr G Zhadan <oleks@ArcturusGroup.com>
---
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
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
--
2.26.2
[-- Attachment #3: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version
2022-02-08 17:31 ` Oleksandr G Zhadan
@ 2022-02-08 18:25 ` Giulio Benetti
2022-02-10 16:44 ` Giulio Benetti
0 siblings, 1 reply; 5+ messages in thread
From: Giulio Benetti @ 2022-02-08 18:25 UTC (permalink / raw)
To: Oleksandr G Zhadan, buildroot; +Cc: Michael Durrant
Hi Oleksandr,
On 08/02/22 18:31, Oleksandr G Zhadan wrote:
> 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`.
good
> Patches created with the options you suggested: `git format-patch -M -s
> -o . -1`
Ok, but you also need the flag -v2, so this is the command:
# git format-patch -M -s -o . -1 -v2
And then you need to add what's changed after the 3 dashes. Check this
patch as an example:
https://lists.buildroot.org/pipermail/buildroot/2022-February/635926.html
Take care of adding 3 dashes and listing:
---
V1->V2:
* changed this
* changed that
---
> Unfortunately I can't send it now with 'git send-email --to "buildroot
> <buildroot@buildroot.org>" 0001-xxxx.patch`. If it doesn't work for you,
> we'll send it later.
Yes, we need it sent like that for reviewing.
Anyway I've checked that the attached patch now applies correctly, so
you're on the right path!
Best regards
--
Giulio Benetti
Benetti Engineering sas
>
> 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@ArcturusGroup.com>
>>> Signed-off-by: Michael Durrant<mdurrant@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@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
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version
2022-02-08 18:25 ` Giulio Benetti
@ 2022-02-10 16:44 ` Giulio Benetti
0 siblings, 0 replies; 5+ messages in thread
From: Giulio Benetti @ 2022-02-10 16:44 UTC (permalink / raw)
To: Oleksandr G Zhadan, buildroot; +Cc: Michael Durrant
Hi Oleksandr,
On 08/02/22 19:25, Giulio Benetti wrote:
> Hi Oleksandr,
>
> On 08/02/22 18:31, Oleksandr G Zhadan wrote:
>> 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`.
>
> good
>
>> Patches created with the options you suggested: `git format-patch -M -s
>> -o . -1`
>
> Ok, but you also need the flag -v2, so this is the command:
> # git format-patch -M -s -o . -1 -v2
>
> And then you need to add what's changed after the 3 dashes. Check this
> patch as an example:
> https://lists.buildroot.org/pipermail/buildroot/2022-February/635926.html
>
> Take care of adding 3 dashes and listing:
> ---
> V1->V2:
> * changed this
> * changed that
> ---
>
>> Unfortunately I can't send it now with 'git send-email --to "buildroot
>> <buildroot@buildroot.org>" 0001-xxxx.patch`. If it doesn't work for you,
>> we'll send it later.
>
> Yes, we need it sent like that for reviewing.
> Anyway I've checked that the attached patch now applies correctly, so
> you're on the right path!
>
> Best regards
also, please register to patchwork:
https://patchwork.ozlabs.org/project/buildroot/list/
and tag your previous patch as superseded:
https://patchwork.ozlabs.org/project/buildroot/patch/4b667326-5aca-538b-9b36-7f0d5a400e9f@arcturusnetworks.com/
and also the V2 since you've been requested for Changes, so you can tag
as Change Request now and once sent V3 as superseded.
Thank you!
Best regards
--
Giulio Benetti
Benetti Engineering sas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-02-10 16:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-07 15:53 [Buildroot] [PATCH 1/1] board/arcturus/aarch64-ucls1012a: bump u-boot and kernel version Oleksandr G Zhadan
2022-02-07 17:29 ` Giulio Benetti
2022-02-08 17:31 ` Oleksandr G Zhadan
2022-02-08 18:25 ` Giulio Benetti
2022-02-10 16:44 ` Giulio Benetti
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.