diff --git a/config/bootscripts/boot-meson64.cmd b/config/bootscripts/boot-meson64.cmd index 5aa8b3784..c191762a6 100644 --- a/config/bootscripts/boot-meson64.cmd +++ b/config/bootscripts/boot-meson64.cmd @@ -96,7 +96,7 @@ if test -e ${devtype} ${devnum} ${prefix}zImage; then if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi - setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 coherent_pool=2M loglevel=${verbosity} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a55=${max_freq_a55} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan} ${hid_quirks} monitor_onoff=${monitor_onoff} ${cec_enable} sdrmode=${sdrmode} consoleblank=0" + setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 coherent_pool=2M loglevel=${verbosity} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a55=${max_freq_a55} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan} ${hid_quirks} monitor_onoff=${monitor_onoff} ${cec_enable} sdrmode=${sdrmode}" load ${devtype} ${devnum} ${k_addr} boot/zImage load ${devtype} ${devnum} ${dtb_loadaddr} boot/dtb/amlogic/meson64_odroidc4.dtb @@ -105,7 +105,7 @@ if test -e ${devtype} ${devnum} ${prefix}zImage; then unzip ${k_addr} ${loadaddr} booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr} else - # moder kernel boot + # modern kernel boot if test "${console}" = "serial"; then setenv consoleargs "console=ttyAML0,115200"; fi if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyAML0,115200 console=tty1"; fi diff --git a/patch/kernel/rockchip64-current/add-board-Z28-PRO-as-link-to-Rock64.patch b/patch/kernel/rockchip64-current/add-board-Z28-PRO-as-link-to-Rock64.patch index f7ae3bbf7..f2b23f8b7 100644 --- a/patch/kernel/rockchip64-current/add-board-Z28-PRO-as-link-to-Rock64.patch +++ b/patch/kernel/rockchip64-current/add-board-Z28-PRO-as-link-to-Rock64.patch @@ -9,18 +9,6 @@ Signed-off-by: Igor Pecovnik 1 file changed, 1 insertion(+) create mode 120000 arch/arm64/boot/dts/rockchip/rk3328-z28pro.dts -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 92981d8..1dbe50c 100644 ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-neo3-rev02.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-z28pro.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3328-z28pro.dts b/arch/arm64/boot/dts/rockchip/rk3328-z28pro.dts new file mode 120000 index 000000000..69752a370 diff --git a/patch/kernel/rockchip64-current/add-board-helios64.patch b/patch/kernel/rockchip64-current/add-board-helios64.patch index fd96f6b82..29107f68f 100644 --- a/patch/kernel/rockchip64-current/add-board-helios64.patch +++ b/patch/kernel/rockchip64-current/add-board-helios64.patch @@ -5,23 +5,10 @@ Subject: [PATCH] Add board Helios64 Signed-off-by: Aditya Prayoga --- - arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 1084 +++++++++++++++++ 2 files changed, 1085 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 473e14e12..b8e6e86e0 100644 ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -25,6 +25,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-kobol-helios64.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-hugsun-x99.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts new file mode 100644 index 000000000..fae17f416 diff --git a/patch/kernel/rockchip64-current/add-board-nanopi-m4v2.patch b/patch/kernel/rockchip64-current/add-board-nanopi-m4v2.patch index ba844c8b8..36ddbc086 100644 --- a/patch/kernel/rockchip64-current/add-board-nanopi-m4v2.patch +++ b/patch/kernel/rockchip64-current/add-board-nanopi-m4v2.patch @@ -1,15 +1,3 @@ -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 948195b49..48dccb95e 100644 ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-captain.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-khadas-edge-v.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4v2.dts new file mode 100644 index 000000000..60358ab8c diff --git a/patch/kernel/rockchip64-current/add-board-nanopi-r2s.patch b/patch/kernel/rockchip64-current/add-board-nanopi-r2s.patch index 2b7d5f9ae..bd1b0e3c4 100644 --- a/patch/kernel/rockchip64-current/add-board-nanopi-r2s.patch +++ b/patch/kernel/rockchip64-current/add-board-nanopi-r2s.patch @@ -1,16 +1,3 @@ -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 92d796a33..24a6c304f 100644 ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -1,6 +1,8 @@ - # SPDX-License-Identifier: GPL-2.0 - dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev00.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev20.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-dram-default-timing.dtsi new file mode 100644 index 000000000..a3f5ff4bd diff --git a/patch/kernel/rockchip64-current/add-board-orangepi-4.patch b/patch/kernel/rockchip64-current/add-board-orangepi-4.patch index 74091adc8..97e19ad5f 100644 --- a/patch/kernel/rockchip64-current/add-board-orangepi-4.patch +++ b/patch/kernel/rockchip64-current/add-board-orangepi-4.patch @@ -1,15 +1,3 @@ -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index aed41ff1d..92d796a33 100644 ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -26,6 +26,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi-4.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi-4.dts new file mode 100644 index 000000000..1e1747ceb diff --git a/patch/kernel/rockchip64-current/add-board-rk3328-roc-pc-make.patch b/patch/kernel/rockchip64-current/add-board-rk3328-roc-pc-make.patch deleted file mode 100644 index b1f5019f9..000000000 --- a/patch/kernel/rockchip64-current/add-board-rk3328-roc-pc-make.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -12,6 +12,7 @@ - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-pc.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou.dtb - diff --git a/patch/kernel/rockchip64-current/add-board-rockpi-e.patch b/patch/kernel/rockchip64-current/add-board-rockpi-e.patch index ac13a8b56..c354b3909 100644 --- a/patch/kernel/rockchip64-current/add-board-rockpi-e.patch +++ b/patch/kernel/rockchip64-current/add-board-rockpi-e.patch @@ -1,15 +1,3 @@ -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 1f18a9392..06ddfb869 100644 ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -2,6 +2,7 @@ - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev00.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev20.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts new file mode 100644 index 000000000..52732643f diff --git a/patch/kernel/rockchip64-current/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch b/patch/kernel/rockchip64-current/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch index 43e6adacf..a7c31c934 100644 --- a/patch/kernel/rockchip64-current/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch +++ b/patch/kernel/rockchip64-current/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch @@ -10,18 +10,6 @@ Signed-off-by: Igor Pecovnik 2 files changed, 196 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3-rev02.dts -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index f769eb1d1..b8e6e86e0 100644 ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev00.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev20.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-neo3-rev02.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3-rev02.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-neo3-rev02.dts new file mode 100644 index 000000000..bf0a625fe @@ -223,6 +211,6 @@ index 000000000..bf0a625fe + pinctl-0 = <&uart1_xfer>; +}; + --- +-- Created with Armbian build tools https://github.com/armbian/build diff --git a/patch/kernel/rockchip64-current/add-boards-to-dts-makefile.patch b/patch/kernel/rockchip64-current/add-boards-to-dts-makefile.patch new file mode 100644 index 000000000..26aa2a3b6 --- /dev/null +++ b/patch/kernel/rockchip64-current/add-boards-to-dts-makefile.patch @@ -0,0 +1,20 @@ +diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile +index 26661c7b7..1462ed38b 100644 +--- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -1,4 +1,15 @@ + # SPDX-License-Identifier: GPL-2.0 ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev00.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2-rev20.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-neo3-rev02.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-pc.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-z28pro.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-kobol-helios64.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4v2.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi-4.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb diff --git a/patch/kernel/rockchip64-current/board-rockpi4-Add-DT-link-for-backward-compatibility.patch b/patch/kernel/rockchip64-current/board-rockpi4-Add-DT-link-for-backward-compatibility.patch index f27663efa..8a28b367e 100644 --- a/patch/kernel/rockchip64-current/board-rockpi4-Add-DT-link-for-backward-compatibility.patch +++ b/patch/kernel/rockchip64-current/board-rockpi4-Add-DT-link-for-backward-compatibility.patch @@ -10,18 +10,6 @@ Signed-off-by: Igor Pecovnik 2 files changed, 2 insertions(+) create mode 120000 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index e91faee4a..8fb764404 100644 ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -38,6 +38,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts new file mode 120000 index 000000000..07e8a11b0 diff --git a/patch/kernel/rockchip64-current/board-rockpis-0001-arm64-dts-rockchip-add-ROCK-Pi-S-DTS-support.patch b/patch/kernel/rockchip64-current/board-rockpis-0001-arm64-dts-rockchip-add-ROCK-Pi-S-DTS-support.patch index acb02ed7a..a3368a900 100644 --- a/patch/kernel/rockchip64-current/board-rockpis-0001-arm64-dts-rockchip-add-ROCK-Pi-S-DTS-support.patch +++ b/patch/kernel/rockchip64-current/board-rockpis-0001-arm64-dts-rockchip-add-ROCK-Pi-S-DTS-support.patch @@ -35,23 +35,10 @@ Changes for v3 3 files changed, 227 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts --- - arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3308-rock-pi-s.dts | 221 ++++++++++++++++++ 2 files changed, 222 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts -diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index 48fb631d5451..e56a5527bab4 100644 ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -2,6 +2,7 @@ - dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts new file mode 100644 index 000000000000..4fccae43f008 diff --git a/patch/kernel/sunxi-current/0001-Fix-broken-ethernet-on-Bananapi-Pro.patch b/patch/kernel/sunxi-current/0001-Fix-broken-ethernet-on-Bananapi-Pro.patch new file mode 100644 index 000000000..5b00e3c78 --- /dev/null +++ b/patch/kernel/sunxi-current/0001-Fix-broken-ethernet-on-Bananapi-Pro.patch @@ -0,0 +1,26 @@ +From 6dc71e6435ebcb3323857d090967337662cbdb9f Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Tue, 5 Jan 2021 22:44:06 +0100 +Subject: [PATCH] Fix broken ethernet on Bananapi Pro + +Signed-off-by: Igor Pecovnik +--- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts +index 803578433..08073fb68 100644 +--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts ++++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts +@@ -110,7 +110,7 @@ &gmac { + pinctrl-names = "default"; + pinctrl-0 = <&gmac_rgmii_pins>; + phy-handle = <&phy1>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + phy-supply = <®_gmac_3v3>; + status = "okay"; + }; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/sunxi-current/0001-Fix-broken-ethernet-on-Orangepi-2.patch b/patch/kernel/sunxi-current/0001-Fix-broken-ethernet-on-Orangepi-2.patch new file mode 100644 index 000000000..26f766e3a --- /dev/null +++ b/patch/kernel/sunxi-current/0001-Fix-broken-ethernet-on-Orangepi-2.patch @@ -0,0 +1,26 @@ +From c0d922d25d5efb64dc28817cefda7a6945e74e2c Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Tue, 5 Jan 2021 22:53:31 +0100 +Subject: [PATCH] Fix broken ethernet on Orangepi 2 + +Signed-off-by: Igor Pecovnik +--- + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts +index 97f497854..d05fa679d 100644 +--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts ++++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts +@@ -85,7 +85,7 @@ &emac { + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + + status = "okay"; + }; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/sunxi-current/sun50i-h5-Fix-phy-mode-on-Nanopi-K1-GMAC.patch b/patch/kernel/sunxi-current/sun50i-h5-Fix-phy-mode-on-Nanopi-K1-GMAC.patch new file mode 100644 index 000000000..fee8e8df7 --- /dev/null +++ b/patch/kernel/sunxi-current/sun50i-h5-Fix-phy-mode-on-Nanopi-K1-GMAC.patch @@ -0,0 +1,26 @@ +From 244058210b0d5f57afd37854b2503e70f39c8f3e Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Tue, 5 Jan 2021 21:32:02 +0100 +Subject: [PATCH] Fix phy mode on Nanopi K1 GMAC + +Signed-off-by: Igor Pecovnik +--- + arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts | 2 ++-- + 1 file changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts +index a0b863284..ae6ac61c2 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts +@@ -197,7 +197,7 @@ &emac { + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + local-mac-address = [ 00 00 00 00 00 00 ]; + allwinner,leds-active-low; + status = "okay"; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/sunxi-dev/0001-Fix-broken-ethernet-on-Bananapi-Pro.patch b/patch/kernel/sunxi-dev/0001-Fix-broken-ethernet-on-Bananapi-Pro.patch new file mode 100644 index 000000000..5b00e3c78 --- /dev/null +++ b/patch/kernel/sunxi-dev/0001-Fix-broken-ethernet-on-Bananapi-Pro.patch @@ -0,0 +1,26 @@ +From 6dc71e6435ebcb3323857d090967337662cbdb9f Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Tue, 5 Jan 2021 22:44:06 +0100 +Subject: [PATCH] Fix broken ethernet on Bananapi Pro + +Signed-off-by: Igor Pecovnik +--- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts +index 803578433..08073fb68 100644 +--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts ++++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts +@@ -110,7 +110,7 @@ &gmac { + pinctrl-names = "default"; + pinctrl-0 = <&gmac_rgmii_pins>; + phy-handle = <&phy1>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + phy-supply = <®_gmac_3v3>; + status = "okay"; + }; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/sunxi-dev/0001-Fix-broken-ethernet-on-Orangepi-2.patch b/patch/kernel/sunxi-dev/0001-Fix-broken-ethernet-on-Orangepi-2.patch new file mode 100644 index 000000000..26f766e3a --- /dev/null +++ b/patch/kernel/sunxi-dev/0001-Fix-broken-ethernet-on-Orangepi-2.patch @@ -0,0 +1,26 @@ +From c0d922d25d5efb64dc28817cefda7a6945e74e2c Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Tue, 5 Jan 2021 22:53:31 +0100 +Subject: [PATCH] Fix broken ethernet on Orangepi 2 + +Signed-off-by: Igor Pecovnik +--- + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts +index 97f497854..d05fa679d 100644 +--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts ++++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts +@@ -85,7 +85,7 @@ &emac { + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + + status = "okay"; + }; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/sunxi-dev/sun50i-h5-Fix-phy-mode-on-Nanopi-K1-GMAC.patch b/patch/kernel/sunxi-dev/sun50i-h5-Fix-phy-mode-on-Nanopi-K1-GMAC.patch new file mode 100644 index 000000000..fee8e8df7 --- /dev/null +++ b/patch/kernel/sunxi-dev/sun50i-h5-Fix-phy-mode-on-Nanopi-K1-GMAC.patch @@ -0,0 +1,26 @@ +From 244058210b0d5f57afd37854b2503e70f39c8f3e Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Tue, 5 Jan 2021 21:32:02 +0100 +Subject: [PATCH] Fix phy mode on Nanopi K1 GMAC + +Signed-off-by: Igor Pecovnik +--- + arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts | 2 ++-- + 1 file changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts +index a0b863284..ae6ac61c2 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-k1-plus.dts +@@ -197,7 +197,7 @@ &emac { + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + local-mac-address = [ 00 00 00 00 00 00 ]; + allwinner,leds-active-low; + status = "okay"; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/u-boot/u-boot-meson64/odroidc4_TFLASH_VDD_EN_pin.patch b/patch/u-boot/u-boot-meson64/odroidc4_TFLASH_VDD_EN_pin.patch new file mode 100644 index 000000000..ba462509b --- /dev/null +++ b/patch/u-boot/u-boot-meson64/odroidc4_TFLASH_VDD_EN_pin.patch @@ -0,0 +1,37 @@ +From 21a1bc6a900c33efe4da4cc1b33efcfa543fd9d0 Mon Sep 17 00:00:00 2001 +From: Marek Szyprowski +Date: Fri, 18 Dec 2020 11:43:45 +0100 +Subject: [PATCH] ARM: dts: meson: switch TFLASH_VDD_EN pin to open drain on + Odroid-C4 + +For the proper reboot Odroid-C4 board requires to switch TFLASH_VDD_EN +pin to the high impedance mode, otherwise the board is stuck in the +middle of loading early stages of the bootloader from SD card. + +This can be achieved by using the OPEN_DRAIN flag instead if the +ACTIVE_HIGH, what will leave the pin in input to achieve high state (pin +has the pull-up) and solve the issue. + +Suggested-by: Neil Armstrong +Signed-off-by: Marek Szyprowski +Acked-by: Neil Armstrong +Signed-off-by: Neil Armstrong +--- + arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi b/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi +index c431988075..fbcc8287c5 100644 +--- a/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi ++++ b/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi +@@ -11,3 +11,7 @@ + snps,reset-delays-us = <0 10000 1000000>; + snps,reset-active-low; + }; ++ ++&tflash_vdd { ++ gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; ++}; +-- +GitLab +