fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uboot-rockchip: refresh patches

Browse Source 
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
CN_SZTL 2021-01-02 11:49:29 +08:00
parent 1bf00a8526
commit 474a479c37
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/boot/uboot-rockchip/patches/101-rockchip-rk3328-fix-nanopi-r2s-failed-to-boot-on-som.patch
View File

@ -1,38 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Yuan Tao <ty@wevs.org>
Date: Sun, 9 Aug 2020 09:02:55 +0800
Subject: [PATCH] rockchip: rk3328: fix nanopi-r2s failed to boot on some sd cards
Issues:
When booting on some SD cards an error message appears as:
"spl: mmc init failed with error: -95"
Solutions:
Add regulator-boot-on parameters to vcc_sd.
Add startup-delay-us parameters to vcc_sdio.
This will improve the problem that in some SD cards are failing to boot up.
Tested environment:
SD Card: Netac Extreme P500 Pro 32GB
Signed-off-by: Yuan Tao <ty@wevs.org>
---
--- a/arch/arm/dts/rk3328-nanopi-r2s.dts
+++ b/arch/arm/dts/rk3328-nanopi-r2s.dts
@@ -32,6 +32,7 @@
regulator-name = "vcc_sd";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
vin-supply = <&vcc_io>;
};
@@ -49,6 +50,7 @@
regulator-name = "vcc_sdio";
regulator-settling-time-us = <5000>;
regulator-type = "voltage";
+ startup-delay-us = <2000>;
vin-supply = <&vcc_io>;
};

10
package/boot/uboot-rockchip/patches/200-rockchip-rk3399-split-nanopi-r4-rk3399-out-of-evb_rk.patch
View File

@ -20,8 +20,8 @@ Signed-off-by: Tianling Shen <cnsztl@gmail.com>
board/friendlyarm/nanopi4/hwrev.h | 27 ++++
board/friendlyarm/nanopi4/nanopi4.c | 148 +++++++++++++++++++++
drivers/clk/rockchip/clk_rk3399.c | 2 +
include/configs/nanopi4.h | 28 ++++
9 files changed, 433 insertions(+)
include/configs/nanopi4.h | 24 ++++
9 files changed, 429 insertions(+)
create mode 100644 board/friendlyarm/nanopi4/Kconfig
create mode 100644 board/friendlyarm/nanopi4/MAINTAINERS
create mode 100644 board/friendlyarm/nanopi4/Makefile
@ -482,7 +482,7 @@ index 22c373a623..38975c0c65 100644
--- /dev/null
+++ b/include/configs/nanopi4.h
@@ -0,0 +1,28 @@
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) Guangzhou FriendlyELEC Computer Tech. Co., Ltd.
@ -506,8 +506,4 @@ index 22c373a623..38975c0c65 100644
+#define CONFIG_SERIAL_TAG
+#define CONFIG_REVISION_TAG
+
+/* Environment configs */
+#define CONFIG_SYS_MMC_ENV_DEV 1
+#define CONFIG_SYS_MMC_ENV_PART 0
+
+#endif

9
package/boot/uboot-rockchip/patches/203-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch
View File

@ -24,15 +24,15 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 9 ++
arch/arm/dts/rk3399-nanopi-r4s.dts | 163 +++++++++++++++++++++
board/friendlyarm/nanopi4/MAINTAINERS | 6 +
configs/nanopi-r4s-rk3399_defconfig | 62 ++++++++
5 files changed, 241 insertions(+)
configs/nanopi-r4s-rk3399_defconfig | 63 ++++++++
5 files changed, 242 insertions(+)
create mode 100644 arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3399-nanopi-r4s.dts
create mode 100644 configs/nanopi-r4s-rk3399_defconfig
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -130,6 +130,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
@@ -132,6 +132,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-nanopi-m4.dtb \
rk3399-nanopi-m4-2gb.dtb \
rk3399-nanopi-neo4.dtb \
@ -232,7 +232,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
+F: arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi
--- /dev/null
+++ b/configs/nanopi-r4s-rk3399_defconfig
@@ -0,0 +1,62 @@
@@ -0,0 +1,63 @@
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x00200000
@ -260,6 +260,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_DEV=1
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MMC_DW=y