lordwelch/gokrazy-cm3588-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lordwelch:002960a8347c2be5c8d2b78430997f73b72bc564
Branches Tags
lordwelch:main
lordwelch:updates
..
compare: lordwelch:2e5cddd2455cf701fb649904aec20dcafc1f3941
Branches Tags
lordwelch:updates
lordwelch:main

No commits in common. "002960a8347c2be5c8d2b78430997f73b72bc564" and "2e5cddd2455cf701fb649904aec20dcafc1f3941" have entirely different histories.
002960a834 ... 2e5cddd245

8 changed files with 2755 additions and 322 deletions
Show Stats Expand all files Collapse all files

3028
atf.patches/feat-rk3588-support-rk3588.patch
View File

File diff suppressed because it is too large Load Diff

5
atf.patches/rk3588-enable-crypto-function.patch
View File

@ -1,11 +1,8 @@
From 3e45797b2790492e2863441e24246536a33f1efd Mon Sep 17 00:00:00 2001
From c805c14c1026b3ae5445e211c2101c60cd76ad0e Mon Sep 17 00:00:00 2001
From: XiaoDong Huang <derrick.huang@rock-chips.com>
Date: Mon, 17 Jun 2024 10:55:27 +0800
Subject: [PATCH] feat(rk3588): enable crypto function
The CPU crypto is not default on when power up, need to enable it by
software.
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Ifee2eab55d9c13cef5f15926fb80016845e2a66d
---

4
cmd/gokr-build-kernel/build.go
View File

@ -19,7 +19,7 @@ import (
var configContents []byte
// see https://www.kernel.org/releases.json
var latest = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.10.tar.xz"
var latest = "https://git.kernel.org/torvalds/t/linux-6.10-rc7.tar.gz"
func downloadKernel() error {
out, err := os.Create(filepath.Base(latest))
@ -152,7 +152,7 @@ func main() {
log.Fatalf("untar: %v", err)
}
srcdir := strings.TrimSuffix(filepath.Base(latest), ".tar.xz")
srcdir := strings.TrimSuffix(filepath.Base(latest), ".tar.gz")
log.Printf("applying patches")
if err := applyPatches(srcdir); err != nil {

21
cmd/gokr-build-kernel/config.txt
View File

@ -31,7 +31,7 @@ CONFIG_ROCKCHIP_IODOMAIN=y
CONFIG_ROCKCHIP_PM_DOMAINS=y
CONFIG_PWM_ROCKCHIP=y
CONFIG_PHY_ROCKCHIP_DP=y
CONFIG_PHY_ROCKCHIP_DPHY_RX0=y
CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
CONFIG_PHY_ROCKCHIP_EMMC=y
CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
@ -64,22 +64,3 @@ CONFIG_REALTEK_PHY=y
CONFIG_DRM=y
CONFIG_DRM_ROCKCHIP=y
CONFIG_CRYPTO_DEV_ROCKCHIP2=y
CONFIG_HW_RANDOM_ROCKCHIP=y
CONFIG_VIDEO_ROCKCHIP_VDEC2=y
CONFIG_MKISS=y
CONFIG_6PACK=y
CONFIG_BPQETHER=y
CONFIG_BAYCOM_SER_FDX=y
CONFIG_BAYCOM_SER_HDX=y
CONFIG_YAM=y
CONFIG_USB_RTL8150=y
CONFIG_USB_RTL8152=y
CONFIG_AD525X_DPOT=y
CONFIG_AD525X_DPOT_I2C=y
CONFIG_AD525X_DPOT_SPI=y

6
cmd/gokr-rebuild-kernel/kernel.go
View File

@ -15,7 +15,7 @@ import (
)
const dockerFileContents = `
FROM debian:buster
FROM debian:bullseye
RUN apt-get update && apt-get install -y crossbuild-essential-arm64 bc libssl-dev bison flex
RUN mkdir -p /usr/src/kernel.patches
@ -123,7 +123,7 @@ func find(filename string) (string, error) {
return filename, nil
}
path := filepath.Join(gopath, "src", "gitea.narnian.us", "lordwelch", "gokrazy-cm3588-kernel", filename)
path := filepath.Join(gopath, "src", "github.com", "anupcshan", "gokrazy-rock64-kernel", filename)
if _, err := os.Stat(path); err == nil {
return path, nil
}
@ -171,7 +171,7 @@ func main() {
}
defer os.RemoveAll(tmp)
cmd := exec.Command("go", "build", "-o", tmp, "gitea.narnian.us/lordwelch/gokrazy-cm3588-kernel/cmd/gokr-build-kernel")
cmd := exec.Command("go", "build", "-o", tmp, "github.com/anupcshan/gokrazy-rock64-kernel/cmd/gokr-build-kernel")
cmd.Env = append(os.Environ(), "GOOS=linux", "CGO_ENABLED=0")
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {

7
cmd/gokr-rebuild-uboot/uboot.go
View File

@ -14,7 +14,7 @@ import (
)
const dockerFileContents = `
FROM debian:buster
FROM debian:bookworm
RUN apt-get update && apt-get install -y crossbuild-essential-arm64 bc libssl-dev bison flex git python3 python3-setuptools swig python3-dev python3-pyelftools uuid-dev libgnutls28-dev
@ -49,6 +49,7 @@ var atfPatchFiles = []string{
"atf.patches/feat-rk3588-support-rk3588.patch",
"atf.patches/rk3588-enable-crypto-function.patch",
"atf.patches/feat-rockchip-support-SCMI-for-clock-reset-domain.patch",
"atf.patches/rockchip-add-some-pm-helpers-functions.patch",
}
func copyFile(dest, src string) error {
@ -93,7 +94,7 @@ func find(filename string) (string, error) {
return filename, nil
}
path := filepath.Join(gopath, "src", "gitea.narnian.us", "lordwelch", "gokrazy-cm3588-kernel", filename)
path := filepath.Join(gopath, "src", "github.com", "anupcshan", "gokrazy-rock64-kernel", filename)
if _, err := os.Stat(path); err == nil {
return path, nil
}
@ -141,7 +142,7 @@ func main() {
}
defer os.RemoveAll(tmp)
cmd := exec.Command("go", "build", "-o", tmp, "gitea.narnian.us/lordwelch/gokrazy-cm3588-kernel/cmd/gokr-build-uboot")
cmd := exec.Command("go", "build", "-o", tmp, "github.com/anupcshan/gokrazy-rock64-kernel/cmd/gokr-build-uboot")
cmd.Env = append(os.Environ(), "GOOS=linux", "CGO_ENABLED=0")
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {

4
kernel.patches/0001-dt-bindings-arm-rockchip-Add-FriendlyElec-CM3588-NAS.patch
View File

@ -29,9 +29,9 @@ index fcf7316ec..86379b8cc 100644
+ - const: friendlyarm,cm3588
+ - const: rockchip,rk3588
+
- description: GameForce Chi
- description: GeekBuying GeekBox
items:
- const: gameforce,chi
- const: geekbuying,geekbox
--
2.45.2

2
kernel.patches/0002-arm64-dts-rockchip-Add-FriendlyElec-CM3588-NAS-board.patch
View File

@ -54,7 +54,7 @@ index f906a868b..c528f5382 100644
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-friendlyelec-cm3588-nas.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-jaguar.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-ok3588-c.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts
new file mode 100644
index 000000000..83103e4c7