enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix booting of roc-rk3399-pc/station-p1 with legacy

Browse Source
This commit is contained in:
Piotr Szczepanik 2020-12-15 23:07:54 +01:00
parent fa2fd517d1
commit cd886792c0
No known key found for this signature in database
GPG Key ID: 0305358EB314F205
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patch/kernel/rk3399-legacy/fix-linux-headers-rk3399-pkg.patch
View File

@ -2,12 +2,10 @@ diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 33cd2c3a..888a83d9 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -408,7 +408,8 @@ fi
@@ -323,6 +323,7 @@ fi
# Build kernel header package
(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
-(cd $srctree; find arch/$SRCARCH/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
+(cd $srctree; find arch/*/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
(cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
+(cd $srctree; find security/*/include -type f) >> "$objtree/debian/hdrsrcfiles"
(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"

18
patch/kernel/rk3399-legacy/roc-rk3399-pc-add-board.patch
View File

@ -2,21 +2,23 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi
index adfa8211..2c3a023a 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -15,7 +15,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
@@ -15,7 +15,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
rk3399-nanopi-m4v2.dtb \
rk3399-nanopi4-rev22.dtb \
rk3399-kobol-helios64.dtb \
- rk3399-firefly.dtb
+ rk3399-firefly.dtb \
+ rk3399-roc-pc.dtb
+ rk3399-roc-pc.dtb \
+ rk3399-roc-pc-mezzanine.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += \
rk3328-nanopi-r2-rev00.dtb
@@ -119,6 +120,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin-r0.dtb
@@ -119,6 +120,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin-r0.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin-r1.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-mid-818-android-6.0.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-mid-818-android.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960-ab.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rv1-android.dtb
@ -46,6 +48,14 @@ index 00000000..cc922411
+ status = "okay";
+};
+
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
new file mode 120000
index 00000000..0f6a3467
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
@@ -0,0 +1 @@
+rk3399-roc-pc.dts
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mipi.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mipi.dts
new file mode 100644
index 00000000..b3145e99
@ -407,7 +417,7 @@ index 00000000..f871f0c5
+ compatible = "gpio-leds";
+ power {
+ label = "firefly:blue:power";
+ linux,default-trigger = "ir-power-click";
+ linux,default-trigger = "heartbeat";
+ default-state = "on";
+ gpios = <&gpio2 27 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";pinctrl-0 = <&led_power>;