Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
7ea80dbc67 | ||
|
24e3b80338 | ||
|
ece7317ca3 | ||
|
5410540f02 |
@ -1,29 +0,0 @@
|
|||||||
From 1849ef423238aeb1732eb3b8e67eb46bc21401c7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Thu, 10 Sep 2020 14:24:12 +0100
|
|
||||||
Subject: [PATCH] Fix BeagleAI detection
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
board/ti/am57xx/board.c | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
|
|
||||||
index 7809875510..3232812a97 100644
|
|
||||||
--- a/board/ti/am57xx/board.c
|
|
||||||
+++ b/board/ti/am57xx/board.c
|
|
||||||
@@ -527,8 +527,10 @@ void do_board_detect(void)
|
|
||||||
|
|
||||||
rc = ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS,
|
|
||||||
CONFIG_EEPROM_CHIP_ADDRESS);
|
|
||||||
- if (rc)
|
|
||||||
+ if (rc) {
|
|
||||||
printf("ti_i2c_eeprom_init failed %d\n", rc);
|
|
||||||
+ ti_i2c_eeprom_am_set("BBONE-AI", "A");
|
|
||||||
+ }
|
|
||||||
|
|
||||||
#ifdef CONFIG_SUPPORT_EMMC_BOOT
|
|
||||||
rc = board_bootmode_has_emmc();
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
@ -1,518 +0,0 @@
|
|||||||
From 25ce28126444900b7b3efef36c6b9d15a6ab9af1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Wed, 28 Oct 2020 10:08:44 +0000
|
|
||||||
Subject: [PATCH] Fixes for AllWinner ethernet network interfaces
|
|
||||||
|
|
||||||
The upstream kernel in fixing stuff has broken stuff.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
arch/arm/dts/sun50i-a64-bananapi-m64.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-a64-nanopi-a64.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-a64-olinuxino.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-a64-orangepi-win.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-a64-pine64-plus.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-h5-nanopi-neo2.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-h5-orangepi-prime.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-h6-beelink-gs1.dts | 2 +-
|
|
||||||
arch/arm/dts/sun50i-h6-pine-h64.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-bananapi.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-bananapro.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-cubietruck.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-hummingbird.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-lamobo-r1.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-olimex-som-evb.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-olimex-som204-evb.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-olinuxino-lime2.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-orangepi-mini.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-orangepi.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-pcduino3-nano.dts | 2 +-
|
|
||||||
arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 +-
|
|
||||||
arch/arm/dts/sun8i-a83t-bananapi-m3.dts | 2 +-
|
|
||||||
arch/arm/dts/sun8i-a83t-cubietruck-plus.dts | 2 +-
|
|
||||||
arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts | 2 +-
|
|
||||||
arch/arm/dts/sun8i-h3-orangepi-plus.dts | 2 +-
|
|
||||||
arch/arm/dts/sun8i-h3-orangepi-plus2e.dts | 2 +-
|
|
||||||
arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts | 2 +-
|
|
||||||
arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +-
|
|
||||||
arch/arm/dts/sunxi-bananapi-m2-plus.dtsi | 2 +-
|
|
||||||
36 files changed, 36 insertions(+), 36 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun50i-a64-bananapi-m64.dts b/arch/arm/dts/sun50i-a64-bananapi-m64.dts
|
|
||||||
index ef1c90401b..e1c22aeb29 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-a64-bananapi-m64.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-a64-bananapi-m64.dts
|
|
||||||
@@ -112,7 +112,7 @@
|
|
||||||
&emac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
phy-supply = <®_dc1sw>;
|
|
||||||
status = "okay";
|
|
||||||
diff --git a/arch/arm/dts/sun50i-a64-nanopi-a64.dts b/arch/arm/dts/sun50i-a64-nanopi-a64.dts
|
|
||||||
index 31884dbc88..03ebe3e44b 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-a64-nanopi-a64.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-a64-nanopi-a64.dts
|
|
||||||
@@ -102,7 +102,7 @@
|
|
||||||
&emac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
phy-supply = <®_dcdc1>;
|
|
||||||
status = "okay";
|
|
||||||
diff --git a/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts b/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts
|
|
||||||
index 6a2154525d..94caf110ab 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts
|
|
||||||
@@ -30,7 +30,7 @@
|
|
||||||
&emac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
phy-supply = <®_dc1sw>;
|
|
||||||
allwinner,tx-delay-ps = <600>;
|
|
||||||
diff --git a/arch/arm/dts/sun50i-a64-olinuxino.dts b/arch/arm/dts/sun50i-a64-olinuxino.dts
|
|
||||||
index f7a4bccaa5..2396d9b797 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-a64-olinuxino.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-a64-olinuxino.dts
|
|
||||||
@@ -102,7 +102,7 @@
|
|
||||||
&emac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
phy-supply = <®_dcdc1>;
|
|
||||||
allwinner,tx-delay-ps = <600>;
|
|
||||||
diff --git a/arch/arm/dts/sun50i-a64-orangepi-win.dts b/arch/arm/dts/sun50i-a64-orangepi-win.dts
|
|
||||||
index b0c64f7579..5b5d4f31b6 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-a64-orangepi-win.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-a64-orangepi-win.dts
|
|
||||||
@@ -127,7 +127,7 @@
|
|
||||||
&emac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
status = "okay";
|
|
||||||
diff --git a/arch/arm/dts/sun50i-a64-pine64-plus.dts b/arch/arm/dts/sun50i-a64-pine64-plus.dts
|
|
||||||
index 24f1aac366..b09b4276f1 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-a64-pine64-plus.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-a64-pine64-plus.dts
|
|
||||||
@@ -52,7 +52,7 @@
|
|
||||||
&emac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-txid";
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
diff --git a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
|
|
||||||
index 53fcc9098d..4a50a18128 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
|
|
||||||
@@ -95,7 +95,7 @@
|
|
||||||
&emac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
phy-supply = <®_dc1sw>;
|
|
||||||
status = "okay";
|
|
||||||
diff --git a/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts b/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts
|
|
||||||
index df1b9263ad..6e30a564c8 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts
|
|
||||||
@@ -36,7 +36,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
/delete-property/ allwinner,leds-active-low;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
|
|
||||||
index 4f9ba53ffa..9d93fe1536 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
|
|
||||||
@@ -96,7 +96,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo2.dts
|
|
||||||
index b059e20813..e8ab8c2df5 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-h5-nanopi-neo2.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-h5-nanopi-neo2.dts
|
|
||||||
@@ -75,7 +75,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts
|
|
||||||
index 70b5f09984..6cc567ea99 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts
|
|
||||||
@@ -118,7 +118,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun50i-h5-orangepi-prime.dts b/arch/arm/dts/sun50i-h5-orangepi-prime.dts
|
|
||||||
index cb44bfa598..33ab44072e 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-h5-orangepi-prime.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-h5-orangepi-prime.dts
|
|
||||||
@@ -124,7 +124,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts
|
|
||||||
index ef5ca64442..de448ca51e 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts
|
|
||||||
@@ -69,7 +69,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
|
|
||||||
index 0dc33c90dd..024035d36e 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
|
|
||||||
@@ -64,7 +64,7 @@
|
|
||||||
&emac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&ext_rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
phy-supply = <®_aldo2>;
|
|
||||||
status = "okay";
|
|
||||||
diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts
|
|
||||||
index 1898345183..13fbf26817 100644
|
|
||||||
--- a/arch/arm/dts/sun50i-h6-pine-h64.dts
|
|
||||||
+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts
|
|
||||||
@@ -66,7 +66,7 @@
|
|
||||||
&emac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&ext_rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
phy-supply = <®_aldo2>;
|
|
||||||
allwinner,rx-delay-ps = <200>;
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts
|
|
||||||
index e2bfe00588..4dbcad1343 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts
|
|
||||||
@@ -130,7 +130,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-bananapi.dts b/arch/arm/dts/sun7i-a20-bananapi.dts
|
|
||||||
index 81bc85d398..33040c43bc 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-bananapi.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-bananapi.dts
|
|
||||||
@@ -132,7 +132,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-bananapro.dts b/arch/arm/dts/sun7i-a20-bananapro.dts
|
|
||||||
index 0176e9de01..8a75545e22 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-bananapro.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-bananapro.dts
|
|
||||||
@@ -110,7 +110,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-cubietruck.dts b/arch/arm/dts/sun7i-a20-cubietruck.dts
|
|
||||||
index 99f531b8d2..46a9f4669e 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-cubietruck.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-cubietruck.dts
|
|
||||||
@@ -151,7 +151,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
phy1: ethernet-phy@1 {
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-hummingbird.dts b/arch/arm/dts/sun7i-a20-hummingbird.dts
|
|
||||||
index fd0153f656..5c3d107094 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-hummingbird.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-hummingbird.dts
|
|
||||||
@@ -101,7 +101,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_gmac_vdd>;
|
|
||||||
/* phy reset config */
|
|
||||||
snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
|
|
||||||
index f91e1bee44..8173d77c12 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-lamobo-r1.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
|
|
||||||
@@ -120,7 +120,7 @@
|
|
||||||
&gmac {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
status = "okay";
|
|
||||||
/delete-property/#address-cells;
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
|
|
||||||
index f0e6a96e57..f0c5160ff8 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts
|
|
||||||
@@ -112,7 +112,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
phy1: ethernet-phy@1 {
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts
|
|
||||||
index 823aabce04..ff42708137 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts
|
|
||||||
@@ -106,7 +106,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy3>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_vcc3v3>;
|
|
||||||
|
|
||||||
snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>;
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
|
|
||||||
index 4e1c590eb0..996201665b 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts
|
|
||||||
@@ -112,7 +112,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
phy1: ethernet-phy@1 {
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/dts/sun7i-a20-orangepi-mini.dts
|
|
||||||
index 15881081ca..b80215c61c 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-orangepi-mini.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-orangepi-mini.dts
|
|
||||||
@@ -121,7 +121,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-orangepi.dts b/arch/arm/dts/sun7i-a20-orangepi.dts
|
|
||||||
index d64de2e73a..66efb7d1ab 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-orangepi.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-orangepi.dts
|
|
||||||
@@ -97,7 +97,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
|
|
||||||
index 538ea15fa3..205eaae44a 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts
|
|
||||||
@@ -115,7 +115,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
phy1: ethernet-phy@1 {
|
|
||||||
diff --git a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
|
|
||||||
index c27e56091f..56cc5791c4 100644
|
|
||||||
--- a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
|
|
||||||
+++ b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts
|
|
||||||
@@ -82,7 +82,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
|
|
||||||
phy1: ethernet-phy@1 {
|
|
||||||
diff --git a/arch/arm/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/dts/sun8i-a83t-bananapi-m3.dts
|
|
||||||
index eaff6fa401..2beafe3a31 100644
|
|
||||||
--- a/arch/arm/dts/sun8i-a83t-bananapi-m3.dts
|
|
||||||
+++ b/arch/arm/dts/sun8i-a83t-bananapi-m3.dts
|
|
||||||
@@ -123,7 +123,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_sw>;
|
|
||||||
phy-handle = <&rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
allwinner,rx-delay-ps = <700>;
|
|
||||||
allwinner,tx-delay-ps = <700>;
|
|
||||||
status = "okay";
|
|
||||||
diff --git a/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
|
|
||||||
index 5dba4fc310..ecd9ff38a8 100644
|
|
||||||
--- a/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
|
|
||||||
+++ b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
|
|
||||||
@@ -160,7 +160,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_dldo4>;
|
|
||||||
phy-handle = <&rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts
|
|
||||||
index 4ba533b034..bc370d4ea1 100644
|
|
||||||
--- a/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts
|
|
||||||
+++ b/arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts
|
|
||||||
@@ -96,7 +96,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
diff --git a/arch/arm/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/dts/sun8i-h3-orangepi-plus.dts
|
|
||||||
index 97f497854e..d05fa679dc 100644
|
|
||||||
--- a/arch/arm/dts/sun8i-h3-orangepi-plus.dts
|
|
||||||
+++ b/arch/arm/dts/sun8i-h3-orangepi-plus.dts
|
|
||||||
@@ -85,7 +85,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
diff --git a/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts b/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
|
|
||||||
index 6dbf7b2e0c..b6ca45d18e 100644
|
|
||||||
--- a/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
|
|
||||||
+++ b/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
|
|
||||||
@@ -67,7 +67,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
|
|
||||||
index c488aaacbd..9c20245eef 100644
|
|
||||||
--- a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
|
|
||||||
+++ b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts
|
|
||||||
@@ -129,7 +129,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy-handle = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_dc1sw>;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
diff --git a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
|
|
||||||
index 15c22b06fc..3ab6f47cea 100644
|
|
||||||
--- a/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
|
|
||||||
+++ b/arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts
|
|
||||||
@@ -120,7 +120,7 @@
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
|
||||||
phy-handle = <&phy1>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
phy-supply = <®_dc1sw>;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
diff --git a/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
|
|
||||||
index 39263e74fb..8e5cb3b3fd 100644
|
|
||||||
--- a/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
|
|
||||||
+++ b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi
|
|
||||||
@@ -126,7 +126,7 @@
|
|
||||||
pinctrl-0 = <&emac_rgmii_pins>;
|
|
||||||
phy-supply = <®_gmac_3v3>;
|
|
||||||
phy-handle = <&ext_rgmii_phy>;
|
|
||||||
- phy-mode = "rgmii";
|
|
||||||
+ phy-mode = "rgmii-id";
|
|
||||||
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.28.0
|
|
||||||
|
|
61
10-devicetree.install
Executable file
61
10-devicetree.install
Executable file
@ -0,0 +1,61 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# set -x
|
||||||
|
|
||||||
|
if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]
|
||||||
|
then
|
||||||
|
COMMAND="$1"
|
||||||
|
KERNEL_VERSION="$2"
|
||||||
|
#BOOT_DIR_ABS="$3"
|
||||||
|
#KERNEL_IMAGE="$4"
|
||||||
|
|
||||||
|
# Setup a /boot/dtb -> /boot/dtb-$newest_kernel_version symlink so that
|
||||||
|
# u-boot can find the correct dtb to load.
|
||||||
|
#
|
||||||
|
# If invoked to 'add' a new kernel, find the newest based on `sort`ing
|
||||||
|
# the kernel versions dtb. If 'remove', then follow basically the same
|
||||||
|
# procedure but exclude the version currently being removed.
|
||||||
|
#
|
||||||
|
# The theory of operation here is that, while newer kernels may add new
|
||||||
|
# dtb nodes and fields, as upstreaming hw support for some particular
|
||||||
|
# device progresses, it should never make backward incompatible changes.
|
||||||
|
# So it should always be safe to use a newer dtb with an older kernel.
|
||||||
|
|
||||||
|
list_dtb_versions() {
|
||||||
|
excluded_version="$1"
|
||||||
|
for dtbdir in /boot/dtb-*; do
|
||||||
|
dtbver=${dtbdir#*-}
|
||||||
|
if [ "$dtbver" != "$excluded_version" ]; then
|
||||||
|
echo $dtbver
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
setup_dtb_link() {
|
||||||
|
ver=`list_dtb_versions $1 | sort -r --sort=version | head -1`
|
||||||
|
if [ -h /boot/dtb ]; then
|
||||||
|
rm -f /boot/dtb
|
||||||
|
fi
|
||||||
|
ln -s dtb-$ver /boot/dtb
|
||||||
|
}
|
||||||
|
|
||||||
|
ret=0
|
||||||
|
case "$COMMAND" in
|
||||||
|
add)
|
||||||
|
# If we're adding a kernel we want that version
|
||||||
|
if [ -h /boot/dtb ]; then
|
||||||
|
rm -f /boot/dtb
|
||||||
|
fi
|
||||||
|
ln -s dtb-$KERNEL_VERSION /boot/dtb
|
||||||
|
ret=$?
|
||||||
|
;;
|
||||||
|
remove)
|
||||||
|
setup_dtb_link $KERNEL_VERSION
|
||||||
|
ret=$?
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
exit $ret
|
||||||
|
else
|
||||||
|
# Just exit on non ARM
|
||||||
|
exit 0
|
||||||
|
fi
|
@ -1,45 +0,0 @@
|
|||||||
From 6bf15552c2b6becb48ce7732120e0ddb2078cb1a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Tue, 14 Apr 2020 09:53:07 +0100
|
|
||||||
Subject: [PATCH 9/9] initial pinetab support
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
configs/pinetab_defconfig | 26 ++++++++++++++++++++++++++
|
|
||||||
1 file changed, 26 insertions(+)
|
|
||||||
create mode 100644 configs/pinetab_defconfig
|
|
||||||
|
|
||||||
diff --git a/configs/pinetab_defconfig b/configs/pinetab_defconfig
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..5b9620f3e5
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/configs/pinetab_defconfig
|
|
||||||
@@ -0,0 +1,26 @@
|
|
||||||
+CONFIG_ARM=y
|
|
||||||
+CONFIG_ARCH_SUNXI=y
|
|
||||||
+CONFIG_SPL=y
|
|
||||||
+CONFIG_MACH_SUN50I=y
|
|
||||||
+CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
|
|
||||||
+CONFIG_DRAM_CLK=552
|
|
||||||
+CONFIG_DRAM_ZQ=3881949
|
|
||||||
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
|
|
||||||
+CONFIG_R_I2C_ENABLE=y
|
|
||||||
+CONFIG_SPL_SPI_SUNXI=y
|
|
||||||
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
|
||||||
+CONFIG_USE_PREBOOT=y
|
|
||||||
+# CONFIG_SPL_DOS_PARTITION is not set
|
|
||||||
+# CONFIG_SPL_EFI_PARTITION is not set
|
|
||||||
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pinetab"
|
|
||||||
+CONFIG_OF_LIST="sun50i-a64-pinetab"
|
|
||||||
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
||||||
+CONFIG_DM_REGULATOR=y
|
|
||||||
+CONFIG_DM_REGULATOR_FIXED=y
|
|
||||||
+CONFIG_DM_PWM=y
|
|
||||||
+CONFIG_PWM_SUNXI=y
|
|
||||||
+CONFIG_LED=y
|
|
||||||
+CONFIG_LED_GPIO=y
|
|
||||||
+CONFIG_USB_EHCI_HCD=y
|
|
||||||
+CONFIG_USB_OHCI_HCD=y
|
|
||||||
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
|
|
||||||
--
|
|
||||||
2.26.0
|
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,5 @@
|
|||||||
a64-olinuxino
|
a64-olinuxino
|
||||||
amarula_a64_relic
|
avnet_ultra96_rev1
|
||||||
bananapi_m2_plus_h5
|
|
||||||
bananapi_m64
|
bananapi_m64
|
||||||
dragonboard410c
|
dragonboard410c
|
||||||
dragonboard820c
|
dragonboard820c
|
||||||
@ -11,65 +10,32 @@ ficus-rk3399
|
|||||||
firefly-rk3399
|
firefly-rk3399
|
||||||
geekbox
|
geekbox
|
||||||
hikey
|
hikey
|
||||||
khadas-edge-captain-rk3399
|
|
||||||
khadas-edge-v-rk3399
|
|
||||||
khadas-edge-rk3399
|
|
||||||
khadas-vim
|
khadas-vim
|
||||||
khadas-vim2
|
|
||||||
khadas-vim3
|
|
||||||
khadas-vim3l
|
|
||||||
libretech-ac
|
|
||||||
libretech_all_h3_cc_h5
|
|
||||||
libretech_all_h3_it_h5
|
|
||||||
libretech_all_h5_cc_h5
|
|
||||||
libretech-cc
|
libretech-cc
|
||||||
|
libretech_all_h3_cc_h5
|
||||||
mvebu_espressobin-88f3720
|
mvebu_espressobin-88f3720
|
||||||
mvebu_mcbin-88f8040
|
mvebu_mcbin-88f8040
|
||||||
nanopc-t4-rk3399
|
|
||||||
nanopi_a64
|
|
||||||
nanopi-k2
|
nanopi-k2
|
||||||
nanopi-m4-rk3399
|
|
||||||
nanopi-m4-2gb-rk3399
|
|
||||||
nanopi_neo2
|
nanopi_neo2
|
||||||
nanopi-neo4-rk3399
|
|
||||||
nanopi_neo_plus2
|
nanopi_neo_plus2
|
||||||
odroid-c2
|
odroid-c2
|
||||||
orangepi_lite2
|
|
||||||
orangepi_one_plus
|
orangepi_one_plus
|
||||||
orangepi_pc2
|
orangepi_pc2
|
||||||
orangepi_prime
|
orangepi_prime
|
||||||
orangepi-rk3399
|
|
||||||
orangepi_win
|
orangepi_win
|
||||||
orangepi_zero_plus
|
orangepi_zero_plus
|
||||||
orangepi_zero_plus2
|
orangepi_zero_plus2
|
||||||
p212
|
p212
|
||||||
p2371-2180
|
p2371-2180
|
||||||
p2771-0000-500
|
p2771-0000-500
|
||||||
p3450-0000
|
|
||||||
pine64-lts
|
|
||||||
pine64_plus
|
|
||||||
pinebook
|
|
||||||
pinebook-pro-rk3399
|
|
||||||
pinephone
|
|
||||||
pinetab
|
|
||||||
pine_h64
|
pine_h64
|
||||||
|
pine64_plus
|
||||||
poplar
|
poplar
|
||||||
puma-rk3399
|
|
||||||
rock64-rk3328
|
|
||||||
rock960-rk3399
|
rock960-rk3399
|
||||||
rock-pi-4-rk3399
|
|
||||||
rock-pi-4c-rk3399
|
|
||||||
rock-pi-e-rk3328
|
|
||||||
rock-pi-n10-rk3399pro
|
|
||||||
rockpro64-rk3399
|
|
||||||
roc-cc-rk3328
|
|
||||||
roc-pc-rk3399
|
|
||||||
roc-pc-mezzanine-rk3399
|
|
||||||
rpi_3
|
rpi_3
|
||||||
rpi_4
|
|
||||||
rpi_arm64
|
|
||||||
sopine_baseboard
|
sopine_baseboard
|
||||||
teres_i
|
|
||||||
turris_mox
|
turris_mox
|
||||||
|
vexpress_aemv8a_dram
|
||||||
vexpress_aemv8a_juno
|
vexpress_aemv8a_juno
|
||||||
xilinx_zynqmp_virt
|
vexpress_aemv8a_semi
|
||||||
|
xilinx_zynqmp_zcu100_revC
|
||||||
|
22
arm-boards
22
arm-boards
@ -6,26 +6,24 @@ A20-Olimex-SOM-EVB
|
|||||||
A20-OLinuXino-Lime
|
A20-OLinuXino-Lime
|
||||||
A20-OLinuXino-Lime2
|
A20-OLinuXino-Lime2
|
||||||
A20-OLinuXino_MICRO
|
A20-OLinuXino_MICRO
|
||||||
|
am335x_boneblack
|
||||||
am335x_evm
|
am335x_evm
|
||||||
|
am335x_evm_usbspl
|
||||||
am57xx_evm
|
am57xx_evm
|
||||||
Ampe_A76
|
Ampe_A76
|
||||||
apalis_imx6
|
|
||||||
arndale
|
arndale
|
||||||
Auxtek-T003
|
Auxtek-T003
|
||||||
Auxtek-T004
|
Auxtek-T004
|
||||||
ba10_tv_box
|
ba10_tv_box
|
||||||
Bananapi
|
Bananapi
|
||||||
bananapi_m1_plus
|
|
||||||
bananapi_m2_berry
|
bananapi_m2_berry
|
||||||
Bananapi_m2m
|
|
||||||
bananapi_m2_plus_h3
|
|
||||||
Bananapi_M2_Ultra
|
Bananapi_M2_Ultra
|
||||||
bananapi_m2_zero
|
|
||||||
Bananapro
|
Bananapro
|
||||||
chiliboard
|
chiliboard
|
||||||
CHIP
|
CHIP
|
||||||
Chuwi_V7_CW0825
|
Chuwi_V7_CW0825
|
||||||
clearfog
|
clearfog
|
||||||
|
cl-som-am57x
|
||||||
cm_fx6
|
cm_fx6
|
||||||
Colombus
|
Colombus
|
||||||
colorfly_e708_q1
|
colorfly_e708_q1
|
||||||
@ -39,6 +37,7 @@ db-mv784mp-gp
|
|||||||
difrnce_dit4350
|
difrnce_dit4350
|
||||||
dserve_dsrv9703c
|
dserve_dsrv9703c
|
||||||
evb-rk3229
|
evb-rk3229
|
||||||
|
fennec-rk3288
|
||||||
firefly-rk3288
|
firefly-rk3288
|
||||||
helios4
|
helios4
|
||||||
Hummingbird_A31
|
Hummingbird_A31
|
||||||
@ -87,6 +86,7 @@ novena
|
|||||||
odroid
|
odroid
|
||||||
odroid-xu3
|
odroid-xu3
|
||||||
omap3_beagle
|
omap3_beagle
|
||||||
|
omap3_pandora
|
||||||
omap4_panda
|
omap4_panda
|
||||||
omap5_uevm
|
omap5_uevm
|
||||||
Orangepi
|
Orangepi
|
||||||
@ -102,7 +102,6 @@ orangepi_r1
|
|||||||
orangepi_zero
|
orangepi_zero
|
||||||
origen
|
origen
|
||||||
paz00
|
paz00
|
||||||
pinecube
|
|
||||||
polaroid_mid2809pxe04
|
polaroid_mid2809pxe04
|
||||||
pov_protab2_ips9
|
pov_protab2_ips9
|
||||||
q8_a13_tablet
|
q8_a13_tablet
|
||||||
@ -113,21 +112,20 @@ qemu_arm
|
|||||||
r7-tv-dongle
|
r7-tv-dongle
|
||||||
riotboard
|
riotboard
|
||||||
rock
|
rock
|
||||||
rock-pi-n8-rk3288
|
|
||||||
rock2
|
rock2
|
||||||
rpi_2
|
rpi_2
|
||||||
rpi_3_32b
|
rpi_3_32b
|
||||||
rpi_4_32b
|
|
||||||
Sinlinx_SinA31s
|
Sinlinx_SinA31s
|
||||||
Sinovoip_BPI_M2
|
Sinovoip_BPI_M2
|
||||||
|
Sinovoip_BPI_M2_Plus
|
||||||
Sinovoip_BPI_M3
|
Sinovoip_BPI_M3
|
||||||
|
smdkv310
|
||||||
stih410-b2260
|
stih410-b2260
|
||||||
stm32mp15_basic
|
|
||||||
sunxi_Gemei_G9
|
sunxi_Gemei_G9
|
||||||
tbs_a711
|
tbs_a711
|
||||||
tinker-rk3288
|
tinker-rk3288
|
||||||
tinker-s-rk3288
|
|
||||||
trimslice
|
trimslice
|
||||||
|
turris_omnia
|
||||||
udoo
|
udoo
|
||||||
udoo_neo
|
udoo_neo
|
||||||
usbarmory
|
usbarmory
|
||||||
@ -140,4 +138,6 @@ warp7
|
|||||||
Wexler_TAB7200
|
Wexler_TAB7200
|
||||||
Wits_Pro_A20_DKT
|
Wits_Pro_A20_DKT
|
||||||
Yones_Toptech_BS1078_V2
|
Yones_Toptech_BS1078_V2
|
||||||
xilinx_zynq_virt
|
zynq_microzed
|
||||||
|
zynq_zed
|
||||||
|
zynq_zybo
|
||||||
|
@ -1,135 +0,0 @@
|
|||||||
From 5cb3ca7ebd46c1983d0929b5ba027a03c1f5e51e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Wed, 16 Dec 2020 15:22:34 +0000
|
|
||||||
Subject: [PATCH 1/2] arm: dts: rockchip: rk3399: enable rng at the SoC level
|
|
||||||
|
|
||||||
The rng is embedded in the SoC so enable it in the device tree
|
|
||||||
universally, the use of it can be controlled by enabling/disabling
|
|
||||||
at the device config level.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
arch/arm/dts/rk3399-evb-u-boot.dtsi | 4 ----
|
|
||||||
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ----
|
|
||||||
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 ----
|
|
||||||
arch/arm/dts/rk3399-u-boot.dtsi | 2 +-
|
|
||||||
4 files changed, 1 insertion(+), 13 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
|
|
||||||
index 8056dc843e..398b205ec2 100644
|
|
||||||
--- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
|
|
||||||
+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
|
|
||||||
@@ -13,10 +13,6 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
-&rng {
|
|
||||||
- status = "okay";
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
&i2c0 {
|
|
||||||
u-boot,dm-pre-reloc;
|
|
||||||
};
|
|
||||||
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
||||||
index ded7db0aef..c3e866a779 100644
|
|
||||||
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
||||||
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
|
||||||
@@ -28,10 +28,6 @@
|
|
||||||
u-boot,dm-pre-reloc;
|
|
||||||
};
|
|
||||||
|
|
||||||
-&rng {
|
|
||||||
- status = "okay";
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
&sdhci {
|
|
||||||
max-frequency = <25000000>;
|
|
||||||
u-boot,dm-pre-reloc;
|
|
||||||
diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
||||||
index 6317b47e41..37dff04adf 100644
|
|
||||||
--- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
||||||
+++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
|
|
||||||
@@ -15,10 +15,6 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
-&rng {
|
|
||||||
- status = "okay";
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
&spi1 {
|
|
||||||
spi_flash: flash@0 {
|
|
||||||
u-boot,dm-pre-reloc;
|
|
||||||
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
|
|
||||||
index ecd230c720..73922c328a 100644
|
|
||||||
--- a/arch/arm/dts/rk3399-u-boot.dtsi
|
|
||||||
+++ b/arch/arm/dts/rk3399-u-boot.dtsi
|
|
||||||
@@ -32,7 +32,7 @@
|
|
||||||
rng: rng@ff8b8000 {
|
|
||||||
compatible = "rockchip,cryptov1-rng";
|
|
||||||
reg = <0x0 0xff8b8000 0x0 0x1000>;
|
|
||||||
- status = "disabled";
|
|
||||||
+ status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
dmc: dmc {
|
|
||||||
--
|
|
||||||
2.29.2
|
|
||||||
|
|
||||||
From 62093137fcbe760d009cf2757feda7ccf328fbb7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Wed, 16 Dec 2020 15:37:21 +0000
|
|
||||||
Subject: [PATCH 2/2] configs: rk3399: enable rng on firefly/rock960/rockpro64
|
|
||||||
|
|
||||||
Enable the RNG on the Firefly, rock960 and RockPro64 devices
|
|
||||||
to enable KASLR on devices that support it.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
configs/firefly-rk3399_defconfig | 2 ++
|
|
||||||
configs/rock960-rk3399_defconfig | 2 ++
|
|
||||||
configs/rockpro64-rk3399_defconfig | 2 ++
|
|
||||||
3 files changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
|
|
||||||
index c453b82dc5..cfbaae40aa 100644
|
|
||||||
--- a/configs/firefly-rk3399_defconfig
|
|
||||||
+++ b/configs/firefly-rk3399_defconfig
|
|
||||||
@@ -35,6 +35,8 @@ CONFIG_MMC_DW=y
|
|
||||||
CONFIG_MMC_DW_ROCKCHIP=y
|
|
||||||
CONFIG_MMC_SDHCI=y
|
|
||||||
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
||||||
+CONFIG_DM_RNG=y
|
|
||||||
+CONFIG_RNG_ROCKCHIP=y
|
|
||||||
CONFIG_SF_DEFAULT_SPEED=20000000
|
|
||||||
CONFIG_DM_ETH=y
|
|
||||||
CONFIG_ETH_DESIGNWARE=y
|
|
||||||
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
|
||||||
index 65dce3cd73..aadbc55f57 100644
|
|
||||||
--- a/configs/rock960-rk3399_defconfig
|
|
||||||
+++ b/configs/rock960-rk3399_defconfig
|
|
||||||
@@ -39,6 +39,8 @@ CONFIG_MMC_DW_ROCKCHIP=y
|
|
||||||
CONFIG_MMC_SDHCI=y
|
|
||||||
CONFIG_MMC_SDHCI_SDMA=y
|
|
||||||
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
||||||
+CONFIG_DM_RNG=y
|
|
||||||
+CONFIG_RNG_ROCKCHIP=y
|
|
||||||
CONFIG_DM_ETH=y
|
|
||||||
CONFIG_NVME=y
|
|
||||||
CONFIG_PCI=y
|
|
||||||
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
|
||||||
index 575b7a20d5..f78dfcc8f7 100644
|
|
||||||
--- a/configs/rockpro64-rk3399_defconfig
|
|
||||||
+++ b/configs/rockpro64-rk3399_defconfig
|
|
||||||
@@ -42,6 +42,8 @@ CONFIG_MMC_DW=y
|
|
||||||
CONFIG_MMC_DW_ROCKCHIP=y
|
|
||||||
CONFIG_MMC_SDHCI=y
|
|
||||||
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
||||||
+CONFIG_DM_RNG=y
|
|
||||||
+CONFIG_RNG_ROCKCHIP=y
|
|
||||||
CONFIG_SF_DEFAULT_BUS=1
|
|
||||||
CONFIG_SPI_FLASH_GIGADEVICE=y
|
|
||||||
CONFIG_DM_ETH=y
|
|
||||||
--
|
|
||||||
2.29.2
|
|
||||||
|
|
@ -1,17 +1,17 @@
|
|||||||
From 8b0274a733cd1ce39ad9ad18e1bd8efdd02a40b7 Mon Sep 17 00:00:00 2001
|
From fbd0bffb20ca5edd21bbeb7cc20e24d091ab4280 Mon Sep 17 00:00:00 2001
|
||||||
From: Rob Clark <robdclark@gmail.com>
|
From: Rob Clark <robdclark@gmail.com>
|
||||||
Date: Wed, 21 Jun 2017 14:21:15 -0400
|
Date: Wed, 21 Jun 2017 14:21:15 -0400
|
||||||
Subject: [PATCH 1/3] WIP: fix usb
|
Subject: [PATCH 1/4] WIP: fix usb
|
||||||
|
|
||||||
---
|
---
|
||||||
common/usb_storage.c | 4 ++--
|
common/usb_storage.c | 4 ++--
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/common/usb_storage.c b/common/usb_storage.c
|
diff --git a/common/usb_storage.c b/common/usb_storage.c
|
||||||
index d92ebb6eb19..9df3c3daaf4 100644
|
index a91b1c0d2f..caea87a09f 100644
|
||||||
--- a/common/usb_storage.c
|
--- a/common/usb_storage.c
|
||||||
+++ b/common/usb_storage.c
|
+++ b/common/usb_storage.c
|
||||||
@@ -1016,7 +1016,7 @@ static int usb_request_sense(struct scsi_cmd *srb, struct us_data *ss)
|
@@ -1018,7 +1018,7 @@ static int usb_request_sense(struct scsi_cmd *srb, struct us_data *ss)
|
||||||
|
|
||||||
static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
|
static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
|
||||||
{
|
{
|
||||||
@ -20,7 +20,7 @@ index d92ebb6eb19..9df3c3daaf4 100644
|
|||||||
|
|
||||||
do {
|
do {
|
||||||
memset(&srb->cmd[0], 0, 12);
|
memset(&srb->cmd[0], 0, 12);
|
||||||
@@ -1039,7 +1039,7 @@ static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
|
@@ -1041,7 +1041,7 @@ static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
|
||||||
if ((srb->sense_buf[2] == 0x02) &&
|
if ((srb->sense_buf[2] == 0x02) &&
|
||||||
(srb->sense_buf[12] == 0x3a))
|
(srb->sense_buf[12] == 0x3a))
|
||||||
return -1;
|
return -1;
|
||||||
@ -30,12 +30,12 @@ index d92ebb6eb19..9df3c3daaf4 100644
|
|||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
--
|
--
|
||||||
2.19.1
|
2.14.3
|
||||||
|
|
||||||
From 7bf41d74ca9d58bc2243b7688f8987c1d373ea56 Mon Sep 17 00:00:00 2001
|
From d1b25b8d6461c5278228d657de9c24e0979e4b9d Mon Sep 17 00:00:00 2001
|
||||||
From: Rob Clark <robdclark@gmail.com>
|
From: Rob Clark <robdclark@gmail.com>
|
||||||
Date: Mon, 3 Jul 2017 08:34:37 -0400
|
Date: Mon, 3 Jul 2017 08:34:37 -0400
|
||||||
Subject: [PATCH 2/3] HACK: disable emmc
|
Subject: [PATCH 2/4] HACK: disable emmc
|
||||||
|
|
||||||
Hitting some timeout which makes boot take much longer. And
|
Hitting some timeout which makes boot take much longer. And
|
||||||
uefi/boot/rootfs partitions will be on sd-card or usb disk, etc,
|
uefi/boot/rootfs partitions will be on sd-card or usb disk, etc,
|
||||||
@ -45,18 +45,18 @@ so we can just ignore emmc.
|
|||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts
|
diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts
|
||||||
index fa348bc621e..bfe7f15d5ed 100644
|
index 5ccfe7f8c8..9e2d3f5d9b 100644
|
||||||
--- a/arch/arm/dts/dragonboard410c.dts
|
--- a/arch/arm/dts/dragonboard410c.dts
|
||||||
+++ b/arch/arm/dts/dragonboard410c.dts
|
+++ b/arch/arm/dts/dragonboard410c.dts
|
||||||
@@ -106,6 +106,7 @@
|
@@ -67,6 +67,7 @@
|
||||||
#phy-cells = <0>;
|
reg = <0x78d9000 0x400>;
|
||||||
};
|
};
|
||||||
|
|
||||||
+/*
|
+/*
|
||||||
sdhci@07824000 {
|
sdhci@07824000 {
|
||||||
compatible = "qcom,sdhci-msm-v4";
|
compatible = "qcom,sdhci-msm-v4";
|
||||||
reg = <0x7824900 0x11c 0x7824000 0x800>;
|
reg = <0x7824900 0x11c 0x7824000 0x800>;
|
||||||
@@ -115,6 +116,7 @@
|
@@ -76,6 +77,7 @@
|
||||||
clock = <&clkc 0>;
|
clock = <&clkc 0>;
|
||||||
clock-frequency = <100000000>;
|
clock-frequency = <100000000>;
|
||||||
};
|
};
|
||||||
@ -65,23 +65,22 @@ index fa348bc621e..bfe7f15d5ed 100644
|
|||||||
sdhci@07864000 {
|
sdhci@07864000 {
|
||||||
compatible = "qcom,sdhci-msm-v4";
|
compatible = "qcom,sdhci-msm-v4";
|
||||||
--
|
--
|
||||||
2.19.1
|
2.14.3
|
||||||
|
From 6baac1d73a20f880cb91f3bc03fe4f9cf88c61f6 Mon Sep 17 00:00:00 2001
|
||||||
From 871fe802cf3ab593b9332c4f36ab2b3f179d51ae Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
Date: Tue, 4 Sep 2018 12:21:59 +0100
|
Date: Tue, 4 Sep 2018 12:21:59 +0100
|
||||||
Subject: [PATCH 3/3] add options for dm410c config
|
Subject: [PATCH] add options for dm410c config
|
||||||
|
|
||||||
---
|
---
|
||||||
configs/dragonboard410c_defconfig | 10 ++++++++++
|
configs/dragonboard410c_defconfig | 10 ++++++++++
|
||||||
1 file changed, 10 insertions(+)
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
|
diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
|
||||||
index a55abaf8df5..4ece0cafbe4 100644
|
index 96a831443a..d167c765b1 100644
|
||||||
--- a/configs/dragonboard410c_defconfig
|
--- a/configs/dragonboard410c_defconfig
|
||||||
+++ b/configs/dragonboard410c_defconfig
|
+++ b/configs/dragonboard410c_defconfig
|
||||||
@@ -7,6 +7,8 @@ CONFIG_NR_DRAM_BANKS=1
|
@@ -6,6 +6,8 @@ CONFIG_DISTRO_DEFAULTS=y
|
||||||
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
CONFIG_NR_DRAM_BANKS=1
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
CONFIG_OF_BOARD_SETUP=y
|
CONFIG_OF_BOARD_SETUP=y
|
||||||
+CONFIG_FAT_WRITE=y
|
+CONFIG_FAT_WRITE=y
|
||||||
@ -89,7 +88,7 @@ index a55abaf8df5..4ece0cafbe4 100644
|
|||||||
CONFIG_MISC_INIT_R=y
|
CONFIG_MISC_INIT_R=y
|
||||||
# CONFIG_DISPLAY_CPUINFO is not set
|
# CONFIG_DISPLAY_CPUINFO is not set
|
||||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||||
@@ -41,6 +43,13 @@ CONFIG_DM_PMIC=y
|
@@ -35,6 +37,13 @@ CONFIG_DM_PMIC=y
|
||||||
CONFIG_PMIC_PM8916=y
|
CONFIG_PMIC_PM8916=y
|
||||||
CONFIG_MSM_SERIAL=y
|
CONFIG_MSM_SERIAL=y
|
||||||
CONFIG_SPMI_MSM=y
|
CONFIG_SPMI_MSM=y
|
||||||
@ -103,7 +102,7 @@ index a55abaf8df5..4ece0cafbe4 100644
|
|||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_DM_USB=y
|
CONFIG_DM_USB=y
|
||||||
CONFIG_USB_EHCI_HCD=y
|
CONFIG_USB_EHCI_HCD=y
|
||||||
@@ -57,5 +66,6 @@ CONFIG_USB_HOST_ETHER=y
|
@@ -46,5 +55,6 @@ CONFIG_USB_HOST_ETHER=y
|
||||||
CONFIG_USB_ETHER_ASIX=y
|
CONFIG_USB_ETHER_ASIX=y
|
||||||
CONFIG_USB_ETHER_ASIX88179=y
|
CONFIG_USB_ETHER_ASIX88179=y
|
||||||
CONFIG_USB_ETHER_MCS7830=y
|
CONFIG_USB_ETHER_MCS7830=y
|
||||||
@ -111,5 +110,5 @@ index a55abaf8df5..4ece0cafbe4 100644
|
|||||||
CONFIG_USB_ETHER_SMSC95XX=y
|
CONFIG_USB_ETHER_SMSC95XX=y
|
||||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||||
--
|
--
|
||||||
2.19.1
|
2.19.0.rc0
|
||||||
|
|
||||||
|
111
mvebu-enable-generic-distro-boot-config.patch
Normal file
111
mvebu-enable-generic-distro-boot-config.patch
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
From 8de891d0767aafb383b6f533b08a5c0b75b4718b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Mon, 18 Sep 2017 15:48:32 +0100
|
||||||
|
Subject: [PATCH] arm: mvebu: enable generic distro boot config
|
||||||
|
|
||||||
|
Switch all of the mvebu boards to support disto generic booting
|
||||||
|
This will enable Fedora, Debian and other distros to support
|
||||||
|
mvebu systems easier. Tested on SolidRun ClearFog
|
||||||
|
|
||||||
|
Signed-off-by: Dennis Gilmore <dgilmore@redhat.com>
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
include/configs/mv-common.h | 84 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 84 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
|
||||||
|
index 7c2bab2fc6..2819493fca 100644
|
||||||
|
--- a/include/configs/mv-common.h
|
||||||
|
+++ b/include/configs/mv-common.h
|
||||||
|
@@ -130,4 +130,88 @@
|
||||||
|
#define CONFIG_MTD_PARTITIONS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifndef CONFIG_SPL_BUILD
|
||||||
|
+#include <config_distro_defaults.h>
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc.
|
||||||
|
+* 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
|
||||||
|
+* 1M script, 1M pxe and the ramdisk at the end.
|
||||||
|
+*/
|
||||||
|
+#define SDRAM_OFFSET(x) 0x0##x
|
||||||
|
+
|
||||||
|
+#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(2000000))
|
||||||
|
+#define FDT_ADDR_R __stringify(SDRAM_OFFSET(3000000))
|
||||||
|
+#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3100000))
|
||||||
|
+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000))
|
||||||
|
+#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3300000))
|
||||||
|
+
|
||||||
|
+#define MEM_LAYOUT_ENV_SETTINGS \
|
||||||
|
+ "bootm_size=0xa000000\0" \
|
||||||
|
+ "kernel_addr_r=" KERNEL_ADDR_R "\0" \
|
||||||
|
+ "fdt_addr_r=" FDT_ADDR_R "\0" \
|
||||||
|
+ "scriptaddr=" SCRIPT_ADDR_R "\0" \
|
||||||
|
+ "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \
|
||||||
|
+ "ramdisk_addr_r=" RAMDISK_ADDR_R "\0"
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_MMC
|
||||||
|
+#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
|
||||||
|
+#else
|
||||||
|
+#define BOOT_TARGET_DEVICES_MMC(func)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_CMD_SATA
|
||||||
|
+#define BOOT_TARGET_DEVICES_SATA(func) func(SATA, sata, 0) func(SATA, sata, 1)
|
||||||
|
+#define CONFIG_PREBOOT "sata init"
|
||||||
|
+#else
|
||||||
|
+#define BOOT_TARGET_DEVICES_SATA(func)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_USB_STORAGE
|
||||||
|
+#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
|
||||||
|
+#else
|
||||||
|
+#define BOOT_TARGET_DEVICES_USB(func)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#define BOOT_TARGET_DEVICES(func) \
|
||||||
|
+ BOOT_TARGET_DEVICES_MMC(func) \
|
||||||
|
+ BOOT_TARGET_DEVICES_SATA(func) \
|
||||||
|
+ BOOT_TARGET_DEVICES_USB(func) \
|
||||||
|
+ func(PXE, pxe, na)
|
||||||
|
+
|
||||||
|
+#include <config_distro_bootcmd.h>
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_USB_KEYBOARD
|
||||||
|
+#define CONSOLE_STDIN_SETTINGS \
|
||||||
|
+ "preboot=usb start\0" \
|
||||||
|
+ "stdin=serial,usbkbd\0"
|
||||||
|
+#else
|
||||||
|
+#define CONSOLE_STDIN_SETTINGS \
|
||||||
|
+ "stdin=serial\0"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_VIDEO
|
||||||
|
+#define CONSOLE_STDOUT_SETTINGS \
|
||||||
|
+ "stdout=serial,vga\0" \
|
||||||
|
+ "stderr=serial,vga\0"
|
||||||
|
+#else
|
||||||
|
+#define CONSOLE_STDOUT_SETTINGS \
|
||||||
|
+ "stdout=serial\0" \
|
||||||
|
+ "stderr=serial\0"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#define CONSOLE_ENV_SETTINGS \
|
||||||
|
+ CONSOLE_STDIN_SETTINGS \
|
||||||
|
+ CONSOLE_STDOUT_SETTINGS
|
||||||
|
+
|
||||||
|
+#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
|
+ CONSOLE_ENV_SETTINGS \
|
||||||
|
+ MEM_LAYOUT_ENV_SETTINGS \
|
||||||
|
+ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
|
||||||
|
+ "console=ttyS0,115200\0" \
|
||||||
|
+ BOOTENV
|
||||||
|
+#else /* ifndef CONFIG_SPL_BUILD */
|
||||||
|
+#define CONFIG_EXTRA_ENV_SETTINGS
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#endif /* _MV_COMMON_H */
|
||||||
|
--
|
||||||
|
2.13.5
|
||||||
|
|
154
mx6-utilite-distro-boot.patch
Normal file
154
mx6-utilite-distro-boot.patch
Normal file
@ -0,0 +1,154 @@
|
|||||||
|
From af017eb82317dc88c1b23301d76466b389c2e007 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Tue, 13 Sep 2016 08:47:34 +0100
|
||||||
|
Subject: [PATCH] port utilite to distro generic boot commands
|
||||||
|
|
||||||
|
---
|
||||||
|
include/configs/cm_fx6.h | 115 ++++++++++++-----------------------------------
|
||||||
|
1 file changed, 29 insertions(+), 86 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
|
||||||
|
index c839b03..4dd501e 100644
|
||||||
|
--- a/include/configs/cm_fx6.h
|
||||||
|
+++ b/include/configs/cm_fx6.h
|
||||||
|
@@ -11,6 +11,7 @@
|
||||||
|
#ifndef __CONFIG_CM_FX6_H
|
||||||
|
#define __CONFIG_CM_FX6_H
|
||||||
|
|
||||||
|
+#include <config_distro_defaults.h>
|
||||||
|
#include "mx6_common.h"
|
||||||
|
|
||||||
|
/* Machine config */
|
||||||
|
@@ -78,101 +79,43 @@
|
||||||
|
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||||
|
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||||
|
|
||||||
|
+#ifndef CONFIG_SPL_BUILD
|
||||||
|
+#include <config_distro_defaults.h>
|
||||||
|
+#include <config_distro_bootcmd.h>
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_AHCI
|
||||||
|
+#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
|
||||||
|
+#else
|
||||||
|
+#define BOOT_TARGET_DEVICES_SCSI(func)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#define BOOT_TARGET_DEVICES(func) \
|
||||||
|
+ func(MMC, mmc, 2) \
|
||||||
|
+ BOOT_TARGET_DEVICES_SCSI(func) \
|
||||||
|
+ func(PXE, pxe, na) \
|
||||||
|
+ func(DHCP, dhcp, na)
|
||||||
|
+
|
||||||
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
|
"stdin=serial,usbkbd\0" \
|
||||||
|
"stdout=serial,vga\0" \
|
||||||
|
"stderr=serial,vga\0" \
|
||||||
|
"panel=HDMI\0" \
|
||||||
|
- "autoload=no\0" \
|
||||||
|
- "uImage=uImage-cm-fx6\0" \
|
||||||
|
- "zImage=zImage-cm-fx6\0" \
|
||||||
|
- "kernel=uImage-cm-fx6\0" \
|
||||||
|
- "script=boot.scr\0" \
|
||||||
|
- "dtb=cm-fx6.dtb\0" \
|
||||||
|
- "bootm_low=18000000\0" \
|
||||||
|
+ "dtb=imx6q-utilite-pro.dts\0" \
|
||||||
|
"loadaddr=0x10800000\0" \
|
||||||
|
"fdtaddr=0x11000000\0" \
|
||||||
|
+ "fdt_addr_r=0x18000000\0" \
|
||||||
|
+ "pxefile_addr_r=0x17f00000\0" \
|
||||||
|
+ "scriptaddr=0x17e00000\0" \
|
||||||
|
+ "kernel_addr_r=0x11000000\0" \
|
||||||
|
+ "ramdisk_addr_r=0x18100000\0" \
|
||||||
|
+ "bootm_size=0x20000000\0" \
|
||||||
|
"console=ttymxc3,115200\0" \
|
||||||
|
"ethprime=FEC0\0" \
|
||||||
|
- "video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32@50,if=RGB32\0" \
|
||||||
|
- "video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
|
||||||
|
- "doboot=bootm ${loadaddr}\0" \
|
||||||
|
- "doloadfdt=false\0" \
|
||||||
|
- "mtdids=" MTDIDS_DEFAULT "\0" \
|
||||||
|
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
|
||||||
|
- "setboottypez=setenv kernel ${zImage};" \
|
||||||
|
- "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
|
||||||
|
- "setenv doloadfdt true;\0" \
|
||||||
|
- "setboottypem=setenv kernel ${uImage};" \
|
||||||
|
- "setenv doboot bootm ${loadaddr};" \
|
||||||
|
- "setenv doloadfdt false;\0"\
|
||||||
|
- "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
|
||||||
|
- "sataroot=/dev/sda2 rw rootwait\0" \
|
||||||
|
- "nandroot=/dev/mtdblock4 rw\0" \
|
||||||
|
- "nandrootfstype=ubifs\0" \
|
||||||
|
- "mmcargs=setenv bootargs console=${console} root=${mmcroot} " \
|
||||||
|
- "${video} ${extrabootargs}\0" \
|
||||||
|
- "sataargs=setenv bootargs console=${console} root=${sataroot} " \
|
||||||
|
- "${video} ${extrabootargs}\0" \
|
||||||
|
- "nandargs=setenv bootargs console=${console} " \
|
||||||
|
- "root=${nandroot} " \
|
||||||
|
- "rootfstype=${nandrootfstype} " \
|
||||||
|
- "${video} ${extrabootargs}\0" \
|
||||||
|
- "nandboot=if run nandloadkernel; then " \
|
||||||
|
- "run nandloadfdt;" \
|
||||||
|
- "run setboottypem;" \
|
||||||
|
- "run storagebootcmd;" \
|
||||||
|
- "run setboottypez;" \
|
||||||
|
- "run storagebootcmd;" \
|
||||||
|
- "fi;\0" \
|
||||||
|
- "run_eboot=echo Starting EBOOT ...; "\
|
||||||
|
- "mmc dev 2 && " \
|
||||||
|
- "mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \
|
||||||
|
- "loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0"\
|
||||||
|
- "loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0"\
|
||||||
|
- "loadfdt=load ${storagetype} ${storagedev} ${fdtaddr} ${dtb};\0" \
|
||||||
|
- "bootscript=echo Running bootscript from ${storagetype} ...;" \
|
||||||
|
- "source ${loadaddr};\0" \
|
||||||
|
- "nandloadkernel=nand read ${loadaddr} 0 780000;\0" \
|
||||||
|
- "nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \
|
||||||
|
- "setupmmcboot=setenv storagetype mmc; setenv storagedev 2;\0" \
|
||||||
|
- "setupsataboot=setenv storagetype sata; setenv storagedev 0;\0" \
|
||||||
|
- "setupnandboot=setenv storagetype nand;\0" \
|
||||||
|
- "setupusbboot=setenv storagetype usb; setenv storagedev 0;\0" \
|
||||||
|
- "storagebootcmd=echo Booting from ${storagetype} ...;" \
|
||||||
|
- "run ${storagetype}args; run doboot;\0" \
|
||||||
|
- "trybootk=if run loadkernel; then " \
|
||||||
|
- "if ${doloadfdt}; then " \
|
||||||
|
- "run loadfdt;" \
|
||||||
|
- "fi;" \
|
||||||
|
- "run storagebootcmd;" \
|
||||||
|
- "fi;\0" \
|
||||||
|
- "trybootsmz=if run loadscript; then " \
|
||||||
|
- "run bootscript;" \
|
||||||
|
- "fi;" \
|
||||||
|
- "run setboottypem;" \
|
||||||
|
- "run trybootk;" \
|
||||||
|
- "run setboottypez;" \
|
||||||
|
- "run trybootk;\0"
|
||||||
|
-
|
||||||
|
-#define CONFIG_BOOTCOMMAND \
|
||||||
|
- "run setupmmcboot;" \
|
||||||
|
- "mmc dev ${storagedev};" \
|
||||||
|
- "if mmc rescan; then " \
|
||||||
|
- "run trybootsmz;" \
|
||||||
|
- "fi;" \
|
||||||
|
- "run setupusbboot;" \
|
||||||
|
- "if usb start; then "\
|
||||||
|
- "if run loadscript; then " \
|
||||||
|
- "run bootscript;" \
|
||||||
|
- "fi;" \
|
||||||
|
- "fi;" \
|
||||||
|
- "run setupsataboot;" \
|
||||||
|
- "if sata init; then " \
|
||||||
|
- "run trybootsmz;" \
|
||||||
|
- "fi;" \
|
||||||
|
- "run setupnandboot;" \
|
||||||
|
- "run nandboot;"
|
||||||
|
+ BOOTENV
|
||||||
|
+
|
||||||
|
+#else /* ifndef CONFIG_SPL_BUILD */
|
||||||
|
+#define CONFIG_EXTRA_ENV_SETTINGS
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#define CONFIG_PREBOOT "usb start;sf probe"
|
||||||
|
|
||||||
|
--
|
||||||
|
2.9.3
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
2975
rk3399-Rock960-Ficus-board-support.patch
Normal file
2975
rk3399-Rock960-Ficus-board-support.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,450 +0,0 @@
|
|||||||
From patchwork Tue Dec 15 09:49:23 2020
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
X-Patchwork-Submitter: mbrugger <matthias.bgg@kernel.org>
|
|
||||||
X-Patchwork-Id: 1416366
|
|
||||||
X-Patchwork-Delegate: matthias.bgg@gmail.com
|
|
||||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
|
||||||
X-Original-To: incoming@patchwork.ozlabs.org
|
|
||||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
|
||||||
Authentication-Results: ozlabs.org;
|
|
||||||
spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
|
|
||||||
(client-ip=85.214.62.61; helo=phobos.denx.de;
|
|
||||||
envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)
|
|
||||||
Authentication-Results: ozlabs.org;
|
|
||||||
dmarc=fail (p=none dis=none) header.from=kernel.org
|
|
||||||
Received: from phobos.denx.de (phobos.denx.de [85.214.62.61])
|
|
||||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
|
||||||
key-exchange X25519 server-signature RSA-PSS (4096 bits))
|
|
||||||
(No client certificate requested)
|
|
||||||
by ozlabs.org (Postfix) with ESMTPS id 4CwD58649Dz9s0b
|
|
||||||
for <incoming@patchwork.ozlabs.org>; Tue, 15 Dec 2020 20:49:53 +1100 (AEDT)
|
|
||||||
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
|
|
||||||
by phobos.denx.de (Postfix) with ESMTP id 4EC6082956;
|
|
||||||
Tue, 15 Dec 2020 10:49:42 +0100 (CET)
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
dmarc=fail (p=none dis=none) header.from=kernel.org
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
|
||||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
|
||||||
id B1A738295E; Tue, 15 Dec 2020 10:49:40 +0100 (CET)
|
|
||||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
|
||||||
X-Spam-Level:
|
|
||||||
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI,
|
|
||||||
SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2
|
|
||||||
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
|
|
||||||
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
|
|
||||||
(No client certificate requested)
|
|
||||||
by phobos.denx.de (Postfix) with ESMTPS id 38FB382955
|
|
||||||
for <u-boot@lists.denx.de>; Tue, 15 Dec 2020 10:49:37 +0100 (CET)
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
dmarc=pass (p=none dis=none) header.from=kernel.org
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
spf=pass smtp.mailfrom=matthias.bgg@kernel.org
|
|
||||||
From: matthias.bgg@kernel.org
|
|
||||||
Authentication-Results: mail.kernel.org;
|
|
||||||
dkim=permerror (bad message/signature format)
|
|
||||||
To: sughosh.ganu@linaro.org,
|
|
||||||
xypron.glpk@gmx.de
|
|
||||||
Cc: u-boot@lists.denx.de,
|
|
||||||
Matthias Brugger <mbrugger@suse.com>
|
|
||||||
Subject: [PATCH v2 1/2] rng: Add iProc RNG200 driver
|
|
||||||
Date: Tue, 15 Dec 2020 10:49:23 +0100
|
|
||||||
Message-Id: <20201215094924.30072-1-matthias.bgg@kernel.org>
|
|
||||||
X-Mailer: git-send-email 2.29.2
|
|
||||||
MIME-Version: 1.0
|
|
||||||
X-BeenThere: u-boot@lists.denx.de
|
|
||||||
X-Mailman-Version: 2.1.34
|
|
||||||
Precedence: list
|
|
||||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
|
||||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
|
||||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
|
||||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
|
||||||
List-Post: <mailto:u-boot@lists.denx.de>
|
|
||||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
|
||||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
|
||||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
|
||||||
Errors-To: u-boot-bounces@lists.denx.de
|
|
||||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
|
||||||
X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de
|
|
||||||
X-Virus-Status: Clean
|
|
||||||
|
|
||||||
From: Matthias Brugger <mbrugger@suse.com>
|
|
||||||
|
|
||||||
Add support for random number generator RNG200.
|
|
||||||
This is for example found on RPi4.
|
|
||||||
|
|
||||||
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
|
|
||||||
Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
|
||||||
---
|
|
||||||
|
|
||||||
Changes in v2: None
|
|
||||||
|
|
||||||
drivers/rng/Kconfig | 6 ++
|
|
||||||
drivers/rng/Makefile | 1 +
|
|
||||||
drivers/rng/iproc_rng200.c | 186 +++++++++++++++++++++++++++++++++++++
|
|
||||||
3 files changed, 193 insertions(+)
|
|
||||||
create mode 100644 drivers/rng/iproc_rng200.c
|
|
||||||
|
|
||||||
diff --git a/drivers/rng/Kconfig b/drivers/rng/Kconfig
|
|
||||||
index 11001c8ae7..94915d45b3 100644
|
|
||||||
--- a/drivers/rng/Kconfig
|
|
||||||
+++ b/drivers/rng/Kconfig
|
|
||||||
@@ -46,4 +46,10 @@ config RNG_ROCKCHIP
|
|
||||||
Enable random number generator for rockchip.This driver is
|
|
||||||
support rng module of crypto v1 and crypto v2.
|
|
||||||
|
|
||||||
+config RNG_IPROC200
|
|
||||||
+ bool "Broadcom iProc RNG200 random number generator"
|
|
||||||
+ depends on DM_RNG
|
|
||||||
+ default n
|
|
||||||
+ help
|
|
||||||
+ Enable random number generator for RPI4.
|
|
||||||
endif
|
|
||||||
diff --git a/drivers/rng/Makefile b/drivers/rng/Makefile
|
|
||||||
index 8953406882..39f7ee3f03 100644
|
|
||||||
--- a/drivers/rng/Makefile
|
|
||||||
+++ b/drivers/rng/Makefile
|
|
||||||
@@ -9,3 +9,4 @@ obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o
|
|
||||||
obj-$(CONFIG_RNG_MSM) += msm_rng.o
|
|
||||||
obj-$(CONFIG_RNG_STM32MP1) += stm32mp1_rng.o
|
|
||||||
obj-$(CONFIG_RNG_ROCKCHIP) += rockchip_rng.o
|
|
||||||
+obj-$(CONFIG_RNG_IPROC200) += iproc_rng200.o
|
|
||||||
diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..1063f43953
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/rng/iproc_rng200.c
|
|
||||||
@@ -0,0 +1,186 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
+/*
|
|
||||||
+ * Copyright 2020, Matthias Brugger <mbrugger@suse.com>
|
|
||||||
+ *
|
|
||||||
+ * Driver for Raspberry Pi hardware random number generator
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <common.h>
|
|
||||||
+#include <dm.h>
|
|
||||||
+#include <linux/delay.h>
|
|
||||||
+#include <rng.h>
|
|
||||||
+#include <asm/io.h>
|
|
||||||
+
|
|
||||||
+#define usleep_range(a, b) udelay((b))
|
|
||||||
+
|
|
||||||
+#define RNG_CTRL_OFFSET 0x00
|
|
||||||
+#define RNG_CTRL_RNG_RBGEN_MASK 0x00001FFF
|
|
||||||
+#define RNG_CTRL_RNG_RBGEN_ENABLE 0x00000001
|
|
||||||
+#define RNG_CTRL_RNG_RBGEN_DISABLE 0x00000000
|
|
||||||
+
|
|
||||||
+#define RNG_SOFT_RESET_OFFSET 0x04
|
|
||||||
+#define RNG_SOFT_RESET 0x00000001
|
|
||||||
+
|
|
||||||
+#define RBG_SOFT_RESET_OFFSET 0x08
|
|
||||||
+#define RBG_SOFT_RESET 0x00000001
|
|
||||||
+
|
|
||||||
+#define RNG_INT_STATUS_OFFSET 0x18
|
|
||||||
+#define RNG_INT_STATUS_MASTER_FAIL_LOCKOUT_IRQ_MASK 0x80000000
|
|
||||||
+#define RNG_INT_STATUS_NIST_FAIL_IRQ_MASK 0x00000020
|
|
||||||
+
|
|
||||||
+#define RNG_FIFO_DATA_OFFSET 0x20
|
|
||||||
+
|
|
||||||
+#define RNG_FIFO_COUNT_OFFSET 0x24
|
|
||||||
+#define RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK 0x000000FF
|
|
||||||
+
|
|
||||||
+struct iproc_rng200_platdata {
|
|
||||||
+ fdt_addr_t base;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable)
|
|
||||||
+{
|
|
||||||
+ fdt_addr_t rng_base = pdata->base;
|
|
||||||
+ u32 val;
|
|
||||||
+
|
|
||||||
+ val = readl(rng_base + RNG_CTRL_OFFSET);
|
|
||||||
+ val &= ~RNG_CTRL_RNG_RBGEN_MASK;
|
|
||||||
+ if (enable)
|
|
||||||
+ val |= RNG_CTRL_RNG_RBGEN_ENABLE;
|
|
||||||
+ else
|
|
||||||
+ val &= ~RNG_CTRL_RNG_RBGEN_ENABLE;
|
|
||||||
+
|
|
||||||
+ writel(val, rng_base + RNG_CTRL_OFFSET);
|
|
||||||
+
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata)
|
|
||||||
+{
|
|
||||||
+ fdt_addr_t rng_base = pdata->base;
|
|
||||||
+ u32 val;
|
|
||||||
+
|
|
||||||
+ iproc_rng200_enable(pdata, false);
|
|
||||||
+
|
|
||||||
+ /* Clear all interrupt status */
|
|
||||||
+ writel(0xFFFFFFFFUL, rng_base + RNG_INT_STATUS_OFFSET);
|
|
||||||
+
|
|
||||||
+ /* Reset RNG and RBG */
|
|
||||||
+ val = readl(rng_base + RBG_SOFT_RESET_OFFSET);
|
|
||||||
+ val |= RBG_SOFT_RESET;
|
|
||||||
+ writel(val, rng_base + RBG_SOFT_RESET_OFFSET);
|
|
||||||
+
|
|
||||||
+ val = readl(rng_base + RNG_SOFT_RESET_OFFSET);
|
|
||||||
+ val |= RNG_SOFT_RESET;
|
|
||||||
+ writel(val, rng_base + RNG_SOFT_RESET_OFFSET);
|
|
||||||
+
|
|
||||||
+ val = readl(rng_base + RNG_SOFT_RESET_OFFSET);
|
|
||||||
+ val &= ~RNG_SOFT_RESET;
|
|
||||||
+ writel(val, rng_base + RNG_SOFT_RESET_OFFSET);
|
|
||||||
+
|
|
||||||
+ val = readl(rng_base + RBG_SOFT_RESET_OFFSET);
|
|
||||||
+ val &= ~RBG_SOFT_RESET;
|
|
||||||
+ writel(val, rng_base + RBG_SOFT_RESET_OFFSET);
|
|
||||||
+
|
|
||||||
+ iproc_rng200_enable(pdata, true);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int iproc_rng200_read(struct udevice *dev, void *data, size_t len)
|
|
||||||
+{
|
|
||||||
+ struct iproc_rng200_platdata *priv = dev_get_platdata(dev);
|
|
||||||
+ char *buf = (char *)data;
|
|
||||||
+ u32 num_remaining = len;
|
|
||||||
+ u32 status;
|
|
||||||
+
|
|
||||||
+ #define MAX_RESETS_PER_READ 1
|
|
||||||
+ u32 num_resets = 0;
|
|
||||||
+
|
|
||||||
+ while (num_remaining > 0) {
|
|
||||||
+
|
|
||||||
+ /* Is RNG sane? If not, reset it. */
|
|
||||||
+ status = readl(priv->base + RNG_INT_STATUS_OFFSET);
|
|
||||||
+ if ((status & (RNG_INT_STATUS_MASTER_FAIL_LOCKOUT_IRQ_MASK |
|
|
||||||
+ RNG_INT_STATUS_NIST_FAIL_IRQ_MASK)) != 0) {
|
|
||||||
+
|
|
||||||
+ if (num_resets >= MAX_RESETS_PER_READ)
|
|
||||||
+ return len - num_remaining;
|
|
||||||
+
|
|
||||||
+ iproc_rng200_restart(priv);
|
|
||||||
+ num_resets++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Are there any random numbers available? */
|
|
||||||
+ if ((readl(priv->base + RNG_FIFO_COUNT_OFFSET) &
|
|
||||||
+ RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK) > 0) {
|
|
||||||
+
|
|
||||||
+ if (num_remaining >= sizeof(u32)) {
|
|
||||||
+ /* Buffer has room to store entire word */
|
|
||||||
+ *(u32 *)buf = readl(priv->base +
|
|
||||||
+ RNG_FIFO_DATA_OFFSET);
|
|
||||||
+ buf += sizeof(u32);
|
|
||||||
+ num_remaining -= sizeof(u32);
|
|
||||||
+ } else {
|
|
||||||
+ /* Buffer can only store partial word */
|
|
||||||
+ u32 rnd_number = readl(priv->base +
|
|
||||||
+ RNG_FIFO_DATA_OFFSET);
|
|
||||||
+ memcpy(buf, &rnd_number, num_remaining);
|
|
||||||
+ buf += num_remaining;
|
|
||||||
+ num_remaining = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ } else {
|
|
||||||
+ /* Can wait, give others chance to run */
|
|
||||||
+ usleep_range(min(num_remaining * 10, 500U), 500);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int iproc_rng200_probe(struct udevice *dev)
|
|
||||||
+{
|
|
||||||
+ struct iproc_rng200_platdata *priv = dev_get_platdata(dev);
|
|
||||||
+
|
|
||||||
+ iproc_rng200_enable(priv, true);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int iproc_rng200_remove(struct udevice *dev)
|
|
||||||
+{
|
|
||||||
+ struct iproc_rng200_platdata *priv = dev_get_platdata(dev);
|
|
||||||
+
|
|
||||||
+ iproc_rng200_enable(priv, false);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int iproc_rng200_ofdata_to_platdata(struct udevice *dev)
|
|
||||||
+{
|
|
||||||
+ struct iproc_rng200_platdata *pdata = dev_get_platdata(dev);
|
|
||||||
+
|
|
||||||
+ pdata->base = dev_read_addr(dev);
|
|
||||||
+ if (!pdata->base)
|
|
||||||
+ return -ENODEV;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static const struct dm_rng_ops iproc_rng200_ops = {
|
|
||||||
+ .read = iproc_rng200_read,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct udevice_id iproc_rng200_rng_match[] = {
|
|
||||||
+ { .compatible = "brcm,bcm2711-rng200", },
|
|
||||||
+ { .compatible = "brcm,iproc-rng200", },
|
|
||||||
+ {},
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+U_BOOT_DRIVER(iproc_rng200_rng) = {
|
|
||||||
+ .name = "iproc_rng200-rng",
|
|
||||||
+ .id = UCLASS_RNG,
|
|
||||||
+ .of_match = iproc_rng200_rng_match,
|
|
||||||
+ .ops = &iproc_rng200_ops,
|
|
||||||
+ .probe = iproc_rng200_probe,
|
|
||||||
+ .remove = iproc_rng200_remove,
|
|
||||||
+ .platdata_auto_alloc_size = sizeof(struct iproc_rng200_platdata),
|
|
||||||
+ .ofdata_to_platdata = iproc_rng200_ofdata_to_platdata,
|
|
||||||
+};
|
|
||||||
|
|
||||||
From patchwork Tue Dec 15 09:49:24 2020
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
X-Patchwork-Submitter: mbrugger <matthias.bgg@kernel.org>
|
|
||||||
X-Patchwork-Id: 1416367
|
|
||||||
X-Patchwork-Delegate: matthias.bgg@gmail.com
|
|
||||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
|
||||||
X-Original-To: incoming@patchwork.ozlabs.org
|
|
||||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
|
||||||
Authentication-Results: ozlabs.org;
|
|
||||||
spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
|
|
||||||
(client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;
|
|
||||||
envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)
|
|
||||||
Authentication-Results: ozlabs.org;
|
|
||||||
dmarc=fail (p=none dis=none) header.from=kernel.org
|
|
||||||
Received: from phobos.denx.de (phobos.denx.de
|
|
||||||
[IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])
|
|
||||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
|
||||||
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest
|
|
||||||
SHA256)
|
|
||||||
(No client certificate requested)
|
|
||||||
by ozlabs.org (Postfix) with ESMTPS id 4CwD5D4Gf2z9s0b
|
|
||||||
for <incoming@patchwork.ozlabs.org>; Tue, 15 Dec 2020 20:50:08 +1100 (AEDT)
|
|
||||||
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
|
|
||||||
by phobos.denx.de (Postfix) with ESMTP id A25E782961;
|
|
||||||
Tue, 15 Dec 2020 10:49:46 +0100 (CET)
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
dmarc=fail (p=none dis=none) header.from=kernel.org
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
|
||||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
|
||||||
id 9EC418295C; Tue, 15 Dec 2020 10:49:41 +0100 (CET)
|
|
||||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
|
||||||
X-Spam-Level:
|
|
||||||
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI,
|
|
||||||
SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2
|
|
||||||
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
|
|
||||||
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
|
|
||||||
(No client certificate requested)
|
|
||||||
by phobos.denx.de (Postfix) with ESMTPS id BCF5682956
|
|
||||||
for <u-boot@lists.denx.de>; Tue, 15 Dec 2020 10:49:38 +0100 (CET)
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
dmarc=pass (p=none dis=none) header.from=kernel.org
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
spf=pass smtp.mailfrom=matthias.bgg@kernel.org
|
|
||||||
From: matthias.bgg@kernel.org
|
|
||||||
Authentication-Results: mail.kernel.org;
|
|
||||||
dkim=permerror (bad message/signature format)
|
|
||||||
To: sughosh.ganu@linaro.org,
|
|
||||||
xypron.glpk@gmx.de
|
|
||||||
Cc: u-boot@lists.denx.de,
|
|
||||||
Matthias Brugger <mbrugger@suse.com>
|
|
||||||
Subject: [PATCH v2 2/2] config: Enable iProc RNG200 driver in RPi4 configs
|
|
||||||
Date: Tue, 15 Dec 2020 10:49:24 +0100
|
|
||||||
Message-Id: <20201215094924.30072-2-matthias.bgg@kernel.org>
|
|
||||||
X-Mailer: git-send-email 2.29.2
|
|
||||||
In-Reply-To: <20201215094924.30072-1-matthias.bgg@kernel.org>
|
|
||||||
References: <20201215094924.30072-1-matthias.bgg@kernel.org>
|
|
||||||
MIME-Version: 1.0
|
|
||||||
X-BeenThere: u-boot@lists.denx.de
|
|
||||||
X-Mailman-Version: 2.1.34
|
|
||||||
Precedence: list
|
|
||||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
|
||||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
|
||||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
|
||||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
|
||||||
List-Post: <mailto:u-boot@lists.denx.de>
|
|
||||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
|
||||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
|
||||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
|
||||||
Errors-To: u-boot-bounces@lists.denx.de
|
|
||||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
|
||||||
X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de
|
|
||||||
X-Virus-Status: Clean
|
|
||||||
|
|
||||||
From: Matthias Brugger <mbrugger@suse.com>
|
|
||||||
|
|
||||||
We find the iProc RNG200 in the Raspberry Pi 4. Add it to all it's
|
|
||||||
config so that it can be used.
|
|
||||||
|
|
||||||
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
Changes in v2:
|
|
||||||
- fix defconfigs using savedefconfig (Heinrich)
|
|
||||||
|
|
||||||
configs/rpi_4_32b_defconfig | 2 ++
|
|
||||||
configs/rpi_4_defconfig | 2 ++
|
|
||||||
configs/rpi_arm64_defconfig | 2 ++
|
|
||||||
drivers/rng/iproc_rng200.c | 1 -
|
|
||||||
4 files changed, 6 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
|
|
||||||
index 5ddd838fd5..4039e46c81 100644
|
|
||||||
--- a/configs/rpi_4_32b_defconfig
|
|
||||||
+++ b/configs/rpi_4_32b_defconfig
|
|
||||||
@@ -36,6 +36,8 @@ CONFIG_PCI_BRCMSTB=y
|
|
||||||
CONFIG_PINCTRL=y
|
|
||||||
# CONFIG_PINCTRL_GENERIC is not set
|
|
||||||
CONFIG_DM_RESET=y
|
|
||||||
+CONFIG_DM_RNG=y
|
|
||||||
+CONFIG_RNG_IPROC200=y
|
|
||||||
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
||||||
CONFIG_USB=y
|
|
||||||
CONFIG_DM_USB=y
|
|
||||||
diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig
|
|
||||||
index 2590d0a696..46b6cc3046 100644
|
|
||||||
--- a/configs/rpi_4_defconfig
|
|
||||||
+++ b/configs/rpi_4_defconfig
|
|
||||||
@@ -36,6 +36,8 @@ CONFIG_PCI_BRCMSTB=y
|
|
||||||
CONFIG_PINCTRL=y
|
|
||||||
# CONFIG_PINCTRL_GENERIC is not set
|
|
||||||
CONFIG_DM_RESET=y
|
|
||||||
+CONFIG_DM_RNG=y
|
|
||||||
+CONFIG_RNG_IPROC200=y
|
|
||||||
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
||||||
CONFIG_USB=y
|
|
||||||
CONFIG_DM_USB=y
|
|
||||||
diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
|
|
||||||
index 2639219a1a..b75144036d 100644
|
|
||||||
--- a/configs/rpi_arm64_defconfig
|
|
||||||
+++ b/configs/rpi_arm64_defconfig
|
|
||||||
@@ -33,6 +33,8 @@ CONFIG_PCI_BRCMSTB=y
|
|
||||||
CONFIG_PINCTRL=y
|
|
||||||
# CONFIG_PINCTRL_GENERIC is not set
|
|
||||||
CONFIG_DM_RESET=y
|
|
||||||
+CONFIG_DM_RNG=y
|
|
||||||
+CONFIG_RNG_IPROC200=y
|
|
||||||
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
||||||
CONFIG_USB=y
|
|
||||||
CONFIG_DM_USB=y
|
|
||||||
diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c
|
|
||||||
index 1063f43953..378f6cf48d 100644
|
|
||||||
--- a/drivers/rng/iproc_rng200.c
|
|
||||||
+++ b/drivers/rng/iproc_rng200.c
|
|
||||||
@@ -50,7 +50,6 @@ static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable
|
|
||||||
val &= ~RNG_CTRL_RNG_RBGEN_ENABLE;
|
|
||||||
|
|
||||||
writel(val, rng_base + RNG_CTRL_OFFSET);
|
|
||||||
-
|
|
||||||
}
|
|
||||||
|
|
||||||
static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata)
|
|
103
rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch
Normal file
103
rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
From patchwork Thu Apr 26 06:43:06 2018
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [U-Boot] rockchip: make_fit_atf: fix warning unit_address_vs_reg
|
||||||
|
X-Patchwork-Submitter: Kever Yang <kever.yang@rock-chips.com>
|
||||||
|
X-Patchwork-Id: 904884
|
||||||
|
Message-Id: <1524724986-28497-1-git-send-email-kever.yang@rock-chips.com>
|
||||||
|
To: u-boot@lists.denx.de
|
||||||
|
Date: Thu, 26 Apr 2018 14:43:06 +0800
|
||||||
|
From: Kever Yang <kever.yang@rock-chips.com>
|
||||||
|
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||||
|
|
||||||
|
Patch fix warning:
|
||||||
|
/builddir/BUILD/u-boot-2018.05-rc2/"arch/arm/mach-rockchip/make_fit_atf.py" \
|
||||||
|
arch/arm/dts/rk3399-firefly.dtb > u-boot.its
|
||||||
|
./tools/mkimage -f u-boot.its -E u-boot.itb >/dev/null && cat
|
||||||
|
/dev/null
|
||||||
|
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/uboot@1
|
||||||
|
has a unit name, but no reg property
|
||||||
|
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/atf@1 has
|
||||||
|
a unit name, but no reg property
|
||||||
|
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/atf@2 has
|
||||||
|
a unit name, but no reg property
|
||||||
|
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/atf@3 has
|
||||||
|
a unit name, but no reg property
|
||||||
|
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/fdt@1 has
|
||||||
|
a unit name, but no reg property
|
||||||
|
u-boot.itb.tmp: Warning (unit_address_vs_reg): Node
|
||||||
|
/configurations/config@1 has a unit name, but no reg property
|
||||||
|
make[1]: Leaving directory
|
||||||
|
'/builddir/BUILD/u-boot-2018.05-rc2/builds/firefly-rk3399'
|
||||||
|
|
||||||
|
Reported-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
|
||||||
|
---
|
||||||
|
|
||||||
|
arch/arm/mach-rockchip/make_fit_atf.py | 18 +++++++++---------
|
||||||
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py
|
||||||
|
index 7c6dd57..513e088 100755
|
||||||
|
--- a/arch/arm/mach-rockchip/make_fit_atf.py
|
||||||
|
+++ b/arch/arm/mach-rockchip/make_fit_atf.py
|
||||||
|
@@ -37,7 +37,7 @@ DT_HEADER="""/*
|
||||||
|
#address-cells = <1>;
|
||||||
|
|
||||||
|
images {
|
||||||
|
- uboot@1 {
|
||||||
|
+ uboot {
|
||||||
|
description = "U-Boot (64-bit)";
|
||||||
|
data = /incbin/("u-boot-nodtb.bin");
|
||||||
|
type = "standalone";
|
||||||
|
@@ -61,7 +61,7 @@ def append_atf_node(file, atf_index, phy_addr):
|
||||||
|
Append ATF DT node to input FIT dts file.
|
||||||
|
"""
|
||||||
|
data = 'bl31_0x%08x.bin' % phy_addr
|
||||||
|
- print >> file, '\t\tatf@%d {' % atf_index
|
||||||
|
+ print >> file, '\t\tatf_%d {' % atf_index
|
||||||
|
print >> file, '\t\t\tdescription = \"ARM Trusted Firmware\";'
|
||||||
|
print >> file, '\t\t\tdata = /incbin/("%s");' % data
|
||||||
|
print >> file, '\t\t\ttype = "firmware";'
|
||||||
|
@@ -81,7 +81,7 @@ def append_fdt_node(file, dtbs):
|
||||||
|
cnt = 1
|
||||||
|
for dtb in dtbs:
|
||||||
|
dtname = os.path.basename(dtb)
|
||||||
|
- print >> file, '\t\tfdt@%d {' % cnt
|
||||||
|
+ print >> file, '\t\tfdt_%d {' % cnt
|
||||||
|
print >> file, '\t\t\tdescription = "%s";' % dtname
|
||||||
|
print >> file, '\t\t\tdata = /incbin/("%s");' % dtb
|
||||||
|
print >> file, '\t\t\ttype = "flat_dt";'
|
||||||
|
@@ -91,17 +91,17 @@ def append_fdt_node(file, dtbs):
|
||||||
|
cnt = cnt + 1
|
||||||
|
|
||||||
|
def append_conf_section(file, cnt, dtname, atf_cnt):
|
||||||
|
- print >> file, '\t\tconfig@%d {' % cnt
|
||||||
|
+ print >> file, '\t\tconfig_%d {' % cnt
|
||||||
|
print >> file, '\t\t\tdescription = "%s";' % dtname
|
||||||
|
- print >> file, '\t\t\tfirmware = "atf@1";'
|
||||||
|
- print >> file, '\t\t\tloadables = "uboot@1",',
|
||||||
|
+ print >> file, '\t\t\tfirmware = "atf_1";'
|
||||||
|
+ print >> file, '\t\t\tloadables = "uboot",',
|
||||||
|
for i in range(1, atf_cnt):
|
||||||
|
- print >> file, '"atf@%d"' % (i+1),
|
||||||
|
+ print >> file, '"atf_%d"' % (i+1),
|
||||||
|
if i != (atf_cnt - 1):
|
||||||
|
print >> file, ',',
|
||||||
|
else:
|
||||||
|
print >> file, ';'
|
||||||
|
- print >> file, '\t\t\tfdt = "fdt@1";'
|
||||||
|
+ print >> file, '\t\t\tfdt = "fdt_1";'
|
||||||
|
print >> file, '\t\t};'
|
||||||
|
print >> file, ''
|
||||||
|
|
||||||
|
@@ -111,7 +111,7 @@ def append_conf_node(file, dtbs, atf_cnt):
|
||||||
|
"""
|
||||||
|
cnt = 1
|
||||||
|
print >> file, '\tconfigurations {'
|
||||||
|
- print >> file, '\t\tdefault = "config@1";'
|
||||||
|
+ print >> file, '\t\tdefault = "config_1";'
|
||||||
|
for dtb in dtbs:
|
||||||
|
dtname = os.path.basename(dtb)
|
||||||
|
append_conf_section(file, cnt, dtname, atf_cnt)
|
81
rockchip-make_fit_atf-use-elf-entry-point.patch
Normal file
81
rockchip-make_fit_atf-use-elf-entry-point.patch
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
From patchwork Wed May 16 16:44:33 2018
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [U-Boot] rockchip: make_fit_atf: use elf entry point
|
||||||
|
X-Patchwork-Submitter: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
|
||||||
|
X-Patchwork-Id: 914901
|
||||||
|
Message-Id: <20180516164433.30998-1-yousaf.kaukab@suse.com>
|
||||||
|
To: u-boot@lists.denx.de
|
||||||
|
Cc: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
|
||||||
|
Date: Wed, 16 May 2018 18:44:33 +0200
|
||||||
|
From: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
|
||||||
|
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||||
|
|
||||||
|
make_fit_atf.py uses physical address of first segment as the
|
||||||
|
entry point to bl31. It is incorrect and causes following abort
|
||||||
|
when bl31_entry() is called:
|
||||||
|
|
||||||
|
U-Boot SPL board initTrying to boot from MMC1
|
||||||
|
"Synchronous Abort" handler, esr 0x02000000
|
||||||
|
elr: 0000000000000000 lr : 00000000ff8c7e8c
|
||||||
|
x 0: 00000000ff8e0000 x 1: 0000000000000000
|
||||||
|
x 2: 0000000000000000 x 3: 00000000ff8e0180
|
||||||
|
x 4: 0000000000000000 x 5: 0000000000000000
|
||||||
|
x 6: 0000000000000030 x 7: 00000000ff8e0188
|
||||||
|
x 8: 00000000000001e0 x 9: 0000000000000000
|
||||||
|
x10: 000000000007fcdc x11: 00000000002881b8
|
||||||
|
x12: 00000000000001a2 x13: 0000000000000198
|
||||||
|
x14: 000000000007fdcc x15: 00000000002881b8
|
||||||
|
x16: 00000000003c0724 x17: 00000000003c0718
|
||||||
|
x18: 000000000007fe80 x19: 00000000ff8e0000
|
||||||
|
x20: 0000000000200000 x21: 00000000ff8e0000
|
||||||
|
x22: 0000000000000000 x23: 000000000007fe30
|
||||||
|
x24: 00000000ff8d1c3c x25: 00000000ff8d5000
|
||||||
|
x26: 00000000deadbeef x27: 00000000000004a0
|
||||||
|
x28: 000000000000009c x29: 000000000007fd90
|
||||||
|
|
||||||
|
Fix it by using the entry point from the elf header.
|
||||||
|
|
||||||
|
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
|
||||||
|
---
|
||||||
|
arch/arm/mach-rockchip/make_fit_atf.py | 7 ++++---
|
||||||
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py
|
||||||
|
index 6b3d9201c9..b88a5e1f16 100755
|
||||||
|
--- a/arch/arm/mach-rockchip/make_fit_atf.py
|
||||||
|
+++ b/arch/arm/mach-rockchip/make_fit_atf.py
|
||||||
|
@@ -53,7 +53,7 @@ DT_END="""
|
||||||
|
};
|
||||||
|
"""
|
||||||
|
|
||||||
|
-def append_atf_node(file, atf_index, phy_addr):
|
||||||
|
+def append_atf_node(file, atf_index, phy_addr, elf_entry):
|
||||||
|
"""
|
||||||
|
Append ATF DT node to input FIT dts file.
|
||||||
|
"""
|
||||||
|
@@ -67,7 +67,7 @@ def append_atf_node(file, atf_index, phy_addr):
|
||||||
|
print >> file, '\t\t\tcompression = "none";'
|
||||||
|
print >> file, '\t\t\tload = <0x%08x>;' % phy_addr
|
||||||
|
if atf_index == 1:
|
||||||
|
- print >> file, '\t\t\tentry = <0x%08x>;' % phy_addr
|
||||||
|
+ print >> file, '\t\t\tentry = <0x%08x>;' % elf_entry
|
||||||
|
print >> file, '\t\t};'
|
||||||
|
print >> file, ''
|
||||||
|
|
||||||
|
@@ -141,12 +141,13 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi
|
||||||
|
|
||||||
|
with open(bl31_file_name) as bl31_file:
|
||||||
|
bl31 = ELFFile(bl31_file)
|
||||||
|
+ elf_entry = bl31.header['e_entry']
|
||||||
|
for i in range(bl31.num_segments()):
|
||||||
|
seg = bl31.get_segment(i)
|
||||||
|
if ('PT_LOAD' == seg.__getitem__(ELF_SEG_P_TYPE)):
|
||||||
|
paddr = seg.__getitem__(ELF_SEG_P_PADDR)
|
||||||
|
p= seg.__getitem__(ELF_SEG_P_PADDR)
|
||||||
|
- append_atf_node(fit_file, i+1, paddr)
|
||||||
|
+ append_atf_node(fit_file, i+1, paddr, elf_entry)
|
||||||
|
atf_cnt = i+1
|
||||||
|
append_fdt_node(fit_file, dtbs_file_name)
|
||||||
|
print >> fit_file, '%s' % DT_IMAGES_NODE_END
|
@ -1,11 +0,0 @@
|
|||||||
--- u-boot-2020.10/common/spl/Kconfig.orig 2020-10-07 12:08:54.972632715 +0100
|
|
||||||
+++ u-boot-2020.10/common/spl/Kconfig 2020-10-07 12:08:59.100672506 +0100
|
|
||||||
@@ -324,7 +324,7 @@
|
|
||||||
default 0x200 if ARCH_SOCFPGA || ARCH_AT91
|
|
||||||
default 0x300 if ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || OMAP44XX || \
|
|
||||||
OMAP54XX || AM33XX || AM43XX || ARCH_K3
|
|
||||||
- default 0x4000 if ARCH_ROCKCHIP
|
|
||||||
+ default 0x200 if ARCH_ROCKCHIP
|
|
||||||
default 0x822 if TARGET_SIFIVE_FU540
|
|
||||||
help
|
|
||||||
Address on the MMC to load U-Boot from, when the MMC is being used
|
|
@ -1,96 +1,82 @@
|
|||||||
From f10f94831450671a77f61fe413b4a57459963860 Mon Sep 17 00:00:00 2001
|
From 44dd1455f924aa99e6bff0b124a9be0a85dcfa89 Mon Sep 17 00:00:00 2001
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
Date: Mon, 10 Aug 2020 22:20:29 +0100
|
Date: Tue, 4 Sep 2018 11:59:18 +0100
|
||||||
Subject: [PATCH] rpi: Use firmware provided device tree
|
Subject: [PATCH] rpi: Use firmware provided device tree
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
---
|
---
|
||||||
configs/rpi_0_w_defconfig | 2 +-
|
configs/rpi_0_w_defconfig | 2 +-
|
||||||
configs/rpi_2_defconfig | 2 +-
|
configs/rpi_2_defconfig | 2 +-
|
||||||
configs/rpi_3_32b_defconfig | 2 +-
|
configs/rpi_3_32b_defconfig | 2 +-
|
||||||
configs/rpi_3_b_plus_defconfig | 2 +-
|
configs/rpi_3_defconfig | 2 +-
|
||||||
configs/rpi_3_defconfig | 2 +-
|
configs/rpi_defconfig | 2 +-
|
||||||
configs/rpi_defconfig | 2 +-
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
6 files changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
|
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
|
||||||
index bba5e12b12..0241f4c6d3 100644
|
index d5bf01b76e..08f177f34a 100644
|
||||||
--- a/configs/rpi_0_w_defconfig
|
--- a/configs/rpi_0_w_defconfig
|
||||||
+++ b/configs/rpi_0_w_defconfig
|
+++ b/configs/rpi_0_w_defconfig
|
||||||
@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
|
@@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
||||||
|
CONFIG_CMD_GPIO=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
CONFIG_CMD_USB=y
|
CONFIG_CMD_USB=y
|
||||||
CONFIG_CMD_FS_UUID=y
|
|
||||||
-CONFIG_OF_EMBED=y
|
-CONFIG_OF_EMBED=y
|
||||||
+CONFIG_OF_BOARD=y
|
+CONFIG_OF_BOARD=y
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w"
|
||||||
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
||||||
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
|
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
|
||||||
index 1c2bbb29ce..9573e475f4 100644
|
index a50a815759..0918c6c9ff 100644
|
||||||
--- a/configs/rpi_2_defconfig
|
--- a/configs/rpi_2_defconfig
|
||||||
+++ b/configs/rpi_2_defconfig
|
+++ b/configs/rpi_2_defconfig
|
||||||
@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
|
@@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
||||||
|
CONFIG_CMD_GPIO=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
CONFIG_CMD_USB=y
|
CONFIG_CMD_USB=y
|
||||||
CONFIG_CMD_FS_UUID=y
|
|
||||||
-CONFIG_OF_EMBED=y
|
-CONFIG_OF_EMBED=y
|
||||||
+CONFIG_OF_BOARD=y
|
+CONFIG_OF_BOARD=y
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
|
||||||
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
||||||
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
|
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
|
||||||
index b8a3d17f43..252df994e6 100644
|
index ec395d29ed..22165bde53 100644
|
||||||
--- a/configs/rpi_3_32b_defconfig
|
--- a/configs/rpi_3_32b_defconfig
|
||||||
+++ b/configs/rpi_3_32b_defconfig
|
+++ b/configs/rpi_3_32b_defconfig
|
||||||
@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
|
@@ -14,7 +14,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
||||||
|
CONFIG_CMD_GPIO=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
CONFIG_CMD_USB=y
|
CONFIG_CMD_USB=y
|
||||||
CONFIG_CMD_FS_UUID=y
|
|
||||||
-CONFIG_OF_EMBED=y
|
-CONFIG_OF_EMBED=y
|
||||||
+CONFIG_OF_BOARD=y
|
+CONFIG_OF_BOARD=y
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
|
||||||
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
||||||
diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
|
|
||||||
index 4c361438fa..3b2996a2f9 100644
|
|
||||||
--- a/configs/rpi_3_b_plus_defconfig
|
|
||||||
+++ b/configs/rpi_3_b_plus_defconfig
|
|
||||||
@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
|
|
||||||
CONFIG_CMD_MMC=y
|
|
||||||
CONFIG_CMD_USB=y
|
|
||||||
CONFIG_CMD_FS_UUID=y
|
|
||||||
-CONFIG_OF_EMBED=y
|
|
||||||
+CONFIG_OF_BOARD=y
|
|
||||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
||||||
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
|
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
|
||||||
index 9b281a4f15..1e9ee6122e 100644
|
index ac99f2000a..0ca298cd54 100644
|
||||||
--- a/configs/rpi_3_defconfig
|
--- a/configs/rpi_3_defconfig
|
||||||
+++ b/configs/rpi_3_defconfig
|
+++ b/configs/rpi_3_defconfig
|
||||||
@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
|
@@ -14,7 +14,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
||||||
|
CONFIG_CMD_GPIO=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
CONFIG_CMD_USB=y
|
CONFIG_CMD_USB=y
|
||||||
CONFIG_CMD_FS_UUID=y
|
|
||||||
-CONFIG_OF_EMBED=y
|
-CONFIG_OF_EMBED=y
|
||||||
+CONFIG_OF_BOARD=y
|
+CONFIG_OF_BOARD=y
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
|
||||||
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
||||||
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
|
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
|
||||||
index b5ad53c37b..223fc03275 100644
|
index db42ffd135..0ec1365b1b 100644
|
||||||
--- a/configs/rpi_defconfig
|
--- a/configs/rpi_defconfig
|
||||||
+++ b/configs/rpi_defconfig
|
+++ b/configs/rpi_defconfig
|
||||||
@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y
|
@@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
||||||
|
CONFIG_CMD_GPIO=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
CONFIG_CMD_USB=y
|
CONFIG_CMD_USB=y
|
||||||
CONFIG_CMD_FS_UUID=y
|
|
||||||
-CONFIG_OF_EMBED=y
|
-CONFIG_OF_EMBED=y
|
||||||
+CONFIG_OF_BOARD=y
|
+CONFIG_OF_BOARD=y
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
|
||||||
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
||||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
||||||
--
|
--
|
||||||
2.26.2
|
2.19.0.rc0
|
||||||
|
|
||||||
|
32
rpi-add-3Aplus.patch
Normal file
32
rpi-add-3Aplus.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From d61cf138bce890b0b79745e48a908062bc36b99f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jonathan Gray <jsg@jsg.id.au>
|
||||||
|
Date: Fri, 16 Nov 2018 23:07:39 +1100
|
||||||
|
Subject: [PATCH] rpi: add 3 Model A+
|
||||||
|
|
||||||
|
Add Raspberry Pi 3 Model A+ to list of models, the revision code is 0xE
|
||||||
|
according to the list on raspberrypi.org.
|
||||||
|
|
||||||
|
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
|
||||||
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||||||
|
---
|
||||||
|
board/raspberrypi/rpi/rpi.c | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
|
||||||
|
index 5062486..153a1fd 100644
|
||||||
|
--- a/board/raspberrypi/rpi/rpi.c
|
||||||
|
+++ b/board/raspberrypi/rpi/rpi.c
|
||||||
|
@@ -138,6 +138,11 @@ static const struct rpi_model rpi_models_new_scheme[] = {
|
||||||
|
DTB_DIR "bcm2837-rpi-3-b-plus.dtb",
|
||||||
|
true,
|
||||||
|
},
|
||||||
|
+ [0xE] = {
|
||||||
|
+ "3 Model A+",
|
||||||
|
+ DTB_DIR "bcm2837-rpi-3-a-plus.dtb",
|
||||||
|
+ false,
|
||||||
|
+ },
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct rpi_model rpi_models_old_scheme[] = {
|
||||||
|
--
|
||||||
|
2.7.4
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (u-boot-2021.01-rc4.tar.bz2) = 6de2c60d02276f4eed31b5baf2d8239ad0af30c9d341339a4cd7fa0786068cb5faa1ab8bd0b4155e536962e1a4869906f60f1d2a1e50b0ed15e98c2e84d6a97b
|
SHA512 (u-boot-2018.09.tar.bz2) = 48cb60a53450e2820eda706917b61dae053677fecfe177e0d07968313d25c7e9d5ab2d7cc5625b54e4c823f5c8852f88387b94f404e307e737aaa5a2c887ad4a
|
||||||
|
67
sunxi-DT-A64-add-Pine64-LTS-support.patch
Normal file
67
sunxi-DT-A64-add-Pine64-LTS-support.patch
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
From 82cc7aca5fb7c7103256229a3ead0b8075da5813 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Wed, 5 Sep 2018 17:00:25 +0100
|
||||||
|
Subject: [PATCH] sunxi: DT: A64: add Pine64-LTS support
|
||||||
|
|
||||||
|
The Pine64-LTS board is a new board version of the Pine64, though
|
||||||
|
actually it's a non-SoM version of the SoPine and its baseboard.
|
||||||
|
In contrast to the original Pine64 it features LPDDR3 DRAM, an eMMC
|
||||||
|
socket and a SPI flash chip for storing firmware (like U-Boot).
|
||||||
|
Add it as a variant to the existing SoPine defconfig, since from a
|
||||||
|
software point of view they are really not different.
|
||||||
|
|
||||||
|
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/Makefile | 1 +
|
||||||
|
arch/arm/dts/sun50i-a64-pine64-lts.dts | 13 +++++++++++++
|
||||||
|
configs/sopine_baseboard_defconfig | 1 +
|
||||||
|
3 files changed, 15 insertions(+)
|
||||||
|
create mode 100644 arch/arm/dts/sun50i-a64-pine64-lts.dts
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
|
||||||
|
index ebfa227262..6cd440d6af 100644
|
||||||
|
--- a/arch/arm/dts/Makefile
|
||||||
|
+++ b/arch/arm/dts/Makefile
|
||||||
|
@@ -401,6 +401,7 @@ dtb-$(CONFIG_MACH_SUN50I) += \
|
||||||
|
sun50i-a64-nanopi-a64.dtb \
|
||||||
|
sun50i-a64-olinuxino.dtb \
|
||||||
|
sun50i-a64-orangepi-win.dtb \
|
||||||
|
+ sun50i-a64-pine64-lts.dtb \
|
||||||
|
sun50i-a64-pine64-plus.dtb \
|
||||||
|
sun50i-a64-pine64.dtb \
|
||||||
|
sun50i-a64-sopine-baseboard.dtb
|
||||||
|
diff --git a/arch/arm/dts/sun50i-a64-pine64-lts.dts b/arch/arm/dts/sun50i-a64-pine64-lts.dts
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..72d6961dc3
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/arch/arm/dts/sun50i-a64-pine64-lts.dts
|
||||||
|
@@ -0,0 +1,13 @@
|
||||||
|
+/*
|
||||||
|
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||||
|
+ *
|
||||||
|
+ * Copyright (c) 2018 ARM Ltd.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include "sun50i-a64-sopine-baseboard.dts"
|
||||||
|
+
|
||||||
|
+/ {
|
||||||
|
+ model = "Pine64 LTS";
|
||||||
|
+ compatible = "pine64,pine64-lts", "allwinner,sun50i-r18",
|
||||||
|
+ "allwinner,sun50i-a64";
|
||||||
|
+};
|
||||||
|
diff --git a/configs/sopine_baseboard_defconfig b/configs/sopine_baseboard_defconfig
|
||||||
|
index 9ede081c08..eead38a1e3 100644
|
||||||
|
--- a/configs/sopine_baseboard_defconfig
|
||||||
|
+++ b/configs/sopine_baseboard_defconfig
|
||||||
|
@@ -15,6 +15,7 @@ CONFIG_NR_DRAM_BANKS=1
|
||||||
|
# CONFIG_SPL_DOS_PARTITION is not set
|
||||||
|
# CONFIG_SPL_EFI_PARTITION is not set
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-sopine-baseboard"
|
||||||
|
+CONFIG_OF_LIST="sun50i-a64-sopine-baseboard sun50i-a64-pine64-lts"
|
||||||
|
CONFIG_SUN8I_EMAC=y
|
||||||
|
CONFIG_USB_EHCI_HCD=y
|
||||||
|
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
|
||||||
|
--
|
||||||
|
2.19.0.rc0
|
||||||
|
|
@ -1,222 +0,0 @@
|
|||||||
From patchwork Wed Nov 18 10:27:17 2020
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
X-Patchwork-Submitter: Icenowy Zheng <icenowy@aosc.io>
|
|
||||||
X-Patchwork-Id: 1402159
|
|
||||||
X-Patchwork-Delegate: andre.przywara@arm.com
|
|
||||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
|
||||||
X-Original-To: incoming@patchwork.ozlabs.org
|
|
||||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
|
||||||
Authentication-Results: ozlabs.org;
|
|
||||||
spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
|
|
||||||
(client-ip=85.214.62.61; helo=phobos.denx.de;
|
|
||||||
envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)
|
|
||||||
Authentication-Results: ozlabs.org;
|
|
||||||
dmarc=none (p=none dis=none) header.from=aosc.io
|
|
||||||
Authentication-Results: ozlabs.org;
|
|
||||||
dkim=fail reason="signature verification failed" (1024-bit key;
|
|
||||||
unprotected) header.d=mymailcheap.com header.i=@mymailcheap.com
|
|
||||||
header.a=rsa-sha256 header.s=default header.b=YYrkSpBD;
|
|
||||||
dkim=fail reason="signature verification failed" (1024-bit key;
|
|
||||||
unprotected) header.d=aosc.io header.i=@aosc.io header.a=rsa-sha256
|
|
||||||
header.s=default header.b=o7lHQ4SZ;
|
|
||||||
dkim-atps=neutral
|
|
||||||
Received: from phobos.denx.de (phobos.denx.de [85.214.62.61])
|
|
||||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
|
||||||
key-exchange X25519 server-signature RSA-PSS (4096 bits))
|
|
||||||
(No client certificate requested)
|
|
||||||
by ozlabs.org (Postfix) with ESMTPS id 4CbfCp3G62z9s1l
|
|
||||||
for <incoming@patchwork.ozlabs.org>; Wed, 18 Nov 2020 21:28:22 +1100 (AEDT)
|
|
||||||
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
|
|
||||||
by phobos.denx.de (Postfix) with ESMTP id 00D6D82304;
|
|
||||||
Wed, 18 Nov 2020 11:28:16 +0100 (CET)
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
dmarc=none (p=none dis=none) header.from=aosc.io
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
dkim=fail reason="signature verification failed" (1024-bit key;
|
|
||||||
unprotected) header.d=mymailcheap.com header.i=@mymailcheap.com
|
|
||||||
header.b="YYrkSpBD";
|
|
||||||
dkim=fail reason="signature verification failed" (1024-bit key;
|
|
||||||
unprotected) header.d=aosc.io header.i=@aosc.io header.b="o7lHQ4SZ";
|
|
||||||
dkim-atps=neutral
|
|
||||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
|
||||||
id 2E5B282309; Wed, 18 Nov 2020 11:28:11 +0100 (CET)
|
|
||||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
|
||||||
X-Spam-Level:
|
|
||||||
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
|
|
||||||
DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham
|
|
||||||
autolearn_force=no version=3.4.2
|
|
||||||
Received: from relay1.mymailcheap.com (relay1.mymailcheap.com
|
|
||||||
[144.217.248.100])
|
|
||||||
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
|
|
||||||
(No client certificate requested)
|
|
||||||
by phobos.denx.de (Postfix) with ESMTPS id EC082808F1
|
|
||||||
for <u-boot@lists.denx.de>; Wed, 18 Nov 2020 11:28:05 +0100 (CET)
|
|
||||||
Authentication-Results: phobos.denx.de;
|
|
||||||
dmarc=none (p=none dis=none) header.from=aosc.io
|
|
||||||
Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=icenowy@aosc.io
|
|
||||||
Received: from filter2.mymailcheap.com (filter2.mymailcheap.com
|
|
||||||
[91.134.140.82])
|
|
||||||
by relay1.mymailcheap.com (Postfix) with ESMTPS id 18A423F201;
|
|
||||||
Wed, 18 Nov 2020 10:27:59 +0000 (UTC)
|
|
||||||
Received: from localhost (localhost [127.0.0.1])
|
|
||||||
by filter2.mymailcheap.com (Postfix) with ESMTP id 6377C2A7E9;
|
|
||||||
Wed, 18 Nov 2020 11:27:58 +0100 (CET)
|
|
||||||
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mymailcheap.com;
|
|
||||||
s=default; t=1605695278;
|
|
||||||
bh=vA5tPn4fjpXJj/OQnRg+m708mrodc5u5TJSDVOSBnHo=;
|
|
||||||
h=From:To:Cc:Subject:Date:From;
|
|
||||||
b=YYrkSpBDGdpkLi16yGwNw7yMTXXW566rTdXX2RSRxCe6FylY99qiYDmZR+PZFqCX0
|
|
||||||
t3yDL0nO6zMKUvJVqZaTwsroyblAKNCaLz1AfCURNqCwohtJcIkDsegRYz9slzT9Qu
|
|
||||||
BQkTT6dosAIQFtAVrc48QBX38eHXMYreqkbHXz5g=
|
|
||||||
Received: from filter2.mymailcheap.com ([127.0.0.1])
|
|
||||||
by localhost (filter2.mymailcheap.com [127.0.0.1]) (amavisd-new, port 10024)
|
|
||||||
with ESMTP id eCMZCx2FVDgE; Wed, 18 Nov 2020 11:27:57 +0100 (CET)
|
|
||||||
Received: from mail20.mymailcheap.com (mail20.mymailcheap.com [51.83.111.147])
|
|
||||||
(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))
|
|
||||||
(No client certificate requested)
|
|
||||||
by filter2.mymailcheap.com (Postfix) with ESMTPS;
|
|
||||||
Wed, 18 Nov 2020 11:27:57 +0100 (CET)
|
|
||||||
Received: from [213.133.102.83] (ml.mymailcheap.com [213.133.102.83])
|
|
||||||
by mail20.mymailcheap.com (Postfix) with ESMTP id A597A400BE;
|
|
||||||
Wed, 18 Nov 2020 10:27:56 +0000 (UTC)
|
|
||||||
Authentication-Results: mail20.mymailcheap.com; dkim=pass (1024-bit key;
|
|
||||||
unprotected) header.d=aosc.io header.i=@aosc.io header.b="o7lHQ4SZ";
|
|
||||||
dkim-atps=neutral
|
|
||||||
AI-Spam-Status: Not processed
|
|
||||||
Received: from ice-e5v2.lan (unknown [59.41.160.51])
|
|
||||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
|
||||||
key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest
|
|
||||||
SHA256) (No client certificate requested)
|
|
||||||
by mail20.mymailcheap.com (Postfix) with ESMTPSA id 3B979400BE;
|
|
||||||
Wed, 18 Nov 2020 10:27:45 +0000 (UTC)
|
|
||||||
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=aosc.io; s=default;
|
|
||||||
t=1605695270; bh=vA5tPn4fjpXJj/OQnRg+m708mrodc5u5TJSDVOSBnHo=;
|
|
||||||
h=From:To:Cc:Subject:Date:From;
|
|
||||||
b=o7lHQ4SZ+kcNlSGrF+USzZxRQhtIEcZFQPjvsiu+MiK+TTjArUzo5bRKHH0I4ZcDM
|
|
||||||
a4Ywg6IcctT99QEZGbRIHqhvjH6/Kvj4lWM77Bb0DrlHXfEdOj3LC7KiAF1vVGFfPI
|
|
||||||
0oTEacf71O2OWPmQBqEH/uaV/IiGI4rZvgWiMPkk=
|
|
||||||
From: Icenowy Zheng <icenowy@aosc.io>
|
|
||||||
To: Jagan Teki <jagan@amarulasolutions.com>,
|
|
||||||
Andre Przywara <andre.przywara@arm.com>,
|
|
||||||
Hans de Goede <hdegoede@redhat.com>
|
|
||||||
Cc: u-boot@lists.denx.de, linux-sunxi@googlegroups.com,
|
|
||||||
Icenowy Zheng <icenowy@aosc.io>
|
|
||||||
Subject: [PATCH v3] sunxi: add PineCube board
|
|
||||||
Date: Wed, 18 Nov 2020 18:27:17 +0800
|
|
||||||
Message-Id: <20201118102717.635129-1-icenowy@aosc.io>
|
|
||||||
X-Mailer: git-send-email 2.28.0
|
|
||||||
MIME-Version: 1.0
|
|
||||||
X-Rspamd-Queue-Id: A597A400BE
|
|
||||||
X-Spamd-Result: default: False [4.90 / 20.00]; RCVD_VIA_SMTP_AUTH(0.00)[];
|
|
||||||
ARC_NA(0.00)[]; R_DKIM_ALLOW(0.00)[aosc.io:s=default];
|
|
||||||
RECEIVED_SPAMHAUS_PBL(0.00)[59.41.160.51:received];
|
|
||||||
FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[];
|
|
||||||
R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[];
|
|
||||||
MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[aosc.io];
|
|
||||||
BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all];
|
|
||||||
RCPT_COUNT_FIVE(0.00)[6]; ML_SERVERS(-3.10)[213.133.102.83];
|
|
||||||
DKIM_TRACE(0.00)[aosc.io:+]; MID_CONTAINS_FROM(1.00)[];
|
|
||||||
RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[];
|
|
||||||
MIME_TRACE(0.00)[0:+];
|
|
||||||
ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE];
|
|
||||||
RCVD_COUNT_TWO(0.00)[2];
|
|
||||||
HFILTER_HELO_BAREIP(3.00)[213.133.102.83,1]
|
|
||||||
X-Rspamd-Server: mail20.mymailcheap.com
|
|
||||||
X-BeenThere: u-boot@lists.denx.de
|
|
||||||
X-Mailman-Version: 2.1.34
|
|
||||||
Precedence: list
|
|
||||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
|
||||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
|
||||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
|
||||||
List-Archive: <https://lists.denx.de/pipermail/u-boot/>
|
|
||||||
List-Post: <mailto:u-boot@lists.denx.de>
|
|
||||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
|
||||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
|
||||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
|
||||||
Errors-To: u-boot-bounces@lists.denx.de
|
|
||||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
|
||||||
X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de
|
|
||||||
X-Virus-Status: Clean
|
|
||||||
|
|
||||||
PineCube is an IP camera development kit released by Pine64.
|
|
||||||
|
|
||||||
It comes with the following compoents:
|
|
||||||
|
|
||||||
- A mainboard with Sochip S3 SoC, a 16MByte SPI Flash, AXP209 PMIC,
|
|
||||||
a power-only microUSB connector, a USB Type-A connector, a 10/100Mbps
|
|
||||||
Ethernet port and FPC connectors for camera and daughter board.
|
|
||||||
- An OV5640-based camera module which is connected to the parallel CSI
|
|
||||||
bus of the mainboard.
|
|
||||||
- A daughterboard with several buttons, a SD slot, some IR LEDs, a
|
|
||||||
microphone and a speaker connector.
|
|
||||||
|
|
||||||
As the device tree is synchronized in a previous commit, just add it to
|
|
||||||
Makefile, create a new MAINTAINER item and provide a defconfig.
|
|
||||||
|
|
||||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
|
|
||||||
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
|
|
||||||
---
|
|
||||||
Changes since v2:
|
|
||||||
- Add Makefile reference to DT.
|
|
||||||
Changes since v1:
|
|
||||||
- Dropped LDO3 quirk.
|
|
||||||
|
|
||||||
arch/arm/dts/Makefile | 1 +
|
|
||||||
board/sunxi/MAINTAINERS | 5 +++++
|
|
||||||
configs/pinecube_defconfig | 15 +++++++++++++++
|
|
||||||
3 files changed, 21 insertions(+)
|
|
||||||
create mode 100644 configs/pinecube_defconfig
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
|
|
||||||
index 7d1a369845..e6993733b0 100644
|
|
||||||
--- a/arch/arm/dts/Makefile
|
|
||||||
+++ b/arch/arm/dts/Makefile
|
|
||||||
@@ -587,6 +587,7 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \
|
|
||||||
sun8i-r40-bananapi-m2-ultra.dtb \
|
|
||||||
sun8i-v40-bananapi-m2-berry.dtb
|
|
||||||
dtb-$(CONFIG_MACH_SUN8I_V3S) += \
|
|
||||||
+ sun8i-s3-pinecube.dtb \
|
|
||||||
sun8i-v3s-licheepi-zero.dtb
|
|
||||||
dtb-$(CONFIG_MACH_SUN50I_H5) += \
|
|
||||||
sun50i-h5-bananapi-m2-plus.dtb \
|
|
||||||
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
|
|
||||||
index d3755ae41a..735801ae1d 100644
|
|
||||||
--- a/board/sunxi/MAINTAINERS
|
|
||||||
+++ b/board/sunxi/MAINTAINERS
|
|
||||||
@@ -440,6 +440,11 @@ M: Vasily Khoruzhick <anarsoul@gmail.com>
|
|
||||||
S: Maintained
|
|
||||||
F: configs/pinebook_defconfig
|
|
||||||
|
|
||||||
+PINECUBE BOARD:
|
|
||||||
+M: Icenowy Zheng <icenowy@aosc.io>
|
|
||||||
+S: Maintained
|
|
||||||
+F: configs/pinecube_defconfig
|
|
||||||
+
|
|
||||||
PINE64 BOARDS
|
|
||||||
M: Andre Przywara <andre.przywara@arm.com>
|
|
||||||
S: Maintained
|
|
||||||
diff --git a/configs/pinecube_defconfig b/configs/pinecube_defconfig
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..a8c404f6b1
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/configs/pinecube_defconfig
|
|
||||||
@@ -0,0 +1,15 @@
|
|
||||||
+CONFIG_ARM=y
|
|
||||||
+CONFIG_ARCH_SUNXI=y
|
|
||||||
+CONFIG_SPL=y
|
|
||||||
+CONFIG_MACH_SUN8I_V3S=y
|
|
||||||
+CONFIG_SUNXI_DRAM_DDR3_1333=y
|
|
||||||
+CONFIG_DRAM_CLK=504
|
|
||||||
+CONFIG_DRAM_ODT_EN=y
|
|
||||||
+CONFIG_I2C0_ENABLE=y
|
|
||||||
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-s3-pinecube"
|
|
||||||
+CONFIG_SPL_I2C_SUPPORT=y
|
|
||||||
+# CONFIG_NETDEVICES is not set
|
|
||||||
+CONFIG_AXP209_POWER=y
|
|
||||||
+CONFIG_AXP_DCDC2_VOLT=1250
|
|
||||||
+CONFIG_AXP_DCDC3_VOLT=3300
|
|
||||||
+CONFIG_CONS_INDEX=3
|
|
54
tegra-TXx-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch
Normal file
54
tegra-TXx-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
From c8b9f0c2ca0a4270db811867ad051e75efa4100a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Wed, 5 Sep 2018 11:13:40 +0100
|
||||||
|
Subject: [PATCH] tegra: TXx: Add CONFIG_EFI_LOADER_BOUNCE_BUFFER
|
||||||
|
|
||||||
|
The Jetson TX series needs EFI loader bounce buffer enabled otherwise grub doesn't see
|
||||||
|
the storage when it loads.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
configs/p2371-2180_defconfig | 1 +
|
||||||
|
configs/p2771-0000-000_defconfig | 1 +
|
||||||
|
configs/p2771-0000-500_defconfig | 1 +
|
||||||
|
3 files changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
|
||||||
|
index d9dcf7e014..156a1cbcf9 100644
|
||||||
|
--- a/configs/p2371-2180_defconfig
|
||||||
|
+++ b/configs/p2371-2180_defconfig
|
||||||
|
@@ -5,6 +5,7 @@ CONFIG_TEGRA210=y
|
||||||
|
CONFIG_TARGET_P2371_2180=y
|
||||||
|
CONFIG_NR_DRAM_BANKS=2
|
||||||
|
CONFIG_OF_SYSTEM_SETUP=y
|
||||||
|
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
|
||||||
|
CONFIG_CONSOLE_MUX=y
|
||||||
|
CONFIG_SYS_STDIO_DEREGISTER=y
|
||||||
|
CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # "
|
||||||
|
diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig
|
||||||
|
index 2bf2e31359..15ea2fc6d6 100644
|
||||||
|
--- a/configs/p2771-0000-000_defconfig
|
||||||
|
+++ b/configs/p2771-0000-000_defconfig
|
||||||
|
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80080000
|
||||||
|
CONFIG_TEGRA186=y
|
||||||
|
CONFIG_NR_DRAM_BANKS=8
|
||||||
|
CONFIG_OF_SYSTEM_SETUP=y
|
||||||
|
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
|
||||||
|
CONFIG_CONSOLE_MUX=y
|
||||||
|
CONFIG_SYS_STDIO_DEREGISTER=y
|
||||||
|
CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # "
|
||||||
|
diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig
|
||||||
|
index 1e33c1f95b..a32b6a866e 100644
|
||||||
|
--- a/configs/p2771-0000-500_defconfig
|
||||||
|
+++ b/configs/p2771-0000-500_defconfig
|
||||||
|
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80080000
|
||||||
|
CONFIG_TEGRA186=y
|
||||||
|
CONFIG_NR_DRAM_BANKS=8
|
||||||
|
CONFIG_OF_SYSTEM_SETUP=y
|
||||||
|
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
|
||||||
|
CONFIG_CONSOLE_MUX=y
|
||||||
|
CONFIG_SYS_STDIO_DEREGISTER=y
|
||||||
|
CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # "
|
||||||
|
--
|
||||||
|
2.19.0.rc0
|
||||||
|
|
194
tegra-efi_loader-simplify-ifdefs.patch
Normal file
194
tegra-efi_loader-simplify-ifdefs.patch
Normal file
@ -0,0 +1,194 @@
|
|||||||
|
From patchwork Thu Aug 30 21:43:43 2018
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [U-Boot,V3,1/3] efi_loader: simplify ifdefs
|
||||||
|
X-Patchwork-Submitter: Stephen Warren <swarren@wwwdotorg.org>
|
||||||
|
X-Patchwork-Id: 964248
|
||||||
|
X-Patchwork-Delegate: agraf@suse.de
|
||||||
|
Message-Id: <20180830214345.2475-1-swarren@wwwdotorg.org>
|
||||||
|
To: Tom Rini <trini@konsulko.com>
|
||||||
|
Cc: Stephen Warren <swarren@nvidia.com>, xypron.glpk@gmx.de, agraf@suse.de,
|
||||||
|
u-boot@lists.denx.de, Tom Warren <twarren@nvidia.com>
|
||||||
|
Date: Thu, 30 Aug 2018 15:43:43 -0600
|
||||||
|
From: Stephen Warren <swarren@wwwdotorg.org>
|
||||||
|
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||||
|
|
||||||
|
From: Stephen Warren <swarren@nvidia.com>
|
||||||
|
|
||||||
|
Use CONFIG_IS_ENABLED(EFI_LOADER) to avoid explicitly checking CONFIG_SPL
|
||||||
|
too. This simplifies the conditional.
|
||||||
|
|
||||||
|
Signed-off-by: Stephen Warren <swarren@nvidia.com>
|
||||||
|
---
|
||||||
|
v3: New patch.
|
||||||
|
---
|
||||||
|
arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +-
|
||||||
|
arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +-
|
||||||
|
arch/x86/lib/e820.c | 4 ++--
|
||||||
|
include/efi_loader.h | 6 +++---
|
||||||
|
4 files changed, 7 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
|
||||||
|
index 052e0708d454..be00bd55ab68 100644
|
||||||
|
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
|
||||||
|
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
|
||||||
|
@@ -835,7 +835,7 @@ int dram_init_banksize(void)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)
|
||||||
|
+#if CONFIG_IS_ENABLED(EFI_LOADER)
|
||||||
|
void efi_add_known_memory(void)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
|
||||||
|
index fc9de73bcef4..c9c2c3f6d3e8 100644
|
||||||
|
--- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
|
||||||
|
+++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
|
||||||
|
@@ -135,7 +135,7 @@ remove_psci_node:
|
||||||
|
|
||||||
|
fdt_add_mem_rsv(blob, (uintptr_t)&secondary_boot_code,
|
||||||
|
*boot_code_size);
|
||||||
|
-#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)
|
||||||
|
+#if CONFIG_IS_ENABLED(EFI_LOADER)
|
||||||
|
efi_add_memory_map((uintptr_t)&secondary_boot_code,
|
||||||
|
ALIGN(*boot_code_size, EFI_PAGE_SIZE) >> EFI_PAGE_SHIFT,
|
||||||
|
EFI_RESERVED_MEMORY_TYPE, false);
|
||||||
|
diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c
|
||||||
|
index 8b34f677d96d..d6ae2c4e9d77 100644
|
||||||
|
--- a/arch/x86/lib/e820.c
|
||||||
|
+++ b/arch/x86/lib/e820.c
|
||||||
|
@@ -36,7 +36,7 @@ __weak unsigned int install_e820_map(unsigned int max_entries,
|
||||||
|
return 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)
|
||||||
|
+#if CONFIG_IS_ENABLED(EFI_LOADER)
|
||||||
|
void efi_add_known_memory(void)
|
||||||
|
{
|
||||||
|
struct e820_entry e820[E820MAX];
|
||||||
|
@@ -72,4 +72,4 @@ void efi_add_known_memory(void)
|
||||||
|
efi_add_memory_map(start, pages, type, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-#endif /* defined(EFI_LOADER) && !defined(CONFIG_SPL_BUILD) */
|
||||||
|
+#endif /* CONFIG_IS_ENABLED(EFI_LOADER) */
|
||||||
|
diff --git a/include/efi_loader.h b/include/efi_loader.h
|
||||||
|
index f162adfff7e2..b46babf9316f 100644
|
||||||
|
--- a/include/efi_loader.h
|
||||||
|
+++ b/include/efi_loader.h
|
||||||
|
@@ -13,7 +13,7 @@
|
||||||
|
#include <efi_api.h>
|
||||||
|
|
||||||
|
/* No need for efi loader support in SPL */
|
||||||
|
-#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)
|
||||||
|
+#if CONFIG_IS_ENABLED(EFI_LOADER)
|
||||||
|
|
||||||
|
#include <linux/list.h>
|
||||||
|
|
||||||
|
@@ -460,7 +460,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor,
|
||||||
|
void *efi_bootmgr_load(struct efi_device_path **device_path,
|
||||||
|
struct efi_device_path **file_path);
|
||||||
|
|
||||||
|
-#else /* defined(EFI_LOADER) && !defined(CONFIG_SPL_BUILD) */
|
||||||
|
+#else /* CONFIG_IS_ENABLED(EFI_LOADER) */
|
||||||
|
|
||||||
|
/* Without CONFIG_EFI_LOADER we don't have a runtime section, stub it out */
|
||||||
|
#define __efi_runtime_data
|
||||||
|
@@ -477,6 +477,6 @@ static inline void efi_set_bootdev(const char *dev, const char *devnr,
|
||||||
|
static inline void efi_net_set_dhcp_ack(void *pkt, int len) { }
|
||||||
|
static inline void efi_print_image_infos(void *pc) { }
|
||||||
|
|
||||||
|
-#endif /* CONFIG_EFI_LOADER && !CONFIG_SPL_BUILD */
|
||||||
|
+#endif /* CONFIG_IS_ENABLED(EFI_LOADER) */
|
||||||
|
|
||||||
|
#endif /* _EFI_LOADER_H */
|
||||||
|
|
||||||
|
From patchwork Thu Aug 30 21:43:44 2018
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [U-Boot, V3,
|
||||||
|
2/3] ARM: tegra: reserve unmapped RAM so EFI doesn't use it
|
||||||
|
X-Patchwork-Submitter: Stephen Warren <swarren@wwwdotorg.org>
|
||||||
|
X-Patchwork-Id: 964249
|
||||||
|
X-Patchwork-Delegate: agraf@suse.de
|
||||||
|
Message-Id: <20180830214345.2475-2-swarren@wwwdotorg.org>
|
||||||
|
To: Tom Rini <trini@konsulko.com>
|
||||||
|
Cc: Stephen Warren <swarren@nvidia.com>, xypron.glpk@gmx.de, agraf@suse.de,
|
||||||
|
u-boot@lists.denx.de, Tom Warren <twarren@nvidia.com>
|
||||||
|
Date: Thu, 30 Aug 2018 15:43:44 -0600
|
||||||
|
From: Stephen Warren <swarren@wwwdotorg.org>
|
||||||
|
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||||
|
|
||||||
|
From: Stephen Warren <swarren@nvidia.com>
|
||||||
|
|
||||||
|
Tegra U-Boot ensures that board_get_usable_ram_top() never returns a value
|
||||||
|
over 4GB, since some peripherals can't access such addresses. However, on
|
||||||
|
systems with more than 2GB of RAM, RAM bank 1 does describe this extra
|
||||||
|
RAM, so that Linux (or whatever OS) can use it, subject to DMA
|
||||||
|
limitations. Since board_get_usable_ram_top() points at the top of RAM
|
||||||
|
bank 0, the memory locations describes by RAM bank 1 are not mapped by
|
||||||
|
U-Boot's MMU configuration, and so cannot be used for anything.
|
||||||
|
|
||||||
|
For some completely inexplicable reason, U-Boot's EFI support ignores the
|
||||||
|
value returned by board_get_usable_ram_top(), and EFI memory allocation
|
||||||
|
routines will return values above U-Boot's RAM top. This causes U-Boot to
|
||||||
|
crash when it accesses that RAM, since it isn't mapped by the MMU. One
|
||||||
|
use-case where this happens is TFTP download of a file on Jetson TX1
|
||||||
|
(p2371-2180).
|
||||||
|
|
||||||
|
This change explicitly tells the EFI code that this extra RAM should not
|
||||||
|
be used, thus avoiding the crash.
|
||||||
|
|
||||||
|
A previous attempt to make EFI honor board_get_usable_ram_top() was
|
||||||
|
rejected. So, this patch will need to be replicated for any board that
|
||||||
|
implements board_get_usable_ram_top().
|
||||||
|
|
||||||
|
Fixes: aa909462d018 ("efi_loader: efi_allocate_pages is too restrictive")
|
||||||
|
Signed-off-by: Stephen Warren <swarren@nvidia.com>
|
||||||
|
---
|
||||||
|
v3:
|
||||||
|
- Use shift not divide for page count calculation.
|
||||||
|
- Enhance ifdef to avoid EFI references from SPL builds.
|
||||||
|
v2:
|
||||||
|
- Don't hard-code EFI page size.
|
||||||
|
- Register RAM as a boot services data rather than reserved.
|
||||||
|
---
|
||||||
|
arch/arm/mach-tegra/board2.c | 14 ++++++++++++++
|
||||||
|
1 file changed, 14 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
|
||||||
|
index 421a71b3014d..12257a42b51b 100644
|
||||||
|
--- a/arch/arm/mach-tegra/board2.c
|
||||||
|
+++ b/arch/arm/mach-tegra/board2.c
|
||||||
|
@@ -6,6 +6,7 @@
|
||||||
|
|
||||||
|
#include <common.h>
|
||||||
|
#include <dm.h>
|
||||||
|
+#include <efi_loader.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <ns16550.h>
|
||||||
|
#include <usb.h>
|
||||||
|
@@ -210,6 +211,19 @@ int board_early_init_f(void)
|
||||||
|
|
||||||
|
int board_late_init(void)
|
||||||
|
{
|
||||||
|
+#if CONFIG_IS_ENABLED(EFI_LOADER)
|
||||||
|
+ if (gd->bd->bi_dram[1].start) {
|
||||||
|
+ /*
|
||||||
|
+ * Only bank 0 is below board_get_usable_ram_top(), so all of
|
||||||
|
+ * bank 1 is not mapped by the U-Boot MMU configuration, and so
|
||||||
|
+ * we must prevent EFI from using it.
|
||||||
|
+ */
|
||||||
|
+ efi_add_memory_map(gd->bd->bi_dram[1].start,
|
||||||
|
+ gd->bd->bi_dram[1].size >> EFI_PAGE_SHIFT,
|
||||||
|
+ EFI_BOOT_SERVICES_DATA, false);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
|
||||||
|
if (tegra_cpu_is_non_secure()) {
|
||||||
|
printf("CPU is in NS mode\n");
|
||||||
|
|
472
tegra-fix-tx1.patch
Normal file
472
tegra-fix-tx1.patch
Normal file
@ -0,0 +1,472 @@
|
|||||||
|
From a2872b1e2f81e04f92f0970e18c6c8a40640eea8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Wed, 5 Sep 2018 12:11:40 +0100
|
||||||
|
Subject: [PATCH] tegra fix tx1
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/include/asm/arch-tegra/xusb-padctl.h | 1 +
|
||||||
|
arch/arm/mach-tegra/board.c | 4 +-
|
||||||
|
arch/arm/mach-tegra/board2.c | 12 ++++
|
||||||
|
arch/arm/mach-tegra/dt-setup.c | 5 +-
|
||||||
|
arch/arm/mach-tegra/gpu.c | 2 +
|
||||||
|
.../mach-tegra/{tegra186 => }/nvtboot_board.c | 70 +++++++++++++++++++
|
||||||
|
.../mach-tegra/{tegra186 => }/nvtboot_ll.S | 0
|
||||||
|
.../mach-tegra/{tegra186 => }/nvtboot_mem.c | 0
|
||||||
|
arch/arm/mach-tegra/tegra186/Makefile | 6 +-
|
||||||
|
arch/arm/mach-tegra/tegra210/Makefile | 3 +
|
||||||
|
arch/arm/mach-tegra/tegra210/clock.c | 19 -----
|
||||||
|
arch/arm/mach-tegra/tegra210/xusb-padctl.c | 68 +++++++++++-------
|
||||||
|
arch/arm/mach-tegra/xusb-padctl-dummy.c | 4 ++
|
||||||
|
configs/p2371-0000_defconfig | 2 +-
|
||||||
|
configs/p2371-2180_defconfig | 2 +-
|
||||||
|
configs/p2571_defconfig | 2 +-
|
||||||
|
16 files changed, 146 insertions(+), 54 deletions(-)
|
||||||
|
rename arch/arm/mach-tegra/{tegra186 => }/nvtboot_board.c (84%)
|
||||||
|
rename arch/arm/mach-tegra/{tegra186 => }/nvtboot_ll.S (100%)
|
||||||
|
rename arch/arm/mach-tegra/{tegra186 => }/nvtboot_mem.c (100%)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/include/asm/arch-tegra/xusb-padctl.h b/arch/arm/include/asm/arch-tegra/xusb-padctl.h
|
||||||
|
index deccdf455d..7e14d8109d 100644
|
||||||
|
--- a/arch/arm/include/asm/arch-tegra/xusb-padctl.h
|
||||||
|
+++ b/arch/arm/include/asm/arch-tegra/xusb-padctl.h
|
||||||
|
@@ -16,6 +16,7 @@ struct tegra_xusb_phy;
|
||||||
|
struct tegra_xusb_phy *tegra_xusb_phy_get(unsigned int type);
|
||||||
|
|
||||||
|
void tegra_xusb_padctl_init(void);
|
||||||
|
+void tegra_xusb_padctl_exit(void);
|
||||||
|
int tegra_xusb_phy_prepare(struct tegra_xusb_phy *phy);
|
||||||
|
int tegra_xusb_phy_enable(struct tegra_xusb_phy *phy);
|
||||||
|
int tegra_xusb_phy_disable(struct tegra_xusb_phy *phy);
|
||||||
|
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
|
||||||
|
index f8fc042a1d..ddef228831 100644
|
||||||
|
--- a/arch/arm/mach-tegra/board.c
|
||||||
|
+++ b/arch/arm/mach-tegra/board.c
|
||||||
|
@@ -35,7 +35,7 @@ enum {
|
||||||
|
|
||||||
|
static bool from_spl __attribute__ ((section(".data")));
|
||||||
|
|
||||||
|
-#ifndef CONFIG_SPL_BUILD
|
||||||
|
+#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_TEGRA210)
|
||||||
|
void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3)
|
||||||
|
{
|
||||||
|
from_spl = r0 != UBOOT_NOT_LOADED_FROM_SPL;
|
||||||
|
@@ -66,6 +66,7 @@ bool tegra_cpu_is_non_secure(void)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if !defined(CONFIG_ARM64)
|
||||||
|
/* Read the RAM size directly from the memory controller */
|
||||||
|
static phys_size_t query_sdram_size(void)
|
||||||
|
{
|
||||||
|
@@ -122,6 +123,7 @@ int dram_init(void)
|
||||||
|
gd->ram_size = query_sdram_size();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
static int uart_configs[] = {
|
||||||
|
#if defined(CONFIG_TEGRA20)
|
||||||
|
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
|
||||||
|
index 421a71b301..22ecd99760 100644
|
||||||
|
--- a/arch/arm/mach-tegra/board2.c
|
||||||
|
+++ b/arch/arm/mach-tegra/board2.c
|
||||||
|
@@ -171,6 +171,12 @@ int board_init(void)
|
||||||
|
return nvidia_board_init();
|
||||||
|
}
|
||||||
|
|
||||||
|
+void board_cleanup_before_linux(void)
|
||||||
|
+{
|
||||||
|
+ /* power down UPHY PLL */
|
||||||
|
+ tegra_xusb_padctl_exit();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#ifdef CONFIG_BOARD_EARLY_INIT_F
|
||||||
|
static void __gpio_early_init(void)
|
||||||
|
{
|
||||||
|
@@ -220,9 +226,14 @@ int board_late_init(void)
|
||||||
|
#endif
|
||||||
|
start_cpu_fan();
|
||||||
|
|
||||||
|
+#if defined(CONFIG_TEGRA210)
|
||||||
|
+ tegra_soc_board_init_late();
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef CONFIG_TEGRA210
|
||||||
|
/*
|
||||||
|
* In some SW environments, a memory carve-out exists to house a secure
|
||||||
|
* monitor, a trusted OS, and/or various statically allocated media buffers.
|
||||||
|
@@ -348,3 +359,4 @@ ulong board_get_usable_ram_top(ulong total_size)
|
||||||
|
{
|
||||||
|
return CONFIG_SYS_SDRAM_BASE + usable_ram_size_below_4g();
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
diff --git a/arch/arm/mach-tegra/dt-setup.c b/arch/arm/mach-tegra/dt-setup.c
|
||||||
|
index 8ac723f41e..a961fab20f 100644
|
||||||
|
--- a/arch/arm/mach-tegra/dt-setup.c
|
||||||
|
+++ b/arch/arm/mach-tegra/dt-setup.c
|
||||||
|
@@ -12,12 +12,10 @@
|
||||||
|
*/
|
||||||
|
int ft_system_setup(void *blob, bd_t *bd)
|
||||||
|
{
|
||||||
|
+#if !defined(CONFIG_ARM64)
|
||||||
|
const char *gpu_compats[] = {
|
||||||
|
#if defined(CONFIG_TEGRA124)
|
||||||
|
"nvidia,gk20a",
|
||||||
|
-#endif
|
||||||
|
-#if defined(CONFIG_TEGRA210)
|
||||||
|
- "nvidia,gm20b",
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
int i, ret;
|
||||||
|
@@ -28,6 +26,7 @@ int ft_system_setup(void *blob, bd_t *bd)
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c
|
||||||
|
index e047f67821..3b8c1a0434 100644
|
||||||
|
--- a/arch/arm/mach-tegra/gpu.c
|
||||||
|
+++ b/arch/arm/mach-tegra/gpu.c
|
||||||
|
@@ -17,6 +17,7 @@ static bool _configured;
|
||||||
|
|
||||||
|
void tegra_gpu_config(void)
|
||||||
|
{
|
||||||
|
+#if !defined(CONFIG_ARM64)
|
||||||
|
struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE;
|
||||||
|
|
||||||
|
#if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
|
||||||
|
@@ -34,6 +35,7 @@ void tegra_gpu_config(void)
|
||||||
|
debug("configured VPR\n");
|
||||||
|
|
||||||
|
_configured = true;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(CONFIG_OF_LIBFDT)
|
||||||
|
diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_board.c b/arch/arm/mach-tegra/nvtboot_board.c
|
||||||
|
similarity index 84%
|
||||||
|
rename from arch/arm/mach-tegra/tegra186/nvtboot_board.c
|
||||||
|
rename to arch/arm/mach-tegra/nvtboot_board.c
|
||||||
|
index 83c0e931ea..7b98b502ef 100644
|
||||||
|
--- a/arch/arm/mach-tegra/tegra186/nvtboot_board.c
|
||||||
|
+++ b/arch/arm/mach-tegra/nvtboot_board.c
|
||||||
|
@@ -5,6 +5,7 @@
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <common.h>
|
||||||
|
+#include <linux/ctype.h>
|
||||||
|
#include <fdt_support.h>
|
||||||
|
#include <fdtdec.h>
|
||||||
|
#include <asm/arch/tegra.h>
|
||||||
|
@@ -270,6 +271,27 @@ static void set_calculated_env_vars(void)
|
||||||
|
free(vars);
|
||||||
|
}
|
||||||
|
|
||||||
|
+char *strstrip(char *s)
|
||||||
|
+{
|
||||||
|
+ size_t size;
|
||||||
|
+ char *end;
|
||||||
|
+
|
||||||
|
+ size = strlen(s);
|
||||||
|
+
|
||||||
|
+ if (!size)
|
||||||
|
+ return s;
|
||||||
|
+
|
||||||
|
+ end = s + size - 1;
|
||||||
|
+ while (end >= s && isblank(*end))
|
||||||
|
+ end--;
|
||||||
|
+ *(end + 1) = '\0';
|
||||||
|
+
|
||||||
|
+ while (*s && isblank(*s))
|
||||||
|
+ s++;
|
||||||
|
+
|
||||||
|
+ return s;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int set_fdt_addr(void)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
@@ -283,6 +305,7 @@ static int set_fdt_addr(void)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if defined(CONFIG_TEGRA186)
|
||||||
|
/*
|
||||||
|
* Attempt to use /chosen/nvidia,ether-mac in the nvtboot DTB to U-Boot's
|
||||||
|
* ethaddr environment variable if possible.
|
||||||
|
@@ -316,6 +339,49 @@ static int set_ethaddr_from_nvtboot(void)
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+static int set_cbootargs(void)
|
||||||
|
+{
|
||||||
|
+ const void *nvtboot_blob = (void *)nvtboot_boot_x0;
|
||||||
|
+ const void *prop;
|
||||||
|
+ char *bargs, *s;
|
||||||
|
+ int node, len, ret = 0;
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Save the bootargs passed in the DTB by the previous bootloader
|
||||||
|
+ * (CBoot) to the env. (pointer in reg x0)
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+ debug("%s: nvtboot_blob = %p\n", __func__, nvtboot_blob);
|
||||||
|
+
|
||||||
|
+ node = fdt_path_offset(nvtboot_blob, "/chosen");
|
||||||
|
+ if (node < 0) {
|
||||||
|
+ pr_err("Can't find /chosen node in nvtboot DTB");
|
||||||
|
+ return node;
|
||||||
|
+ }
|
||||||
|
+ debug("%s: found 'chosen' node: %d\n", __func__, node);
|
||||||
|
+
|
||||||
|
+ prop = fdt_getprop(nvtboot_blob, node, "bootargs", &len);
|
||||||
|
+ if (!prop) {
|
||||||
|
+ pr_err("Can't find /chosen/bootargs property in nvtboot DTB");
|
||||||
|
+ return -ENOENT;
|
||||||
|
+ }
|
||||||
|
+ debug("%s: found 'bootargs' property, len =%d\n", __func__, len);
|
||||||
|
+
|
||||||
|
+ /* CBoot seems to add trailing whitespace - strip it here */
|
||||||
|
+ s = strdup((char *)prop);
|
||||||
|
+ bargs = strstrip(s);
|
||||||
|
+ debug("%s: bootargs = %s!\n", __func__, bargs);
|
||||||
|
+
|
||||||
|
+ /* Set cbootargs to env for later use by extlinux files */
|
||||||
|
+ ret = env_set("cbootargs", bargs);
|
||||||
|
+ if (ret)
|
||||||
|
+ printf("Failed to set cbootargs from cboot DTB: %d\n", ret);
|
||||||
|
+
|
||||||
|
+ free(s);
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
|
||||||
|
int tegra_soc_board_init_late(void)
|
||||||
|
{
|
||||||
|
@@ -325,8 +391,12 @@ int tegra_soc_board_init_late(void)
|
||||||
|
* extlinux.conf or boot script content.
|
||||||
|
*/
|
||||||
|
set_fdt_addr();
|
||||||
|
+#if defined(CONFIG_TEGRA186)
|
||||||
|
/* Ignore errors here; not all cases care about Ethernet addresses */
|
||||||
|
set_ethaddr_from_nvtboot();
|
||||||
|
+#endif
|
||||||
|
+ /* Save CBoot bootargs to env */
|
||||||
|
+ set_cbootargs();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_ll.S b/arch/arm/mach-tegra/nvtboot_ll.S
|
||||||
|
similarity index 100%
|
||||||
|
rename from arch/arm/mach-tegra/tegra186/nvtboot_ll.S
|
||||||
|
rename to arch/arm/mach-tegra/nvtboot_ll.S
|
||||||
|
diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_mem.c b/arch/arm/mach-tegra/nvtboot_mem.c
|
||||||
|
similarity index 100%
|
||||||
|
rename from arch/arm/mach-tegra/tegra186/nvtboot_mem.c
|
||||||
|
rename to arch/arm/mach-tegra/nvtboot_mem.c
|
||||||
|
diff --git a/arch/arm/mach-tegra/tegra186/Makefile b/arch/arm/mach-tegra/tegra186/Makefile
|
||||||
|
index 56f3378ece..1a43ef7a45 100644
|
||||||
|
--- a/arch/arm/mach-tegra/tegra186/Makefile
|
||||||
|
+++ b/arch/arm/mach-tegra/tegra186/Makefile
|
||||||
|
@@ -4,6 +4,6 @@
|
||||||
|
|
||||||
|
obj-y += ../board186.o
|
||||||
|
obj-y += cache.o
|
||||||
|
-obj-y += nvtboot_board.o
|
||||||
|
-obj-y += nvtboot_ll.o
|
||||||
|
-obj-y += nvtboot_mem.o
|
||||||
|
+obj-y += ../nvtboot_board.o
|
||||||
|
+obj-y += ../nvtboot_ll.o
|
||||||
|
+obj-y += ../nvtboot_mem.o
|
||||||
|
diff --git a/arch/arm/mach-tegra/tegra210/Makefile b/arch/arm/mach-tegra/tegra210/Makefile
|
||||||
|
index b6012fc7ba..6de6d810eb 100644
|
||||||
|
--- a/arch/arm/mach-tegra/tegra210/Makefile
|
||||||
|
+++ b/arch/arm/mach-tegra/tegra210/Makefile
|
||||||
|
@@ -8,5 +8,8 @@
|
||||||
|
obj-y += clock.o
|
||||||
|
obj-y += funcmux.o
|
||||||
|
obj-y += pinmux.o
|
||||||
|
+obj-y += ../nvtboot_board.o
|
||||||
|
+obj-y += ../nvtboot_ll.o
|
||||||
|
+obj-y += ../nvtboot_mem.o
|
||||||
|
obj-y += xusb-padctl.o
|
||||||
|
obj-y += ../xusb-padctl-common.o
|
||||||
|
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
|
||||||
|
index 06068c4b7b..341c97f16d 100644
|
||||||
|
--- a/arch/arm/mach-tegra/tegra210/clock.c
|
||||||
|
+++ b/arch/arm/mach-tegra/tegra210/clock.c
|
||||||
|
@@ -1235,25 +1235,6 @@ int tegra_plle_enable(void)
|
||||||
|
value &= ~PLLE_SS_CNTL_INTERP_RESET;
|
||||||
|
writel(value, NV_PA_CLK_RST_BASE + PLLE_SS_CNTL);
|
||||||
|
|
||||||
|
- /* 7. Enable HW power sequencer for PLLE */
|
||||||
|
-
|
||||||
|
- value = readl(NV_PA_CLK_RST_BASE + PLLE_MISC);
|
||||||
|
- value &= ~PLLE_MISC_IDDQ_SWCTL;
|
||||||
|
- writel(value, NV_PA_CLK_RST_BASE + PLLE_MISC);
|
||||||
|
-
|
||||||
|
- value = readl(NV_PA_CLK_RST_BASE + PLLE_AUX);
|
||||||
|
- value &= ~PLLE_AUX_SS_SWCTL;
|
||||||
|
- value &= ~PLLE_AUX_ENABLE_SWCTL;
|
||||||
|
- value |= PLLE_AUX_SS_SEQ_INCLUDE;
|
||||||
|
- value |= PLLE_AUX_USE_LOCKDET;
|
||||||
|
- writel(value, NV_PA_CLK_RST_BASE + PLLE_AUX);
|
||||||
|
-
|
||||||
|
- /* 8. Wait 1 us */
|
||||||
|
-
|
||||||
|
- udelay(1);
|
||||||
|
- value |= PLLE_AUX_SEQ_ENABLE;
|
||||||
|
- writel(value, NV_PA_CLK_RST_BASE + PLLE_AUX);
|
||||||
|
-
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
|
||||||
|
index ab6684f027..64dc297ae2 100644
|
||||||
|
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
|
||||||
|
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
|
||||||
|
@@ -170,6 +170,17 @@ static int phy_unprepare(struct tegra_xusb_phy *phy)
|
||||||
|
return tegra_xusb_padctl_disable(phy->padctl);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX 0x28
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE (1 << 0)
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK0 (1 << 1)
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK1 (1 << 2)
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK2 (1 << 3)
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK3 (1 << 4)
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK4 (1 << 5)
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK5 (1 << 6)
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK6 (1 << 7)
|
||||||
|
+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_SATA_PAD_IDDQ_DISABLE_MASK0 (1 << 8)
|
||||||
|
+
|
||||||
|
#define XUSB_PADCTL_UPHY_PLL_P0_CTL1 0x360
|
||||||
|
#define XUSB_PADCTL_UPHY_PLL_P0_CTL1_FREQ_NDIV_MASK (0xff << 20)
|
||||||
|
#define XUSB_PADCTL_UPHY_PLL_P0_CTL1_FREQ_NDIV(x) (((x) & 0xff) << 20)
|
||||||
|
@@ -366,31 +377,6 @@ static int pcie_phy_enable(struct tegra_xusb_phy *phy)
|
||||||
|
value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL8_RCAL_CLK_EN;
|
||||||
|
padctl_writel(padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL8);
|
||||||
|
|
||||||
|
- value = readl(NV_PA_CLK_RST_BASE + CLK_RST_XUSBIO_PLL_CFG0);
|
||||||
|
- value &= ~CLK_RST_XUSBIO_PLL_CFG0_PADPLL_RESET_SWCTL;
|
||||||
|
- value &= ~CLK_RST_XUSBIO_PLL_CFG0_CLK_ENABLE_SWCTL;
|
||||||
|
- value |= CLK_RST_XUSBIO_PLL_CFG0_PADPLL_USE_LOCKDET;
|
||||||
|
- value |= CLK_RST_XUSBIO_PLL_CFG0_PADPLL_SLEEP_IDDQ;
|
||||||
|
- writel(value, NV_PA_CLK_RST_BASE + CLK_RST_XUSBIO_PLL_CFG0);
|
||||||
|
-
|
||||||
|
- value = padctl_readl(padctl, XUSB_PADCTL_UPHY_PLL_P0_CTL1);
|
||||||
|
- value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL1_PWR_OVRD;
|
||||||
|
- padctl_writel(padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL1);
|
||||||
|
-
|
||||||
|
- value = padctl_readl(padctl, XUSB_PADCTL_UPHY_PLL_P0_CTL2);
|
||||||
|
- value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL2_CAL_OVRD;
|
||||||
|
- padctl_writel(padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL2);
|
||||||
|
-
|
||||||
|
- value = padctl_readl(padctl, XUSB_PADCTL_UPHY_PLL_P0_CTL8);
|
||||||
|
- value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL8_RCAL_OVRD;
|
||||||
|
- padctl_writel(padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL8);
|
||||||
|
-
|
||||||
|
- udelay(1);
|
||||||
|
-
|
||||||
|
- value = readl(NV_PA_CLK_RST_BASE + CLK_RST_XUSBIO_PLL_CFG0);
|
||||||
|
- value |= CLK_RST_XUSBIO_PLL_CFG0_SEQ_ENABLE;
|
||||||
|
- writel(value, NV_PA_CLK_RST_BASE + CLK_RST_XUSBIO_PLL_CFG0);
|
||||||
|
-
|
||||||
|
debug("< %s()\n", __func__);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -454,3 +440,35 @@ void tegra_xusb_padctl_init(void)
|
||||||
|
ret = tegra_xusb_process_nodes(nodes, count, &tegra210_socdata);
|
||||||
|
debug("%s: done, ret=%d\n", __func__, ret);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+void tegra_xusb_padctl_exit(void)
|
||||||
|
+{
|
||||||
|
+ u32 value;
|
||||||
|
+
|
||||||
|
+ debug("> %s\n", __func__);
|
||||||
|
+
|
||||||
|
+ value = padctl_readl(&padctl, XUSB_PADCTL_USB3_PAD_MUX);
|
||||||
|
+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE;
|
||||||
|
+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK0;
|
||||||
|
+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK1;
|
||||||
|
+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK2;
|
||||||
|
+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK3;
|
||||||
|
+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK4;
|
||||||
|
+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK5;
|
||||||
|
+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK6;
|
||||||
|
+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_SATA_PAD_IDDQ_DISABLE_MASK0;
|
||||||
|
+ padctl_writel(&padctl, value, XUSB_PADCTL_USB3_PAD_MUX);
|
||||||
|
+
|
||||||
|
+ value = padctl_readl(&padctl, XUSB_PADCTL_UPHY_PLL_P0_CTL1);
|
||||||
|
+ value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL1_IDDQ;
|
||||||
|
+ value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL1_SLEEP_MASK;
|
||||||
|
+ value |= XUSB_PADCTL_UPHY_PLL_P0_CTL1_SLEEP(3);
|
||||||
|
+ value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL1_ENABLE;
|
||||||
|
+ padctl_writel(&padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL1);
|
||||||
|
+
|
||||||
|
+ reset_set_enable(PERIPH_ID_PEX_USB_UPHY, 1);
|
||||||
|
+ while (padctl.enable)
|
||||||
|
+ tegra_xusb_padctl_disable(&padctl);
|
||||||
|
+
|
||||||
|
+ debug("< %s()\n", __func__);
|
||||||
|
+}
|
||||||
|
diff --git a/arch/arm/mach-tegra/xusb-padctl-dummy.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c
|
||||||
|
index 3ec27a2e3a..f2d90302f6 100644
|
||||||
|
--- a/arch/arm/mach-tegra/xusb-padctl-dummy.c
|
||||||
|
+++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c
|
||||||
|
@@ -36,3 +36,7 @@ int __weak tegra_xusb_phy_unprepare(struct tegra_xusb_phy *phy)
|
||||||
|
void __weak tegra_xusb_padctl_init(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+void __weak tegra_xusb_padctl_exit(void)
|
||||||
|
+{
|
||||||
|
+}
|
||||||
|
diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
|
||||||
|
index 02a7569205..d9b8be15e7 100644
|
||||||
|
--- a/configs/p2371-0000_defconfig
|
||||||
|
+++ b/configs/p2371-0000_defconfig
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
CONFIG_ARM=y
|
||||||
|
CONFIG_TEGRA=y
|
||||||
|
-CONFIG_SYS_TEXT_BASE=0x80110000
|
||||||
|
+CONFIG_SYS_TEXT_BASE=0x80080000
|
||||||
|
CONFIG_TEGRA210=y
|
||||||
|
CONFIG_TARGET_P2371_0000=y
|
||||||
|
CONFIG_NR_DRAM_BANKS=2
|
||||||
|
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
|
||||||
|
index 156a1cbcf9..602c5c1fad 100644
|
||||||
|
--- a/configs/p2371-2180_defconfig
|
||||||
|
+++ b/configs/p2371-2180_defconfig
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
CONFIG_ARM=y
|
||||||
|
CONFIG_TEGRA=y
|
||||||
|
-CONFIG_SYS_TEXT_BASE=0x80110000
|
||||||
|
+CONFIG_SYS_TEXT_BASE=0x80080000
|
||||||
|
CONFIG_TEGRA210=y
|
||||||
|
CONFIG_TARGET_P2371_2180=y
|
||||||
|
CONFIG_NR_DRAM_BANKS=2
|
||||||
|
diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
|
||||||
|
index 5cbb1c3201..29929e2d99 100644
|
||||||
|
--- a/configs/p2571_defconfig
|
||||||
|
+++ b/configs/p2571_defconfig
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
CONFIG_ARM=y
|
||||||
|
CONFIG_TEGRA=y
|
||||||
|
-CONFIG_SYS_TEXT_BASE=0x80110000
|
||||||
|
+CONFIG_SYS_TEXT_BASE=0x80080000
|
||||||
|
CONFIG_TEGRA210=y
|
||||||
|
CONFIG_TARGET_P2571=y
|
||||||
|
CONFIG_NR_DRAM_BANKS=2
|
||||||
|
--
|
||||||
|
2.19.0.rc0
|
||||||
|
|
52
tegra186-jetson-tx2-disable-onboard-emmc.patch
Normal file
52
tegra186-jetson-tx2-disable-onboard-emmc.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
From dbe4dff86520a1373076563d1bee5ada1d7fd7c5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Thu, 26 Apr 2018 16:56:54 +0100
|
||||||
|
Subject: [PATCH] tegra186: jetson-tx2: disable onboard emmc
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/tegra186-p2771-0000.dtsi | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/tegra186-p2771-0000.dtsi b/arch/arm/dts/tegra186-p2771-0000.dtsi
|
||||||
|
index a1319dc493..e220f086ee 100644
|
||||||
|
--- a/arch/arm/dts/tegra186-p2771-0000.dtsi
|
||||||
|
+++ b/arch/arm/dts/tegra186-p2771-0000.dtsi
|
||||||
|
@@ -53,7 +53,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
sdhci@3460000 {
|
||||||
|
- status = "okay";
|
||||||
|
+ status = "disabled";
|
||||||
|
bus-width = <8>;
|
||||||
|
non-removable;
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
||||||
|
From 7bba3cc32c8b8b5d3688c42a803768761df0a23f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Wed, 1 Aug 2018 11:47:56 +0100
|
||||||
|
Subject: [PATCH] tegra210: Jetson TX1: disable onboard emmc
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/tegra210-p2371-2180.dts | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts
|
||||||
|
index da4349bd039..87ce030e701 100644
|
||||||
|
--- a/arch/arm/dts/tegra210-p2371-2180.dts
|
||||||
|
+++ b/arch/arm/dts/tegra210-p2371-2180.dts
|
||||||
|
@@ -80,7 +80,7 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
sdhci@700b0600 {
|
||||||
|
- status = "okay";
|
||||||
|
+ status = "disabled";
|
||||||
|
bus-width = <8>;
|
||||||
|
non-removable;
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
380
uboot-tools.spec
380
uboot-tools.spec
@ -1,60 +1,64 @@
|
|||||||
%global candidate rc4
|
#global candidate rc3
|
||||||
|
|
||||||
Name: uboot-tools
|
Name: uboot-tools
|
||||||
Version: 2021.01
|
Version: 2018.09
|
||||||
Release: 0.4%{?candidate:.%{candidate}}%{?dist}
|
Release: 3%{?candidate:.%{candidate}}%{?dist}
|
||||||
Summary: U-Boot utilities
|
Summary: U-Boot utilities
|
||||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||||
URL: http://www.denx.de/wiki/U-Boot
|
URL: http://www.denx.de/wiki/U-Boot
|
||||||
|
|
||||||
Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
|
Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
|
||||||
Source1: arm-boards
|
Source1: arm-boards
|
||||||
Source2: arm-chromebooks
|
Source2: arm-chromebooks
|
||||||
Source3: aarch64-boards
|
Source3: aarch64-boards
|
||||||
Source4: aarch64-chromebooks
|
Source4: aarch64-chromebooks
|
||||||
|
Source5: 10-devicetree.install
|
||||||
|
|
||||||
# Fedoraisms patches
|
# Fedoraisms patches
|
||||||
# Needed to find DT on boot partition that's not the first partition
|
Patch1: uefi-use-Fedora-specific-path-name.patch
|
||||||
Patch1: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
|
||||||
# Needed due to issues with shim
|
# general fixes
|
||||||
Patch2: uefi-use-Fedora-specific-path-name.patch
|
Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||||
# RPi - uses RPI firmware device tree for HAT support
|
Patch3: usb-kbd-fixes.patch
|
||||||
Patch3: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
|
||||||
# Ajust the U-Boot offsets in SPL to take less space
|
|
||||||
#Patch4: rockchip-spl-u-boot-itb-offset.patch
|
|
||||||
|
|
||||||
# Board fixes and enablement
|
# Board fixes and enablement
|
||||||
Patch5: Raspberry-Pi-400-Compute-Module-4-support.patch
|
Patch10: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||||
Patch6: rng-Add-iProc-RNG200-driver.patch
|
Patch11: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch
|
||||||
# AllWinner improvements
|
Patch12: rockchip-make_fit_atf-use-elf-entry-point.patch
|
||||||
Patch10: AllWinner-PineTab.patch
|
Patch13: rk3399-Rock960-Ficus-board-support.patch
|
||||||
Patch11: sunxi-add-PineCube-board.patch
|
Patch14: dragonboard-fixes.patch
|
||||||
Patch12: 0001-Fixes-for-AllWinner-ethernet-network-interfaces.patch
|
Patch15: tegra186-jetson-tx2-disable-onboard-emmc.patch
|
||||||
# TI fixes
|
Patch16: tegra-efi_loader-simplify-ifdefs.patch
|
||||||
Patch13: 0001-Fix-BeagleAI-detection.patch
|
Patch17: tegra-TXx-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch
|
||||||
# Rockchips improvements
|
Patch18: tegra-fix-tx1.patch
|
||||||
Patch14: arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch
|
Patch19: sunxi-DT-A64-add-Pine64-LTS-support.patch
|
||||||
Patch15: rk3399-Pinebook-pro-EDP-support.patch
|
Patch20: rpi-add-3Aplus.patch
|
||||||
|
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
BuildRequires: dtc
|
BuildRequires: dtc
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
# Requirements for building on el7
|
# Added for .el7 rebuild, so newer gcc is used
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
BuildRequires: devtoolset-7-build
|
BuildRequires: devtoolset-7-build
|
||||||
BuildRequires: devtoolset-7-binutils
|
BuildRequires: devtoolset-7-binutils
|
||||||
BuildRequires: devtoolset-7-gcc
|
BuildRequires: devtoolset-7-gcc
|
||||||
|
%else
|
||||||
|
BuildRequires: gcc
|
||||||
|
%endif
|
||||||
|
BuildRequires: flex bison
|
||||||
|
BuildRequires: git-core
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
%if 0%{?fedora}
|
||||||
|
BuildRequires: python-unversioned-command
|
||||||
|
%endif
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel
|
||||||
BuildRequires: python2-setuptools
|
BuildRequires: python2-setuptools
|
||||||
BuildRequires: python2-libfdt
|
BuildRequires: python2-libfdt
|
||||||
|
%if 0%{?rhel} == 7
|
||||||
|
BuildRequires: python-pyelftools
|
||||||
%else
|
%else
|
||||||
BuildRequires: gcc
|
BuildRequires: python2-pyelftools
|
||||||
BuildRequires: python3-devel
|
|
||||||
BuildRequires: python3-setuptools
|
|
||||||
BuildRequires: python3-libfdt
|
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: flex bison
|
|
||||||
BuildRequires: openssl-devel
|
|
||||||
BuildRequires: SDL-devel
|
BuildRequires: SDL-devel
|
||||||
BuildRequires: swig
|
BuildRequires: swig
|
||||||
%ifarch %{arm} aarch64
|
%ifarch %{arm} aarch64
|
||||||
@ -63,7 +67,9 @@ BuildRequires: vboot-utils
|
|||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
BuildRequires: arm-trusted-firmware-armv8
|
BuildRequires: arm-trusted-firmware-armv8
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Requires: dtc
|
Requires: dtc
|
||||||
|
Requires: systemd
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains a few U-Boot utilities - mkimage for creating boot images
|
This package contains a few U-Boot utilities - mkimage for creating boot images
|
||||||
@ -71,24 +77,48 @@ and fw_printenv/fw_setenv for manipulating the boot environment variables.
|
|||||||
|
|
||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
%package -n uboot-images-armv8
|
%package -n uboot-images-armv8
|
||||||
Summary: U-Boot firmware images for aarch64 boards
|
Summary: u-boot bootloader images for aarch64 boards
|
||||||
|
Requires: uboot-tools
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description -n uboot-images-armv8
|
%description -n uboot-images-armv8
|
||||||
U-Boot firmware binaries for aarch64 boards
|
u-boot bootloader binaries for aarch64 boards
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{arm}
|
%ifarch %{arm}
|
||||||
%package -n uboot-images-armv7
|
%package -n uboot-images-armv7
|
||||||
Summary: U-Boot firmware images for armv7 boards
|
Summary: u-boot bootloader images for armv7 boards
|
||||||
|
Requires: uboot-tools
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description -n uboot-images-armv7
|
%description -n uboot-images-armv7
|
||||||
U-Boot firmware binaries for armv7 boards
|
u-boot bootloader binaries for armv7 boards
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch %{arm} aarch64
|
||||||
|
%package -n uboot-images-elf
|
||||||
|
Summary: u-boot bootloader images for armv7 boards
|
||||||
|
Requires: uboot-tools
|
||||||
|
Obsoletes: uboot-images-qemu
|
||||||
|
Provides: uboot-images-qemu
|
||||||
|
|
||||||
|
%description -n uboot-images-elf
|
||||||
|
u-boot bootloader ELF binaries for use with qemu and other platforms
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n u-boot-%{version}%{?candidate:-%{candidate}}
|
%setup -q -n u-boot-%{version}%{?candidate:-%{candidate}}
|
||||||
|
|
||||||
|
git init
|
||||||
|
git config --global gc.auto 0
|
||||||
|
git config user.email "noone@example.com"
|
||||||
|
git config user.name "no one"
|
||||||
|
git add .
|
||||||
|
git commit -a -q -m "%{version} baseline"
|
||||||
|
git am %{patches} </dev/null
|
||||||
|
git config --unset user.email
|
||||||
|
git config --unset user.name
|
||||||
|
rm -rf .git
|
||||||
|
|
||||||
cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 .
|
cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 .
|
||||||
|
|
||||||
@ -106,35 +136,37 @@ do
|
|||||||
echo "Building board: $board"
|
echo "Building board: $board"
|
||||||
mkdir builds/$(echo $board)/
|
mkdir builds/$(echo $board)/
|
||||||
# ATF selection, needs improving, suggestions of ATF SoC to Board matrix welcome
|
# ATF selection, needs improving, suggestions of ATF SoC to Board matrix welcome
|
||||||
sun50i=(a64-olinuxino amarula_a64_relic bananapi_m2_plus_h5 bananapi_m64 libretech_all_h3_cc_h5 nanopi_a64 nanopi_neo2 nanopi_neo_plus2 orangepi_pc2 orangepi_prime orangepi_win orangepi_zero_plus orangepi_zero_plus2 pine64-lts pine64_plus pinebook pinephone pinetab sopine_baseboard teres_i)
|
sun50i=(a64-olinuxino bananapi_m64 libretech_all_h3_cc_h5 nanopi_neo2 nanopi_neo_plus2 orangepi_pc2 orangepi_prime orangepi_win orangepi_zero_plus orangepi_zero_plus2 pine64_plus sopine_baseboard)
|
||||||
if [[ " ${sun50i[*]} " == *" $board "* ]]; then
|
if [[ " ${sun50i[*]} " == *" $board "* ]]; then
|
||||||
echo "Board: $board using sun50i_a64"
|
echo "Board: $board using sun50i_a64"
|
||||||
cp /usr/share/arm-trusted-firmware/sun50i_a64/* builds/$(echo $board)/
|
cp /usr/share/arm-trusted-firmware/sun50i_a64/* builds/$(echo $board)/
|
||||||
fi
|
fi
|
||||||
sun50h6=(orangepi_lite2 orangepi_one_plus pine_h64)
|
sun50i=(orangepi_one_plus pine_h64)
|
||||||
if [[ " ${sun50h6[*]} " == *" $board "* ]]; then
|
if [[ " ${sun50i[*]} " == *" $board "* ]]; then
|
||||||
echo "Board: $board using sun50i_h6"
|
echo "Board: $board using sun50i_h6"
|
||||||
cp /usr/share/arm-trusted-firmware/sun50i_h6/* builds/$(echo $board)/
|
cp /usr/share/arm-trusted-firmware/sun50i_h6/* builds/$(echo $board)/
|
||||||
fi
|
fi
|
||||||
rk3328=(evb-rk3328 rock64-rk3328 rock-pi-e-rk3328 roc-cc-rk3328)
|
rk3399=(evb-rk3399 firefly-rk3399 rock960-rk3399)
|
||||||
if [[ " ${rk3328[*]} " == *" $board "* ]]; then
|
|
||||||
echo "Board: $board using rk3328"
|
|
||||||
cp /usr/share/arm-trusted-firmware/rk3328/* builds/$(echo $board)/
|
|
||||||
fi
|
|
||||||
rk3399=(evb-rk3399 ficus-rk3399 firefly-rk3399 khadas-edge-captain-rk3399 khadas-edge-rk3399 khadas-edge-v-rk3399 nanopc-t4-rk3399 nanopi-m4-2gb-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 orangepi-rk3399 pinebook-pro-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4c-rk3399 rock-pi-4-rk3399 rock-pi-n10-rk3399pro rockpro64-rk3399 roc-pc-mezzanine-rk3399 roc-pc-rk3399)
|
|
||||||
if [[ " ${rk3399[*]} " == *" $board "* ]]; then
|
if [[ " ${rk3399[*]} " == *" $board "* ]]; then
|
||||||
echo "Board: $board using rk3399"
|
echo "Board: $board using rk3399"
|
||||||
cp /usr/share/arm-trusted-firmware/rk3399/* builds/$(echo $board)/
|
cp /usr/share/arm-trusted-firmware/rk3399/* builds/$(echo $board)/
|
||||||
fi
|
fi
|
||||||
# End ATF
|
# End ATF
|
||||||
make $(echo $board)_defconfig O=builds/$(echo $board)/
|
make $(echo $board)_defconfig O=builds/$(echo $board)/
|
||||||
%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" O=builds/$(echo $board)/
|
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/$(echo $board)/
|
||||||
|
rk33xx=(evb-rk3399 firefly-rk3399)
|
||||||
|
if [[ " ${rk33xx[*]} " == *" $board "* ]]; then
|
||||||
|
echo "Board: $board using rk33xx"
|
||||||
|
make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" u-boot.itb V=1 O=builds/$(echo $board)/
|
||||||
|
builds/$(echo $board)/tools/mkimage -n rk3399 -T rksd -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_sd.img
|
||||||
|
builds/$(echo $board)/tools/mkimage -n rk3399 -T rkspi -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_spi.img
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-only_defconfig O=builds/
|
make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" defconfig V=1 O=builds/
|
||||||
%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-all O=builds/
|
make HOSTCC="gcc $RPM_OPT_FLAGS" %{?_smp_mflags} CROSS_COMPILE="" tools-all V=1 O=builds/
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||||
@ -146,7 +178,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
|
|||||||
for board in $(cat %{_arch}-boards)
|
for board in $(cat %{_arch}-boards)
|
||||||
do
|
do
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||||
for file in u-boot.bin u-boot.dtb u-boot.img u-boot-dtb.img u-boot.itb u-boot-sunxi-with-spl.bin u-boot-rockchip.bin idbloader.img spl/boot.bin spl/sunxi-spl.bin
|
for file in spl/*spl.bin u-boot.bin u-boot.dtb u-boot-dtb.img u-boot.img u-boot.itb spl/sunxi-spl.bin
|
||||||
do
|
do
|
||||||
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
||||||
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||||
@ -159,7 +191,7 @@ done
|
|||||||
for board in $(cat %{_arch}-boards)
|
for board in $(cat %{_arch}-boards)
|
||||||
do
|
do
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||||
for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/*spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-spl.kwb u-boot-rockchip.bin u-boot-sunxi-with-spl.bin spl/boot.bin
|
for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/smdkv310-spl.bin spl/*spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-nodtb-tegra.bin u-boot-spl.kwb u-boot-sunxi-with-spl.bin
|
||||||
do
|
do
|
||||||
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
||||||
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||||
@ -186,7 +218,47 @@ do
|
|||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
for tool in bmp_logo dumpimage env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr gen_ethaddr_crc img2srec mkenvimage mkimage mksunxiboot ncb proftool sunxi-spl-image-builder ubsha1 xway-swap-bytes
|
%ifarch aarch64
|
||||||
|
for board in $(cat %{_arch}-boards)
|
||||||
|
do
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||||
|
for file in MLO SPL spl/arndale-spl.bin spl/origen-spl.bin spl/smdkv310-spl.bin u-boot.bin u-boot.dtb u-boot-dtb-tegra.bin u-boot.img u-boot.imx u-boot-nodtb-tegra.bin u-boot-spl.kwb u-boot-sunxi-with-spl.bin spl_sd.img spl_spi.img
|
||||||
|
do
|
||||||
|
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
||||||
|
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# ELF binaries
|
||||||
|
%ifarch %{arm}
|
||||||
|
for board in vexpress_ca15_tc2 vexpress_ca9x4
|
||||||
|
do
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
|
||||||
|
for file in u-boot
|
||||||
|
do
|
||||||
|
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
||||||
|
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch aarch64
|
||||||
|
for board in $(cat %{_arch}-boards)
|
||||||
|
do
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
|
||||||
|
for file in u-boot
|
||||||
|
do
|
||||||
|
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
||||||
|
install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/elf/$(echo $board)/
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
%endif
|
||||||
|
|
||||||
|
for tool in bmp_logo dumpimage easylogo/easylogo env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr gen_ethaddr_crc img2srec mkenvimage mkimage mksunxiboot ncb proftool sunxi-spl-image-builder ubsha1 xway-swap-bytes
|
||||||
do
|
do
|
||||||
install -p -m 0755 builds/tools/$tool $RPM_BUILD_ROOT%{_bindir}
|
install -p -m 0755 builds/tools/$tool $RPM_BUILD_ROOT%{_bindir}
|
||||||
done
|
done
|
||||||
@ -197,8 +269,13 @@ install -p -m 0755 builds/tools/env/fw_printenv $RPM_BUILD_ROOT%{_bindir}
|
|||||||
|
|
||||||
install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
||||||
|
|
||||||
|
# systemd kernel-install script for device tree
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/lib/kernel/install.d/
|
||||||
|
install -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/lib/kernel/install.d/
|
||||||
|
|
||||||
# Copy sone useful docs over
|
# Copy sone useful docs over
|
||||||
mkdir -p builds/docs
|
mkdir -p builds/docs
|
||||||
|
cp -p board/amlogic/odroid-c2/README builds/docs/README.odroid-c2
|
||||||
cp -p board/hisilicon/hikey/README builds/docs/README.hikey
|
cp -p board/hisilicon/hikey/README builds/docs/README.hikey
|
||||||
cp -p board/hisilicon/hikey/README builds/docs/README.hikey
|
cp -p board/hisilicon/hikey/README builds/docs/README.hikey
|
||||||
cp -p board/Marvell/db-88f6820-gp/README builds/docs/README.mvebu-db-88f6820
|
cp -p board/Marvell/db-88f6820-gp/README builds/docs/README.mvebu-db-88f6820
|
||||||
@ -215,135 +292,154 @@ cp -p board/warp/README builds/docs/README.warp
|
|||||||
cp -p board/warp7/README builds/docs/README.warp7
|
cp -p board/warp7/README builds/docs/README.warp7
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README doc/README.kwbimage doc/README.distro doc/README.gpt
|
%doc README doc/README.imximage doc/README.kwbimage doc/README.distro doc/README.gpt
|
||||||
%doc doc/README.odroid doc/README.rockchip doc/uefi doc/uImage.FIT doc/arch/arm64.rst
|
%doc doc/README.odroid doc/README.rockchip doc/README.uefi doc/uImage.FIT doc/README.arm64
|
||||||
%doc doc/README.chromium builds/docs/*
|
%doc doc/README.chromium builds/docs/*
|
||||||
%doc doc/board/amlogic/ doc/board/rockchip/
|
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_mandir}/man1/mkimage.1*
|
%{_mandir}/man1/mkimage.1*
|
||||||
|
/lib/kernel/install.d/10-devicetree.install
|
||||||
%dir %{_datadir}/uboot/
|
%dir %{_datadir}/uboot/
|
||||||
%config(noreplace) %{_sysconfdir}/fw_env.config
|
%config(noreplace) %{_sysconfdir}/fw_env.config
|
||||||
|
|
||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
%files -n uboot-images-armv8
|
%files -n uboot-images-armv8
|
||||||
%{_datadir}/uboot/*
|
%{_datadir}/uboot/*
|
||||||
|
%exclude %{_datadir}/uboot/elf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{arm}
|
%ifarch %{arm}
|
||||||
%files -n uboot-images-armv7
|
%files -n uboot-images-armv7
|
||||||
%{_datadir}/uboot/*
|
%{_datadir}/uboot/*
|
||||||
|
%exclude %{_datadir}/uboot/elf
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch %{arm} aarch64
|
||||||
|
%files -n uboot-images-elf
|
||||||
|
%{_datadir}/uboot/elf
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sun Dec 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.4.rc4
|
* Sun Mar 17 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2018.09-3
|
||||||
- Update to 2021.01 RC4
|
- Drop problematic UEFI patch
|
||||||
- Latest RPi-400/CM4 support patch
|
|
||||||
|
|
||||||
* Tue Dec 15 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.3.rc3
|
* Sun Jan 27 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2018.09-2
|
||||||
- Update to 2021.01 RC3
|
- Add support for Raspberry Pi 3A+
|
||||||
- Latest RPi-400/CM4 support patch
|
|
||||||
- Re-enable previously disabled device support
|
|
||||||
|
|
||||||
* Mon Dec 14 2020 Javier Martinez Canillas <javierm@redhat.com> - 2021.01-0.2.rc2
|
* Sun Sep 30 2018 Pablo Greco <pablo@fliagreco.com.ar>
|
||||||
- Fix a "scan_dev_for_efi" not defined error
|
- Added conditional to enable devtoolset-7-gcc for .el7 build (Arrfab)
|
||||||
|
- Added conditional BR, python2-pyelftools is python-pyelftools in .el7 (Arrfab)
|
||||||
|
|
||||||
* Sun Nov 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.1.rc2
|
* Sun Sep 23 2018 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||||
- Update to 2021.01 RC2
|
- Update Rock960 patches, enable Rock960 Enterprise Edition (ficus)
|
||||||
- Latest Pinebook Pro display patches
|
|
||||||
- Initial RPi-400 support patch
|
|
||||||
- Update Fedora specific patches
|
|
||||||
|
|
||||||
* Sun Nov 8 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-3
|
* Mon Sep 10 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.09-1
|
||||||
- Fix SPI on Rockchip devices
|
- 2018.09
|
||||||
- Latest Pinebook Pro display patches
|
|
||||||
- Fix Keyboard and USB-A ports on Pinebook Pro
|
|
||||||
|
|
||||||
* Wed Oct 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-2
|
* Tue Sep 4 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.09-0.4.rc3
|
||||||
- Fix kernel installs for non EBBR systems
|
- 2018.09 RC3
|
||||||
- Fix for wired networks on some Allwinner devices
|
- Enable nanopi_neo_plus2, pine_h64, rock960-rk3399, a64-olinuxino
|
||||||
|
- Build against new upstream AllWinner ATF support
|
||||||
|
- Use firmware provided DT on Raspberry Pi
|
||||||
|
- Support for Pine64-LTS
|
||||||
|
|
||||||
* Tue Oct 06 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-1
|
* Tue Aug 14 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.09-0.2.rc2
|
||||||
- Update to 2020.10
|
- 2018.09 RC2
|
||||||
|
- Improve Jetson TX1 support
|
||||||
|
- Enable OrangePi 1+ and Avnet Ultra96
|
||||||
|
|
||||||
* Sun Sep 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.6.rc5
|
* Tue Jul 31 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.09-0.1.rc1
|
||||||
- Initial support for display output on Pinebook Pro
|
- 2018.09 RC1
|
||||||
|
|
||||||
* Tue Sep 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.5.rc5
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.07-2
|
||||||
- Update to 2020.10 RC5
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Sep 09 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.4.rc4
|
* Mon Jul 9 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.07-1
|
||||||
- Update to 2020.10 RC4
|
- 2018.07
|
||||||
|
|
||||||
* Wed Aug 19 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.3.rc2
|
* Tue Jul 3 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.07-0.4.rc3
|
||||||
- Enable a number of new Rockchip devices
|
- 2018.07 RC3
|
||||||
|
|
||||||
* Mon Aug 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.2.rc2
|
* Wed Jun 20 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.07-0.3.rc2
|
||||||
- Update to 2020.10 RC2
|
- 2018.07 RC2
|
||||||
|
- Enable Helios4
|
||||||
|
|
||||||
* Tue Jul 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.10-0.1.rc1
|
* Fri Jun 8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.07-0.2.rc1
|
||||||
- 2020.10 RC1
|
- Update sunxi MMC patch series, Tegra Nyan patch, SolidRun i.MX6 SoM rev 1.5 patch
|
||||||
|
|
||||||
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2020.07-2
|
* Tue Jun 5 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.07-0.1.rc1
|
||||||
- Use make macros
|
- 2018.07 RC1
|
||||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
- Enable Turris Mox, BananaPi m2 Berry, some Libretech boards
|
||||||
|
|
||||||
* Mon Jul 06 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-1
|
* Mon May 7 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-1
|
||||||
- 2020.07 GA
|
- 2018.05 GA
|
||||||
|
|
||||||
* Tue Jun 23 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.5.rc5
|
* Wed May 2 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.5.rc3
|
||||||
- 2020.07 RC5
|
- Build Xilnix ZynqMP zcu100 (96boards Ultra96)
|
||||||
|
|
||||||
* Thu Jun 18 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.4.rc4
|
* Tue May 1 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.4.rc3
|
||||||
- Update various patches to latest upstream
|
- 2018.05 RC3
|
||||||
|
|
||||||
* Wed Jun 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.3.rc4
|
* Thu Apr 26 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.3.rc2
|
||||||
- 2020.07 RC4
|
- uEFI improvements
|
||||||
- Minor updates and other fixes
|
- Fixes for Rockchips rk33xx 64 bit devices
|
||||||
|
- Build AllWinner 64 bit devices against new ATF
|
||||||
|
|
||||||
* Tue May 12 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.2.rc2
|
* Tue Apr 17 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.2.rc2
|
||||||
- 2020.07 RC2
|
- 2018.05 RC2
|
||||||
- Minor device updates
|
- Enable Raspberry Pi option to use firmware DT
|
||||||
|
|
||||||
* Wed Apr 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.07-0.1.rc1
|
* Sun Apr 8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.05-0.1.rc1
|
||||||
- 2020.07 RC1
|
- 2018.05 RC1
|
||||||
|
|
||||||
* Tue Apr 21 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-4
|
* Fri Apr 6 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-4
|
||||||
- Initial support for USB on Rasperry Pi 4
|
- Improvements for Raspberry Pi, AllWinner MMC perf, mvebu devices
|
||||||
|
|
||||||
* Tue Apr 21 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-3
|
* Tue Mar 20 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-3
|
||||||
- Ship u-boot-rockchip.bin for SPI flash
|
- Fix issue with certain MMC cards on Raspberry Pi
|
||||||
|
|
||||||
* Mon Apr 20 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-2
|
* Fri Mar 16 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-2
|
||||||
- Fix ATF for new aarch64 devices
|
- Add support for Raspberry Pi 3+
|
||||||
- Fix Wandboard board detection (rhbz 1825247)
|
|
||||||
- Fix mSD card on RockPro64
|
|
||||||
- Enable (inital) Pinebook Pro
|
|
||||||
|
|
||||||
* Tue Apr 14 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.04-1
|
* Tue Mar 13 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-1
|
||||||
- 2020.04
|
- 2018.03 GA
|
||||||
|
|
||||||
* Tue Apr 7 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.7-rc5
|
* Fri Mar 9 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.11.rc4
|
||||||
- 2020.04 RC5
|
- Enable support for Jetson TX2
|
||||||
|
|
||||||
* Tue Mar 31 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.6-rc4
|
* Thu Mar 8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.10.rc4
|
||||||
- 2020.04 RC4
|
- Fix for Raspberry Pi 2 boot
|
||||||
- Updates for NVIDIA Jetson platforms
|
|
||||||
- Support RNG for random seed for KASLR on some Rockchip devices
|
|
||||||
|
|
||||||
* Thu Mar 26 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.5-rc3
|
* Wed Mar 7 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.9.rc4
|
||||||
- Fix ext4 alignment issue seen on some NXP i.MX devices
|
- 2018.03 RC4
|
||||||
|
- Fixes for Raspberry Pi 3 boot
|
||||||
|
- Minor kernel install fixes
|
||||||
|
- Enable am335x_evm_usbspl for Beagle Pocket
|
||||||
|
- DragonBoard patch rebase
|
||||||
|
|
||||||
* Wed Feb 26 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.4-rc3
|
* Sun Mar 4 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.8.rc3
|
||||||
- 2020.04 RC3
|
- Add support for SoM rev 1.5 to mx6cuboxi
|
||||||
|
- Rebuild for new ATF 1.5 rc0 release
|
||||||
|
|
||||||
* Thu Feb 13 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.3-rc2
|
* Sun Feb 25 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.7.rc3
|
||||||
- 2020.04 RC2
|
- Build 64 bit Rockchips FIT images with ARM Trusted Firmware
|
||||||
|
|
||||||
* Sun Feb 2 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.2-rc1
|
* Tue Feb 20 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.6.rc3
|
||||||
- Update genet NIC driver
|
- 2018.03 RC3
|
||||||
|
|
||||||
* Wed Jan 29 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.04-0.1-rc1
|
* Fri Feb 16 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.5.rc2
|
||||||
- 2020.04 RC1
|
- A few upstream fixes
|
||||||
|
|
||||||
* Tue Jan 7 2020 Peter Robinson <pbrobinson@fedoraproject.org> 2020.01-1
|
* Thu Feb 15 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.4.rc2
|
||||||
- 2020.01
|
- Fix for GBps network on some AllWinner devices
|
||||||
|
|
||||||
|
* Tue Feb 13 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.3.rc2
|
||||||
|
- 2018.03 RC2
|
||||||
|
|
||||||
|
* Wed Feb 7 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.2.rc1
|
||||||
|
- Update uEFI patches
|
||||||
|
|
||||||
|
* Tue Jan 30 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.03-0.1.rc1
|
||||||
|
- 2018.03 RC1
|
||||||
|
|
||||||
|
* Tue Jan 9 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.01-1
|
||||||
|
- 2018.01
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From cc3700b5c65494547308df395fe63166ff48a1e3 Mon Sep 17 00:00:00 2001
|
From 8bc6f62541436ebaf87133792726d9b48f878d09 Mon Sep 17 00:00:00 2001
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
Date: Tue, 24 Nov 2020 10:35:48 +0000
|
Date: Tue, 5 Dec 2017 00:11:08 +0000
|
||||||
Subject: [PATCH 1/2] distro: load FDT from any partition on boot device
|
Subject: [PATCH] distro: load FDT from any partition on boot device
|
||||||
|
|
||||||
In the EFI_LOADER boot path, we were only checking the FAT partition
|
In the EFI_LOADER boot path, we were only checking the FAT partition
|
||||||
containing the EFI payload for dtb files. But this is somewhat of a
|
containing the EFI payload for dtb files. But this is somewhat of a
|
||||||
@ -22,17 +22,19 @@ knows) and SoC/board specific ${fdtfile} (which grub does not know).
|
|||||||
Signed-off-by: Rob Clark <robdclark@gmail.com>
|
Signed-off-by: Rob Clark <robdclark@gmail.com>
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
---
|
---
|
||||||
include/config_distro_bootcmd.h | 33 +++++++++++++++++++++++----------
|
include/config_distro_bootcmd.h | 34 +++++++++++++++++++++++-----------
|
||||||
1 file changed, 23 insertions(+), 10 deletions(-)
|
1 file changed, 23 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||||
index ff29ef5a905..769477cd80e 100644
|
index 7746366ec8..c87f7c2a42 100644
|
||||||
--- a/include/config_distro_bootcmd.h
|
--- a/include/config_distro_bootcmd.h
|
||||||
+++ b/include/config_distro_bootcmd.h
|
+++ b/include/config_distro_bootcmd.h
|
||||||
@@ -142,24 +142,37 @@
|
@@ -135,25 +135,37 @@
|
||||||
|
"fi\0" \
|
||||||
|
\
|
||||||
"load_efi_dtb=" \
|
"load_efi_dtb=" \
|
||||||
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
- "load ${devtype} ${devnum}:${distro_bootpart} " \
|
||||||
"${fdt_addr_r} ${prefix}${efi_fdtfile}\0" \
|
- "${fdt_addr_r} ${prefix}${efi_fdtfile}\0" \
|
||||||
+ "load ${devtype} ${devnum}:${dtb_devp} " \
|
+ "load ${devtype} ${devnum}:${dtb_devp} " \
|
||||||
+ "${fdt_addr_r} ${prefix}${efi_fdtfile} && " \
|
+ "${fdt_addr_r} ${prefix}${efi_fdtfile} && " \
|
||||||
+ "run boot_efi_binary\0" \
|
+ "run boot_efi_binary\0" \
|
||||||
@ -49,7 +51,6 @@ index ff29ef5a905..769477cd80e 100644
|
|||||||
- "run load_efi_dtb; " \
|
- "run load_efi_dtb; " \
|
||||||
- "fi;" \
|
- "fi;" \
|
||||||
- "done;" \
|
- "done;" \
|
||||||
- "run boot_efi_bootmgr;" \
|
|
||||||
+ "part list ${devtype} ${devnum} dtb_devplist; " \
|
+ "part list ${devtype} ${devnum} dtb_devplist; " \
|
||||||
+ "env exists dtb_devplist || setenv dtb_devplist " \
|
+ "env exists dtb_devplist || setenv dtb_devplist " \
|
||||||
+ "${distro_bootpart}; " \
|
+ "${distro_bootpart}; " \
|
||||||
@ -66,17 +67,17 @@ index ff29ef5a905..769477cd80e 100644
|
|||||||
+ "fi;" \
|
+ "fi;" \
|
||||||
+ "done; " \
|
+ "done; " \
|
||||||
+ "done; " \
|
+ "done; " \
|
||||||
+ "run boot_efi_bootmgr\0" \
|
+ "run boot_efi_binary\0" \
|
||||||
+ "scan_dev_for_efi=" \
|
+ "scan_dev_for_efi=" \
|
||||||
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
||||||
"efi/boot/"BOOTEFI_NAME"; then " \
|
"efi/fedora/"BOOTEFI_NAME"; then " \
|
||||||
"echo Found EFI removable media binary " \
|
"echo Found EFI removable media binary " \
|
||||||
"efi/boot/"BOOTEFI_NAME"; " \
|
"efi/fedora/"BOOTEFI_NAME"; " \
|
||||||
- "run boot_efi_binary; " \
|
- "run boot_efi_binary; " \
|
||||||
+ "run scan_dev_for_dtb; " \
|
+ "run scan_dev_for_dtb; " \
|
||||||
"echo EFI LOAD FAILED: continuing...; " \
|
"echo EFI LOAD FAILED: continuing...; " \
|
||||||
"fi; " \
|
"fi; " \
|
||||||
"setenv efi_fdtfile\0"
|
"setenv efi_fdtfile\0"
|
||||||
--
|
--
|
||||||
2.29.2
|
2.14.3
|
||||||
|
|
||||||
|
@ -1,50 +1,47 @@
|
|||||||
From d8fcb72d566b0ebca1613555ac13c0798817487e Mon Sep 17 00:00:00 2001
|
From 2b411f6edf298899098e2077a5ca2dfdaf3d882f Mon Sep 17 00:00:00 2001
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
Date: Tue, 24 Nov 2020 10:37:28 +0000
|
Date: Wed, 7 Feb 2018 12:37:58 +0000
|
||||||
Subject: [PATCH 2/2] use Fedora specific EFI path/name
|
Subject: [PATCH] use Fedora specific EFI path/name
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
---
|
---
|
||||||
include/config_distro_bootcmd.h | 10 +++++-----
|
include/config_distro_bootcmd.h | 8 ++++----
|
||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||||||
index 769477cd80e..22ce3685758 100644
|
index f567cebd38..7746366ec8 100644
|
||||||
--- a/include/config_distro_bootcmd.h
|
--- a/include/config_distro_bootcmd.h
|
||||||
+++ b/include/config_distro_bootcmd.h
|
+++ b/include/config_distro_bootcmd.h
|
||||||
@@ -92,9 +92,9 @@
|
@@ -93,7 +93,7 @@
|
||||||
|
|
||||||
#ifdef CONFIG_EFI_LOADER
|
#ifdef CONFIG_EFI_LOADER
|
||||||
#if defined(CONFIG_ARM64)
|
#if defined(CONFIG_ARM64)
|
||||||
-#define BOOTEFI_NAME "bootaa64.efi"
|
-#define BOOTEFI_NAME "bootaa64.efi"
|
||||||
+#define BOOTEFI_NAME "grubaa64.efi"
|
+#define BOOTEFI_NAME "grubaa64.efi"
|
||||||
#elif defined(CONFIG_ARM)
|
#elif defined(CONFIG_ARM)
|
||||||
-#define BOOTEFI_NAME "bootarm.efi"
|
#define BOOTEFI_NAME "bootarm.efi"
|
||||||
+#define BOOTEFI_NAME "grubarm.efi"
|
|
||||||
#elif defined(CONFIG_X86_RUN_32BIT)
|
#elif defined(CONFIG_X86_RUN_32BIT)
|
||||||
#define BOOTEFI_NAME "bootia32.efi"
|
@@ -127,7 +127,7 @@
|
||||||
#elif defined(CONFIG_X86_RUN_64BIT)
|
"bootefi bootmgr ${fdtcontroladdr};" \
|
||||||
@@ -132,7 +132,7 @@
|
"fi;" \
|
||||||
\
|
|
||||||
"boot_efi_binary=" \
|
|
||||||
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
||||||
- "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \
|
- "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \
|
||||||
+ "${kernel_addr_r} efi/fedora/"BOOTEFI_NAME"; " \
|
+ "${kernel_addr_r} efi/fedora/"BOOTEFI_NAME"; " \
|
||||||
"if fdt addr ${fdt_addr_r}; then " \
|
"if fdt addr ${fdt_addr_r}; then " \
|
||||||
"bootefi ${kernel_addr_r} ${fdt_addr_r};" \
|
"bootefi ${kernel_addr_r} ${fdt_addr_r};" \
|
||||||
"else " \
|
"else " \
|
||||||
@@ -169,9 +169,9 @@
|
@@ -150,9 +150,9 @@
|
||||||
"run boot_efi_bootmgr\0" \
|
"fi;" \
|
||||||
"scan_dev_for_efi=" \
|
"done;" \
|
||||||
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
||||||
- "efi/boot/"BOOTEFI_NAME"; then " \
|
- "efi/boot/"BOOTEFI_NAME"; then " \
|
||||||
+ "efi/fedora/"BOOTEFI_NAME"; then " \
|
+ "efi/fedora/"BOOTEFI_NAME"; then " \
|
||||||
"echo Found EFI removable media binary " \
|
"echo Found EFI removable media binary " \
|
||||||
- "efi/boot/"BOOTEFI_NAME"; " \
|
- "efi/boot/"BOOTEFI_NAME"; " \
|
||||||
+ "efi/fedora/"BOOTEFI_NAME"; " \
|
+ "efi/fedora/"BOOTEFI_NAME"; " \
|
||||||
"run scan_dev_for_dtb; " \
|
"run boot_efi_binary; " \
|
||||||
"echo EFI LOAD FAILED: continuing...; " \
|
"echo EFI LOAD FAILED: continuing...; " \
|
||||||
"fi; " \
|
"fi; " \
|
||||||
--
|
--
|
||||||
2.29.2
|
2.14.3
|
||||||
|
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
From a49845f198af088c4e5e0019edbf519344d78c97 Mon Sep 17 00:00:00 2001
|
From 1a8fa60aedff8a2368ac357a51dc15357065fabe Mon Sep 17 00:00:00 2001
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
Date: Tue, 4 Dec 2018 15:29:14 +0000
|
Date: Tue, 5 Dec 2017 00:11:54 +0000
|
||||||
Subject: [PATCH] usb kbd fixes
|
Subject: [PATCH 3/5] usb kbd fixes
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
---
|
---
|
||||||
common/usb_kbd.c | 66 +++++++++++++++++++++++++++++++++++------------
|
common/usb_kbd.c | 66 +++++++++++++++++++++++++++++++++++++++++--------------
|
||||||
include/console.h | 2 --
|
include/console.h | 2 --
|
||||||
2 files changed, 50 insertions(+), 18 deletions(-)
|
2 files changed, 50 insertions(+), 18 deletions(-)
|
||||||
|
|
||||||
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
|
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
|
||||||
index 020f0d4117f..47674ce4458 100644
|
index 8cbdba6ac2..82ad93f6ca 100644
|
||||||
--- a/common/usb_kbd.c
|
--- a/common/usb_kbd.c
|
||||||
+++ b/common/usb_kbd.c
|
+++ b/common/usb_kbd.c
|
||||||
@@ -518,25 +518,59 @@ static int probe_usb_keyboard(struct usb_device *dev)
|
@@ -516,25 +516,59 @@ static int probe_usb_keyboard(struct usb_device *dev)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
stdinname = env_get("stdin");
|
stdinname = env_get("stdin");
|
||||||
@ -87,8 +87,8 @@ index 020f0d4117f..47674ce4458 100644
|
|||||||
+#endif
|
+#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !CONFIG_IS_ENABLED(DM_USB)
|
#ifndef CONFIG_DM_USB
|
||||||
@@ -642,7 +676,7 @@ static int usb_kbd_remove(struct udevice *dev)
|
@@ -640,7 +674,7 @@ static int usb_kbd_remove(struct udevice *dev)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
err:
|
err:
|
||||||
@ -98,10 +98,10 @@ index 020f0d4117f..47674ce4458 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/include/console.h b/include/console.h
|
diff --git a/include/console.h b/include/console.h
|
||||||
index e935c601f12..6382ec8e0d6 100644
|
index cea29ed6dc..7dfd36d7d1 100644
|
||||||
--- a/include/console.h
|
--- a/include/console.h
|
||||||
+++ b/include/console.h
|
+++ b/include/console.h
|
||||||
@@ -56,8 +56,6 @@ int console_announce_r(void);
|
@@ -57,8 +57,6 @@ int console_announce_r(void);
|
||||||
/*
|
/*
|
||||||
* CONSOLE multiplexing.
|
* CONSOLE multiplexing.
|
||||||
*/
|
*/
|
||||||
@ -111,5 +111,5 @@ index e935c601f12..6382ec8e0d6 100644
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
--
|
--
|
||||||
2.19.2
|
2.14.3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user