From 00a1a54bd60fedf025cab4f27c13632f7007dc1a Mon Sep 17 00:00:00 2001
From: Nico Berlee <nico.berlee@on2it.net>
Date: Thu, 4 Apr 2024 19:55:20 +0200
Subject: [PATCH] new kernel + u-boot

---
 .github/workflows/ci.yaml            | 4 ++--
 Dockerfile                           | 2 +-
 Makefile                             | 2 +-
 pkg/machinery/constants/constants.go | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 270e08838c..2e7d557fa0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -65,7 +65,7 @@ jobs:
           USERNAME: ${{ github.actor }}
           PLATFORM: linux/arm64
           PROGRESS: plain
-          IMAGER_ARGS: "--system-extension-image ghcr.io/nberlee/rk3588:v1.6.7"
+          IMAGER_ARGS: "--system-extension-image ghcr.io/nberlee/rk3588:v1.6.7-1-g4c38887"
 
       - name: Build an turing-rk1 installer
         run: |
@@ -77,7 +77,7 @@ jobs:
           USERNAME: ${{ github.actor }}
           PLATFORM: linux/arm64
           PROGRESS: plain
-          IMAGER_ARGS: "--system-extension-image ghcr.io/nberlee/rk3588:v1.6.7"
+          IMAGER_ARGS: "--system-extension-image ghcr.io/nberlee/rk3588:v1.6.7-1-g4c38887"
 
       - uses: actions/upload-artifact@v3
         with:
diff --git a/Dockerfile b/Dockerfile
index 8ce24d7b7a..b20d918b97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -85,7 +85,7 @@ FROM ${PKG_KERNEL} AS pkg-kernel
 FROM --platform=amd64 ${PKG_KERNEL} AS pkg-kernel-amd64
 FROM --platform=arm64 ${PKG_KERNEL} AS pkg-kernel-arm64
 
-FROM --platform=arm64 ghcr.io/nberlee/u-boot:v1.6.0-29-g7be6f52-dirty AS pkg-u-boot-arm64
+FROM --platform=arm64 ghcr.io/nberlee/u-boot:v1.6.0-32-g3bfb6b8-dirty AS pkg-u-boot-arm64
 FROM --platform=arm64 ghcr.io/siderolabs/raspberrypi-firmware:${PKGS} AS pkg-raspberrypi-firmware-arm64
 
 # Resolve package images using ${EXTRAS} to be used later in COPY --from=.
diff --git a/Makefile b/Makefile
index 6dbb1f4740..bbede62ec4 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ CLOUD_IMAGES_EXTRA_ARGS ?= ""
 ARTIFACTS := _out
 TOOLS ?= ghcr.io/siderolabs/tools:v1.6.0-3-gae30965
 PKGS ?= v1.6.0-27-gdf44f94
-PKG_KERNEL ?= ghcr.io/nberlee/kernel:v1.6.0-29-g7be6f52
+PKG_KERNEL ?= ghcr.io/nberlee/kernel:v1.6.0-32-g3bfb6b8
 EXTRAS ?= v1.6.0-2-g9234398
 # renovate: datasource=github-tags depName=golang/go
 GO_VERSION ?= 1.21
diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go
index a6550a9226..cbcb9596a0 100644
--- a/pkg/machinery/constants/constants.go
+++ b/pkg/machinery/constants/constants.go
@@ -16,7 +16,7 @@ import (
 
 const (
 	// DefaultKernelVersion is the default Linux kernel version.
-	DefaultKernelVersion = "6.6.22-talos"
+	DefaultKernelVersion = "6.6.24-talos"
 
 	// KernelModulesPath is the default path to the kernel modules without the kernel version.
 	KernelModulesPath = "/lib/modules"