diff mbox series

configs/solidrun_clearfog: update U-Boot and Linux

Message ID ZrcMbDYOcKkKaazr@waldemar-brodkorb.de
State Superseded
Headers show
Series configs/solidrun_clearfog: update U-Boot and Linux | expand

Commit Message

Waldemar Brodkorb Aug. 10, 2024, 6:45 a.m. UTC
Tested on Solidrun Clearfog.

Signed-off-by: Wademar Brodkorb <wbx@openadk.org>
---
 board/solidrun/clearfog/genimage.cfg                   |  2 +-
 .../clearfog/patches/linux-headers/linux-headers.hash  |  2 ++
 board/solidrun/clearfog/patches/linux/linux.hash       |  2 ++
 board/solidrun/clearfog/patches/uboot/uboot.hash       |  2 ++
 configs/solidrun_clearfog_defconfig                    | 10 +++++++---
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 board/solidrun/clearfog/patches/linux-headers/linux-headers.hash
 create mode 100644 board/solidrun/clearfog/patches/linux/linux.hash
 create mode 100644 board/solidrun/clearfog/patches/uboot/uboot.hash

Comments

Baruch Siach Aug. 11, 2024, 3:58 a.m. UTC | #1
Hi Waldemar,

On Sat, Aug 10 2024, Waldemar Brodkorb wrote:
> Tested on Solidrun Clearfog.
>
> Signed-off-by: Wademar Brodkorb <wbx@openadk.org>
> ---
>  board/solidrun/clearfog/genimage.cfg                   |  2 +-
>  .../clearfog/patches/linux-headers/linux-headers.hash  |  2 ++
>  board/solidrun/clearfog/patches/linux/linux.hash       |  2 ++
>  board/solidrun/clearfog/patches/uboot/uboot.hash       |  2 ++

Since you add hashes and FORCE_CHECK_HASHES, You should also update
.checkpackageignore.

Thanks,
baruch

>  configs/solidrun_clearfog_defconfig                    | 10 +++++++---
>  5 files changed, 14 insertions(+), 4 deletions(-)
>  create mode 100644 board/solidrun/clearfog/patches/linux-headers/linux-headers.hash
>  create mode 100644 board/solidrun/clearfog/patches/linux/linux.hash
>  create mode 100644 board/solidrun/clearfog/patches/uboot/uboot.hash
>
> diff --git a/board/solidrun/clearfog/genimage.cfg b/board/solidrun/clearfog/genimage.cfg
> index 8963619cc5..35aab62a8c 100644
> --- a/board/solidrun/clearfog/genimage.cfg
> +++ b/board/solidrun/clearfog/genimage.cfg
> @@ -4,7 +4,7 @@ image sdcard.img {
>  
>  	partition u-boot {
>  		in-partition-table = "no"
> -		image = "u-boot-spl.kwb"
> +		image = "u-boot-with-spl.kwb"
>  		offset = 512
>  	}
>  
> diff --git a/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash b/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash
> new file mode 100644
> index 0000000000..b8935a250a
> --- /dev/null
> +++ b/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e  linux-6.6.43.tar.xz
> diff --git a/board/solidrun/clearfog/patches/linux/linux.hash b/board/solidrun/clearfog/patches/linux/linux.hash
> new file mode 100644
> index 0000000000..b8935a250a
> --- /dev/null
> +++ b/board/solidrun/clearfog/patches/linux/linux.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e  linux-6.6.43.tar.xz
> diff --git a/board/solidrun/clearfog/patches/uboot/uboot.hash b/board/solidrun/clearfog/patches/uboot/uboot.hash
> new file mode 100644
> index 0000000000..fe9b4f53dc
> --- /dev/null
> +++ b/board/solidrun/clearfog/patches/uboot/uboot.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
> diff --git a/configs/solidrun_clearfog_defconfig b/configs/solidrun_clearfog_defconfig
> index 7f633d30d5..56d5c1d354 100644
> --- a/configs/solidrun_clearfog_defconfig
> +++ b/configs/solidrun_clearfog_defconfig
> @@ -5,6 +5,10 @@ BR2_ARM_ENABLE_NEON=y
>  BR2_ARM_ENABLE_VFP=y
>  BR2_ARM_FPU_NEON=y
>  
> +# Hashes
> +BR2_GLOBAL_PATCH_DIR="board/solidrun/clearfog/patches"
> +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
> +
>  # Linux headers same as kernel, a 6.6 series
>  BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
>  
> @@ -16,7 +20,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog/genimage.cfg"
>  # Kernel
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28"
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.43"
>  BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7"
>  BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog/linux.fragment"
>  BR2_LINUX_KERNEL_DTS_SUPPORT=y
> @@ -33,10 +37,10 @@ BR2_PACKAGE_HOST_GENIMAGE=y
>  BR2_TARGET_UBOOT=y
>  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
>  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog"
>  BR2_TARGET_UBOOT_NEEDS_DTC=y
>  BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
>  # BR2_TARGET_UBOOT_FORMAT_BIN is not set
>  BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
> -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-spl.kwb"
> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.kwb"
diff mbox series

Patch

diff --git a/board/solidrun/clearfog/genimage.cfg b/board/solidrun/clearfog/genimage.cfg
index 8963619cc5..35aab62a8c 100644
--- a/board/solidrun/clearfog/genimage.cfg
+++ b/board/solidrun/clearfog/genimage.cfg
@@ -4,7 +4,7 @@  image sdcard.img {
 
 	partition u-boot {
 		in-partition-table = "no"
-		image = "u-boot-spl.kwb"
+		image = "u-boot-with-spl.kwb"
 		offset = 512
 	}
 
diff --git a/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash b/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash
new file mode 100644
index 0000000000..b8935a250a
--- /dev/null
+++ b/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash
@@ -0,0 +1,2 @@ 
+# Locally calculated
+sha256  0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e  linux-6.6.43.tar.xz
diff --git a/board/solidrun/clearfog/patches/linux/linux.hash b/board/solidrun/clearfog/patches/linux/linux.hash
new file mode 100644
index 0000000000..b8935a250a
--- /dev/null
+++ b/board/solidrun/clearfog/patches/linux/linux.hash
@@ -0,0 +1,2 @@ 
+# Locally calculated
+sha256  0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e  linux-6.6.43.tar.xz
diff --git a/board/solidrun/clearfog/patches/uboot/uboot.hash b/board/solidrun/clearfog/patches/uboot/uboot.hash
new file mode 100644
index 0000000000..fe9b4f53dc
--- /dev/null
+++ b/board/solidrun/clearfog/patches/uboot/uboot.hash
@@ -0,0 +1,2 @@ 
+# Locally calculated
+sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
diff --git a/configs/solidrun_clearfog_defconfig b/configs/solidrun_clearfog_defconfig
index 7f633d30d5..56d5c1d354 100644
--- a/configs/solidrun_clearfog_defconfig
+++ b/configs/solidrun_clearfog_defconfig
@@ -5,6 +5,10 @@  BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_NEON=y
 
+# Hashes
+BR2_GLOBAL_PATCH_DIR="board/solidrun/clearfog/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+
 # Linux headers same as kernel, a 6.6 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
 
@@ -16,7 +20,7 @@  BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog/genimage.cfg"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.43"
 BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -33,10 +37,10 @@  BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-spl.kwb"
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.kwb"