Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
nberlee committed Dec 12, 2023
1 parent cd0f56e commit 52b3a37
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down Expand Up @@ -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"),
Expand Down

0 comments on commit 52b3a37

Please sign in to comment.