From 52b3a373674170096bd71ebaa737cc43fff4892c Mon Sep 17 00:00:00 2001
From: Nico Berlee <nico.berlee@on2it.net>
Date: Fri, 1 Dec 2023 16:41:22 +0100
Subject: [PATCH] test

---
 Dockerfile                                                    | 2 +-
 Makefile                                                      | 2 +-
 .../pkg/runtime/v1alpha1/board/turing_rk1/turing_rk1.go       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f7618a00c16..7fba4394cc0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -82,7 +82,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-3-gcb3e668-dirty AS pkg-u-boot-arm64
+FROM --platform=arm64 ghcr.io/nberlee/u-boot:v1.6.0-7-g26b9618-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 800dead4e40..aabe969a5ff 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@ CLOUD_IMAGES_EXTRA_ARGS ?= ""
 ARTIFACTS := _out
 TOOLS ?= ghcr.io/siderolabs/tools:v1.6.0-1-g336d248
 PKGS ?= v1.6.0-3-g617d342
+PKG_KERNEL ?= ghcr.io/nberlee/kernel:v1.6.0-6-g8ca6181
 EXTRAS ?= v1.6.0-1-g113887a
-PKG_KERNEL ?= ghcr.io/nberlee/kernel:v1.6.0-3-gcb3e668
 # renovate: datasource=github-tags depName=golang/go
 GO_VERSION ?= 1.21
 # renovate: datasource=go depName=golang.org/x/tools
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/board/turing_rk1/turing_rk1.go b/internal/app/machined/pkg/runtime/v1alpha1/board/turing_rk1/turing_rk1.go
index 4cee4e99f02..11938785a45 100644
--- a/internal/app/machined/pkg/runtime/v1alpha1/board/turing_rk1/turing_rk1.go
+++ b/internal/app/machined/pkg/runtime/v1alpha1/board/turing_rk1/turing_rk1.go
@@ -23,7 +23,7 @@ var (
 	dtb       = "rockchip/rk3588-turing-rk1.dtb"
 )
 
-// TuringRK1 represents the Turing RK1 board.
+// TuringRK1 represents the Rockchip RK3588 based SoM from Turing Machines.
 //
 // Reference: https://rockpi.org/
 type TuringRK1 struct{}
@@ -81,7 +81,7 @@ func (r *TuringRK1) Install(options runtime.BoardInstallOptions) (err error) {
 // KernelArgs implements the runtime.Board.
 func (r *TuringRK1) KernelArgs() procfs.Parameters {
 	return []*procfs.Parameter{
-		procfs.NewParameter("console").Append("tty0").Append("ttyS0,115200").Append("ttyS2,115200"),
+		procfs.NewParameter("console").Append("tty0").Append("ttyS9,115200").Append("ttyS2,115200"),
 		procfs.NewParameter("sysctl.kernel.kexec_load_disabled").Append("1"),
 		procfs.NewParameter(constants.KernelParamDashboardDisabled).Append("1"),
 		procfs.NewParameter("irqchip.gicv3_pseudo_nmi").Append("0"),