Wed Jun 3 17:21:06 +09 2020

hyphop · Jun 3, 2020 · b87e4f7 · b87e4f7
1 parent cdbd258
commit b87e4f7
Show file tree

Hide file tree

Showing 4 changed files with 213 additions and 2 deletions.
diff --git a/patches/linux-krescue/0777-kresq_dts_amlogic.patch b/patches/linux-krescue/0777-kresq_dts_amlogic.patch
@@ -0,0 +1,112 @@
+From 2a2bb3b52d195e42a77ed9a46c441d1dd8e1f5cb Mon Sep 17 00:00:00 2001
+From: hyphop <art@khadas.com>
+Date: Tue, 2 Jun 2020 18:13:21 +0900
+Subject: [PATCH] kresq_dts_amlogic
+
+---
+ arch/arm64/boot/dts/amlogic/Makefile               |  7 +++++++
+ arch/arm64/boot/dts/amlogic/kresq.dts              |  3 +++
+ .../amlogic/meson-g12b-a311d-khadas-vim3-kresq.dts |  2 ++
+ .../amlogic/meson-g12b-s922x-khadas-vim3-kresq.dts |  3 +++
+ .../amlogic/meson-gxl-s905x-khadas-vim-kresq.dts   |  2 ++
+ .../dts/amlogic/meson-gxm-khadas-vim2-kresq.dts    |  2 ++
+ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 14 ++++++++++++++
+ .../dts/amlogic/meson-sm1-khadas-vim3l-kresq.dts   |  2 ++
+ 8 files changed, 35 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/amlogic/kresq.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3-kresq.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3-kresq.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim-kresq.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2-kresq.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l-kresq.dts
+
+diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
+index 1a766fbf5..e3b10e78d 100644
+--- a/arch/arm64/boot/dts/amlogic/Makefile
++++ b/arch/arm64/boot/dts/amlogic/Makefile
+@@ -4,3 +4,10 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb
++
++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3-kresq.dtb
++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3-kresq.dtb
++dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim-kresq.dtb
++dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2-kresq.dtb
++dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l-kresq.dtb
++
+diff --git a/arch/arm64/boot/dts/amlogic/kresq.dts b/arch/arm64/boot/dts/amlogic/kresq.dts
+new file mode 100644
+index 000000000..728a9a687
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/kresq.dts
+@@ -0,0 +1,3 @@
++&spifc {
++    status = "okay";
++};
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3-kresq.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3-kresq.dts
+new file mode 100644
+index 000000000..cf54c9c63
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3-kresq.dts
+@@ -0,0 +1,2 @@
++#include "meson-g12b-a311d-khadas-vim3.dts"
++#include "kresq.dts"
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3-kresq.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3-kresq.dts
+new file mode 100644
+index 000000000..635c93c75
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-khadas-vim3-kresq.dts
+@@ -0,0 +1,3 @@
++#include "meson-g12b-s922x-khadas-vim3.dts"
++#include "kresq.dts"
++
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim-kresq.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim-kresq.dts
+new file mode 100644
+index 000000000..5f8b3f957
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim-kresq.dts
+@@ -0,0 +1,2 @@
++#include "meson-gxl-s905x-khadas-vim.dts"
++#include "kresq.dts"
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2-kresq.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2-kresq.dts
+new file mode 100644
+index 000000000..6f3d54886
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2-kresq.dts
+@@ -0,0 +1,2 @@
++#include "meson-gxm-khadas-vim2.dts"
++#include "kresq.dts"
+diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
+index 8fe8c4ec4..f2899ea6e 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
+@@ -436,3 +436,17 @@
+     phy-names = "usb2-phy0", "usb2-phy1";
+ };
+  */
++
++
++// spifc + emmc
++// EMMC read speed down from 160MiB to 88 MiB
++//      write speed same 47MiB
++/*
++&spifc {
++	status = "okay";
++};
++&sd_emmc_c {
++	status = "okay";
++	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_4b_pins>, <&emmc_ds_pins>;
++};
++*/
+diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l-kresq.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l-kresq.dts
+new file mode 100644
+index 000000000..5c7a9dedf
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l-kresq.dts
+@@ -0,0 +1,2 @@
++#include "meson-sm1-khadas-vim3l.dts"
++#include "kresq.dts"
+-- 
+2.17.1
+
diff --git a/patches/linux-krescue/0777-kresq_dts_rockchip.patch b/patches/linux-krescue/0777-kresq_dts_rockchip.patch
@@ -0,0 +1,67 @@
+From 4343e031e0d5b3e0b80f0f1a58e85f106dcd1134 Mon Sep 17 00:00:00 2001
+From: hyphop <art@khadas.com>
+Date: Tue, 2 Jun 2020 18:17:17 +0900
+Subject: [PATCH] kresq_dts_rockchip
+
+---
+ arch/arm64/boot/dts/rockchip/Makefile                         | 4 ++++
+ arch/arm64/boot/dts/rockchip/kresq.dts                        | 2 ++
+ .../boot/dts/rockchip/rk3399-khadas-edge-captain-kresq.dts    | 2 ++
+ arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-kresq.dts     | 2 ++
+ arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v-kresq.dts   | 2 ++
+ 5 files changed, 12 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/rockchip/kresq.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain-kresq.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-kresq.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v-kresq.dts
+
+diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
+index f18c75a3f..b057f24e6 100644
+--- a/arch/arm64/boot/dts/rockchip/Makefile
++++ b/arch/arm64/boot/dts/rockchip/Makefile
+@@ -2,3 +2,7 @@
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb
++
++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-kresq.dtb
++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain-kresq.dtb
++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v-kresq.dtb
+diff --git a/arch/arm64/boot/dts/rockchip/kresq.dts b/arch/arm64/boot/dts/rockchip/kresq.dts
+new file mode 100644
+index 000000000..e7f89c3bd
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/kresq.dts
+@@ -0,0 +1,2 @@
++// empty
++
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain-kresq.dts b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain-kresq.dts
+new file mode 100644
+index 000000000..2b737185f
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-captain-kresq.dts
+@@ -0,0 +1,2 @@
++#include "rk3399-khadas-edge-captain.dts"
++#include "kresq.dts"
+\ No newline at end of file
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-kresq.dts b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-kresq.dts
+new file mode 100644
+index 000000000..f5038c1b2
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-kresq.dts
+@@ -0,0 +1,2 @@
++#include "rk3399-khadas-edge.dts"
++#include "kresq.dts"
+\ No newline at end of file
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v-kresq.dts b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v-kresq.dts
+new file mode 100644
+index 000000000..b1eb93a22
+--- /dev/null
++++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge-v-kresq.dts
+@@ -0,0 +1,2 @@
++#include "rk3399-khadas-edge-v.dts"
++#include "kresq.dts"
+\ No newline at end of file
+-- 
+2.17.1
+
diff --git a/scripts/auto_krescue_test_57_openwrt b/scripts/auto_krescue_test_57_openwrt
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+#= auto build example
+
+## hyphop ##
+
+set -e
+
+export LINUX_VER=linux-5.7
+
+./kernel_prepare
+
+./patch_ ../patches/$LINUX_VER/*.patch || exit 1
+./patch_ ../patches/linux-krescue/*.patch || exit 1
+#./patch_ ../patches/wifi_4359/*.patch || exit 1
+
+#exit 0
+
+./make_kernel_mainline_vimsX -n
+./kernel_config ../files/configs/mmc_y
+./kernel_config ../files/configs/eth2_y
+./kernel_config ../files/configs/usb_storage_m
+./kernel_config ../files/configs/small_size_y
+
+NOPOST=1 ./make_kernel_mainline_vimsX dtbs || echo "[w] ups...">&2
+
+./make_kernel_mainline_vimsX
+
+TAR=1 ./make_kernel_mainline_vimsX_modules
diff --git a/scripts/make_kernel_mainline_vimsX b/scripts/make_kernel_mainline_vimsX
@@ -129,12 +129,15 @@ CMD cp $DIR/arch/arm64/boot/Image $T
 pigz -9c $T/Image > $T/Image.gz
 lzma -T4 -e -9 --block-size=3M -c $T/Image > $T/Image.lzma
 
+KERNEL_ADDR=0x01080000
+KERNEL_ADDR=0x0f080000
+
 CMD mkimage -A arm64 \
-    -O linux -C gzip -T kernel -a 0x01080000 -e 0x01080000 \
+    -O linux -C gzip -T kernel -a $KERNEL_ADDR -e $KERNEL_ADDR \
     -n kernel -d "$T/Image.gz" "$T/uImage.gzip"
 
 CMD mkimage -A arm64 \
-    -O linux -C lzma -T kernel -a 0x01080000 -e 0x01080000 \
+    -O linux -C lzma -T kernel -a $KERNEL_ADDR -e $KERNEL_ADDR \
     -n kernel -d "$T/Image.lzma" "$T/uImage.lzma"
 
 [ "$ALL" ] && {