Compare commits
109 Commits
master
...
f38-riscv6
Author | SHA1 | Date |
---|---|---|
David Abdurachmanov | c51dc973a7 | |
David Abdurachmanov | c0445d301e | |
David Abdurachmanov | dc05e9e1f8 | |
David Abdurachmanov | e1c599d630 | |
David Abdurachmanov | f890d0262b | |
Peter Robinson | 69626555b7 | |
Peter Robinson | 2a1c71298b | |
Peter Robinson | 92806ecb85 | |
Peter Robinson | 33708bf7f4 | |
Peter Robinson | 8e7afdbb87 | |
Peter Robinson | 8a0d41132e | |
Peter Robinson | 4adcd6c9bf | |
Peter Robinson | 7a9f14f8e7 | |
Peter Robinson | de2eac07ba | |
Peter Robinson | 65896be74a | |
Fedora Release Engineering | 8798072f53 | |
Peter Robinson | 8376d2cf3a | |
Peter Robinson | 5b281a96f0 | |
Peter Robinson | eee75bb934 | |
Peter Robinson | c811eec4b7 | |
Peter Robinson | d245dbb379 | |
Peter Robinson | bc28006c89 | |
Peter Robinson | 70b0c177c3 | |
Peter Robinson | 8bcd936f72 | |
Peter Robinson | 47aa93aa34 | |
Peter Robinson | a56399745c | |
Peter Robinson | 56a26f9cc4 | |
Peter Robinson | 716e4d578e | |
Peter Robinson | 3b11dffa4f | |
Peter Robinson | 6134477ebc | |
Peter Robinson | d2c989dc32 | |
Davide Cavalca | 48ddd14c80 | |
Peter Robinson | 8522759e85 | |
Peter Robinson | 8bfc149984 | |
Fedora Release Engineering | c7412f83bd | |
Peter Robinson | 6c3ac9b229 | |
Peter Robinson | 49a3b5d27c | |
Peter Robinson | dc41daecba | |
Peter Robinson | 832d64676b | |
Peter Robinson | cefa60ce7f | |
Peter Robinson | fa86e10d71 | |
Peter Robinson | 0e7b564081 | |
Peter Robinson | f0b776d4d6 | |
Peter Robinson | 41e28cf922 | |
Peter Robinson | f02cd13691 | |
Peter Robinson | 9cc572a2b0 | |
Peter Robinson | ab63b19049 | |
Peter Robinson | b6626c87f4 | |
Peter Robinson | 7b988dd8fc | |
Peter Robinson | 2a3a46103d | |
Peter Robinson | 1b64b89c2d | |
Peter Robinson | 6706eb16a4 | |
Javier Martinez Canillas | 359979e25b | |
Peter Robinson | be009d9316 | |
Peter Robinson | e06a81622d | |
Peter Robinson | 93f0ff8c4f | |
Peter Robinson | 18e07ba9f6 | |
Fedora Release Engineering | b27a96095d | |
Peter Robinson | c1b0bbe361 | |
Peter Robinson | cc4e21b64c | |
Peter Robinson | 1457c7c78e | |
Peter Robinson | d98cfa77d6 | |
Peter Robinson | c08df485fa | |
Peter Robinson | 89bd41507e | |
Peter Robinson | 9eb973e7d2 | |
Peter Robinson | 684d579249 | |
Javier Martinez Canillas | e708510df1 | |
Peter Robinson | 37df227bc0 | |
Peter Robinson | 6487c37f16 | |
Peter Robinson | 33afbf3788 | |
Peter Robinson | 82d32758b4 | |
Peter Robinson | b73fa7b980 | |
Sahana Prasad | ae47304273 | |
Peter Robinson | a320cf868c | |
Peter Robinson | c455dea8f2 | |
Peter Robinson | 319f8123df | |
Peter Robinson | e63667d6b3 | |
Peter Robinson | 2bd8d4cdb4 | |
Peter Robinson | e006fd5035 | |
Peter Robinson | 70da6a0757 | |
Peter Robinson | e3985d3d2e | |
Peter Robinson | dd361c8ed3 | |
Peter Robinson | 8cca325513 | |
Peter Robinson | 52be77ca6b | |
Peter Robinson | 6c925bc315 | |
Peter Robinson | 896c46870f | |
Peter Robinson | c74ab1fc05 | |
Peter Robinson | bff9338fe9 | |
Peter Robinson | d6fc5ecb4b | |
Peter Robinson | 6209cab21a | |
Peter Robinson | b6c02ba2ca | |
Peter Robinson | d512ddd572 | |
Peter Robinson | 060f78f396 | |
Peter Robinson | 610279571c | |
Peter Robinson | 2abadc5169 | |
Peter Robinson | f458c5418f | |
Peter Robinson | 3fb46c33cd | |
Peter Robinson | 422d33a878 | |
Dennis Gilmore | eb1de640aa | |
Peter Robinson | f9b692a09e | |
Peter Robinson | 53c3d27d79 | |
Peter Robinson | 82aabc8bb2 | |
Peter Robinson | a05d9090bf | |
Peter Robinson | 65ed4db407 | |
Fedora Release Engineering | 6be7eb2066 | |
Peter Robinson | 90614b00ce | |
Peter Robinson | 12eb6a489a | |
Peter Robinson | 74de6cf1a5 | |
Peter Robinson | f5f44b6446 |
|
@ -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
|
|
||||||
|
|
|
@ -0,0 +1,102 @@
|
||||||
|
From 71cc03c5c98c4d2dbf13061690f61394711ccc66 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Abdurachmanov <davidlt@rivosinc.com>
|
||||||
|
Date: Wed, 3 May 2023 07:33:11 +0000
|
||||||
|
Subject: [PATCH 1/3] Improve riscv defconfigs
|
||||||
|
|
||||||
|
- Enable "sbi" command.
|
||||||
|
- Enable SBI based reset and poweroff commands.
|
||||||
|
- Set max supported CPUs on QEMU targets to 32.
|
||||||
|
- Enable relocation and use firmware FDT/DTB (i.e. generated by QEMU) for QEMU targets.
|
||||||
|
|
||||||
|
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
|
||||||
|
---
|
||||||
|
configs/qemu-riscv64_defconfig | 8 ++++++++
|
||||||
|
configs/qemu-riscv64_smode_defconfig | 5 +++++
|
||||||
|
configs/qemu-riscv64_spl_defconfig | 3 +++
|
||||||
|
configs/sifive_unleashed_defconfig | 5 +++++
|
||||||
|
configs/sifive_unmatched_defconfig | 5 +++++
|
||||||
|
include/configs/qemu-riscv.h | 2 --
|
||||||
|
6 files changed, 26 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
|
||||||
|
index d64f3400..09816973 100644
|
||||||
|
--- a/configs/qemu-riscv64_defconfig
|
||||||
|
+++ b/configs/qemu-riscv64_defconfig
|
||||||
|
@@ -23,3 +23,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
|
CONFIG_DM_MTD=y
|
||||||
|
CONFIG_FLASH_SHOW_PROGRESS=0
|
||||||
|
CONFIG_SYS_MAX_FLASH_BANKS=2
|
||||||
|
+CONFIG_NR_CPUS=32
|
||||||
|
+CONFIG_USE_PREBOOT=y
|
||||||
|
+CONFIG_PREBOOT="cp.l ${fdtcontroladdr} ${fdt_addr_r} 0x20000;"
|
||||||
|
+CONFIG_CMD_SBI=y
|
||||||
|
+CONFIG_SYSRESET=y
|
||||||
|
+CONFIG_SYSRESET_SBI=y
|
||||||
|
+CONFIG_CMD_POWEROFF=y
|
||||||
|
+CONFIG_SYSRESET_CMD_POWEROFF=y
|
||||||
|
diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
|
||||||
|
index 53c2f489..c9bdc485 100644
|
||||||
|
--- a/configs/qemu-riscv64_smode_defconfig
|
||||||
|
+++ b/configs/qemu-riscv64_smode_defconfig
|
||||||
|
@@ -26,3 +26,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
|
CONFIG_DM_MTD=y
|
||||||
|
CONFIG_FLASH_SHOW_PROGRESS=0
|
||||||
|
CONFIG_SYS_MAX_FLASH_BANKS=2
|
||||||
|
+CONFIG_CMD_SBI=y
|
||||||
|
+CONFIG_SYSRESET=y
|
||||||
|
+CONFIG_SYSRESET_SBI=y
|
||||||
|
+CONFIG_CMD_POWEROFF=y
|
||||||
|
+CONFIG_SYSRESET_CMD_POWEROFF=y
|
||||||
|
diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig
|
||||||
|
index 9c8eb155..de65d4f0 100644
|
||||||
|
--- a/configs/qemu-riscv64_spl_defconfig
|
||||||
|
+++ b/configs/qemu-riscv64_spl_defconfig
|
||||||
|
@@ -28,3 +28,6 @@ CONFIG_DM_MTD=y
|
||||||
|
CONFIG_FLASH_SHOW_PROGRESS=0
|
||||||
|
CONFIG_SYS_MAX_FLASH_BANKS=2
|
||||||
|
# CONFIG_BINMAN_FDT is not set
|
||||||
|
+CONFIG_NR_CPUS=32
|
||||||
|
+CONFIG_USE_PREBOOT=y
|
||||||
|
+CONFIG_PREBOOT="cp.l ${fdtcontroladdr} ${fdt_addr_r} 0x20000;"
|
||||||
|
diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig
|
||||||
|
index ae0f9b42..c4958785 100644
|
||||||
|
--- a/configs/sifive_unleashed_defconfig
|
||||||
|
+++ b/configs/sifive_unleashed_defconfig
|
||||||
|
@@ -41,3 +41,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
|
CONFIG_SPL_DM_SEQ_ALIAS=y
|
||||||
|
CONFIG_SPL_CLK=y
|
||||||
|
CONFIG_DM_MTD=y
|
||||||
|
+CONFIG_CMD_SBI=y
|
||||||
|
+CONFIG_SYSRESET=y
|
||||||
|
+CONFIG_SYSRESET_SBI=y
|
||||||
|
+CONFIG_CMD_POWEROFF=y
|
||||||
|
+CONFIG_SYSRESET_CMD_POWEROFF=y
|
||||||
|
diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig
|
||||||
|
index c24feb68..74cdb4ea 100644
|
||||||
|
--- a/configs/sifive_unmatched_defconfig
|
||||||
|
+++ b/configs/sifive_unmatched_defconfig
|
||||||
|
@@ -63,3 +63,8 @@ CONFIG_DM_SCSI=y
|
||||||
|
CONFIG_USB=y
|
||||||
|
CONFIG_USB_XHCI_HCD=y
|
||||||
|
CONFIG_USB_XHCI_PCI=y
|
||||||
|
+CONFIG_CMD_SBI=y
|
||||||
|
+CONFIG_SYSRESET=y
|
||||||
|
+CONFIG_SYSRESET_SBI=y
|
||||||
|
+CONFIG_CMD_POWEROFF=y
|
||||||
|
+CONFIG_SYSRESET_CMD_POWEROFF=y
|
||||||
|
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
|
||||||
|
index 20135f56..23db7b6f 100644
|
||||||
|
--- a/include/configs/qemu-riscv.h
|
||||||
|
+++ b/include/configs/qemu-riscv.h
|
||||||
|
@@ -35,8 +35,6 @@
|
||||||
|
"qemu "
|
||||||
|
|
||||||
|
#define CFG_EXTRA_ENV_SETTINGS \
|
||||||
|
- "fdt_high=0xffffffffffffffff\0" \
|
||||||
|
- "initrd_high=0xffffffffffffffff\0" \
|
||||||
|
"kernel_addr_r=0x84000000\0" \
|
||||||
|
"kernel_comp_addr_r=0x88000000\0" \
|
||||||
|
"kernel_comp_size=0x4000000\0" \
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
|
@ -0,0 +1,104 @@
|
||||||
|
From 039f475da3e1e140ef5dd0c6d8dfb0676af0d39e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vincent Chen <vincent.chen@sifive.com>
|
||||||
|
Date: Wed, 3 May 2023 07:34:48 +0000
|
||||||
|
Subject: [PATCH 2/3] board: sifive: spl: Initialized the PWM setting in the
|
||||||
|
SPL stage
|
||||||
|
|
||||||
|
LEDs and multiple fans can be controlled by SPL. This patch ensures
|
||||||
|
that all fans have been enabled in the SPL stage. In addition, the
|
||||||
|
LED's color will be set to yellow.
|
||||||
|
---
|
||||||
|
board/sifive/unmatched/Makefile | 1 +
|
||||||
|
board/sifive/unmatched/pwm.c | 57 +++++++++++++++++++++++++++++++++
|
||||||
|
board/sifive/unmatched/spl.c | 2 ++
|
||||||
|
3 files changed, 60 insertions(+)
|
||||||
|
create mode 100644 board/sifive/unmatched/pwm.c
|
||||||
|
|
||||||
|
diff --git a/board/sifive/unmatched/Makefile b/board/sifive/unmatched/Makefile
|
||||||
|
index 13453300..5df01982 100644
|
||||||
|
--- a/board/sifive/unmatched/Makefile
|
||||||
|
+++ b/board/sifive/unmatched/Makefile
|
||||||
|
@@ -9,3 +9,4 @@ obj-y += spl.o
|
||||||
|
else
|
||||||
|
obj-y += unmatched.o
|
||||||
|
endif
|
||||||
|
+obj-y += pwm.o
|
||||||
|
diff --git a/board/sifive/unmatched/pwm.c b/board/sifive/unmatched/pwm.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000..e1cc0231
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/board/sifive/unmatched/pwm.c
|
||||||
|
@@ -0,0 +1,57 @@
|
||||||
|
+// SPDX-License-Identifier: GPL-2.0+
|
||||||
|
+/*
|
||||||
|
+ * Copyright (c) 2021, SiFive Inc
|
||||||
|
+ *
|
||||||
|
+ * Authors:
|
||||||
|
+ * Vincent Chen <vincent.chen@sifive.com>
|
||||||
|
+ * David Abdurachmanov <david.abdurachmanov@sifive.com>
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include <linux/io.h>
|
||||||
|
+#include <asm/arch/eeprom.h>
|
||||||
|
+
|
||||||
|
+struct pwm_sifive_regs {
|
||||||
|
+ unsigned int cfg; /* PWM configuration register */
|
||||||
|
+ unsigned int pad0; /* Reserved */
|
||||||
|
+ unsigned int cnt; /* PWM count register */
|
||||||
|
+ unsigned int pad1; /* Reserved */
|
||||||
|
+ unsigned int pwms; /* Scaled PWM count register */
|
||||||
|
+ unsigned int pad2; /* Reserved */
|
||||||
|
+ unsigned int pad3; /* Reserved */
|
||||||
|
+ unsigned int pad4; /* Reserved */
|
||||||
|
+ unsigned int cmp0; /* PWM 0 compare register */
|
||||||
|
+ unsigned int cmp1; /* PWM 1 compare register */
|
||||||
|
+ unsigned int cmp2; /* PWM 2 compare register */
|
||||||
|
+ unsigned int cmp3; /* PWM 3 compare register */
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+#define PWM0_BASE 0x10020000
|
||||||
|
+#define PWM1_BASE 0x10021000
|
||||||
|
+#define PWM_CFG_INIT 0x1000
|
||||||
|
+#define PWM_CMP_ENABLE_VAL 0x0
|
||||||
|
+#define PWM_CMP_DISABLE_VAL 0xffff
|
||||||
|
+
|
||||||
|
+void pwm_device_init(void)
|
||||||
|
+{
|
||||||
|
+ struct pwm_sifive_regs *pwm0, *pwm1;
|
||||||
|
+ pwm0 = (struct pwm_sifive_regs *)PWM0_BASE;
|
||||||
|
+ pwm1 = (struct pwm_sifive_regs *)PWM1_BASE;
|
||||||
|
+ writel(PWM_CMP_DISABLE_VAL, (void *)&pwm0->cmp0);
|
||||||
|
+ /* Set the 3-color PWM LEDs to yellow in SPL */
|
||||||
|
+ writel(PWM_CMP_ENABLE_VAL, (void *)&pwm0->cmp1);
|
||||||
|
+ writel(PWM_CMP_ENABLE_VAL, (void *)&pwm0->cmp2);
|
||||||
|
+ writel(PWM_CMP_DISABLE_VAL, (void *)&pwm0->cmp3);
|
||||||
|
+ writel(PWM_CFG_INIT, (void *)&pwm0->cfg);
|
||||||
|
+
|
||||||
|
+ writel(PWM_CMP_DISABLE_VAL, (void *)&pwm0->cmp3);
|
||||||
|
+ /* Turn on all the fans, (J21), (J23) and (J24), on the unmatched board */
|
||||||
|
+ /* The SoC fan(J21) on the rev3 board cannot be controled by PWM_COMP0,
|
||||||
|
+ so here sets the initial value of PWM_COMP0 as DISABLE */
|
||||||
|
+ if (get_pcb_revision_from_eeprom() == PCB_REVISION_REV3)
|
||||||
|
+ writel(PWM_CMP_DISABLE_VAL, (void *)&pwm1->cmp1);
|
||||||
|
+ else
|
||||||
|
+ writel(PWM_CMP_ENABLE_VAL, (void *)&pwm1->cmp1);
|
||||||
|
+ writel(PWM_CMP_ENABLE_VAL, (void *)&pwm1->cmp2);
|
||||||
|
+ writel(PWM_CMP_ENABLE_VAL, (void *)&pwm1->cmp3);
|
||||||
|
+ writel(PWM_CFG_INIT, (void *)&pwm1->cfg);
|
||||||
|
+}
|
||||||
|
diff --git a/board/sifive/unmatched/spl.c b/board/sifive/unmatched/spl.c
|
||||||
|
index 7c0beedc..f3a661a8 100644
|
||||||
|
--- a/board/sifive/unmatched/spl.c
|
||||||
|
+++ b/board/sifive/unmatched/spl.c
|
||||||
|
@@ -90,6 +90,8 @@ int spl_board_init_f(void)
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ pwm_device_init();
|
||||||
|
+
|
||||||
|
ret = spl_gemgxl_init();
|
||||||
|
if (ret) {
|
||||||
|
debug("Gigabit ethernet PHY (VSC8541) init failed: %d\n", ret);
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
|
@ -0,0 +1,123 @@
|
||||||
|
From e1dcf7e7a3b5c0e76171ba0b7145af12693adcc4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vincent Chen <vincent.chen@sifive.com>
|
||||||
|
Date: Wed, 3 May 2023 07:46:41 +0000
|
||||||
|
Subject: [PATCH 3/3] board: sifive: spl: Set remote thermal of TMP451 to 85
|
||||||
|
deg C for the unmatched board
|
||||||
|
|
||||||
|
For TMP451 on the unmatched board, the default value of the remote
|
||||||
|
thermal threshold is 108 deg C. This commit initilizes it to 85 deg C at SPL.
|
||||||
|
---
|
||||||
|
board/sifive/unmatched/spl.c | 29 +++++++++++++++++++++++++++++
|
||||||
|
configs/sifive_unmatched_defconfig | 3 +++
|
||||||
|
drivers/misc/Kconfig | 14 ++++++++++++++
|
||||||
|
include/configs/sifive-unmatched.h | 4 ++++
|
||||||
|
4 files changed, 50 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/board/sifive/unmatched/spl.c b/board/sifive/unmatched/spl.c
|
||||||
|
index f3a661a8..05ba5916 100644
|
||||||
|
--- a/board/sifive/unmatched/spl.c
|
||||||
|
+++ b/board/sifive/unmatched/spl.c
|
||||||
|
@@ -10,6 +10,8 @@
|
||||||
|
#include <spl.h>
|
||||||
|
#include <misc.h>
|
||||||
|
#include <log.h>
|
||||||
|
+#include <config.h>
|
||||||
|
+#include <i2c.h>
|
||||||
|
#include <linux/delay.h>
|
||||||
|
#include <linux/io.h>
|
||||||
|
#include <asm/gpio.h>
|
||||||
|
@@ -26,6 +28,27 @@
|
||||||
|
#define MODE_SELECT_SD 0xb
|
||||||
|
#define MODE_SELECT_MASK GENMASK(3, 0)
|
||||||
|
|
||||||
|
+#define TMP451_REMOTE_THERM_LIMIT_REG_OFFSET 0x19
|
||||||
|
+#define TMP451_REMOTE_THERM_LIMIT_INIT_VALUE 0x55
|
||||||
|
+
|
||||||
|
+static inline int init_tmp451_remote_therm_limit(void)
|
||||||
|
+{
|
||||||
|
+ struct udevice *dev;
|
||||||
|
+ unsigned char r_therm_limit = TMP451_REMOTE_THERM_LIMIT_INIT_VALUE;
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ ret = i2c_get_chip_for_busnum(CONFIG_SYS_TMP451_BUS_NUM,
|
||||||
|
+ CONFIG_SYS_I2C_TMP451_ADDR,
|
||||||
|
+ CONFIG_SYS_I2C_TMP451_ADDR_LEN,
|
||||||
|
+ &dev);
|
||||||
|
+
|
||||||
|
+ if (!ret)
|
||||||
|
+ ret = dm_i2c_write(dev, TMP451_REMOTE_THERM_LIMIT_REG_OFFSET,
|
||||||
|
+ &r_therm_limit,
|
||||||
|
+ sizeof(unsigned char));
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static inline int spl_reset_device_by_gpio(const char *label, int pin, int low_width)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
@@ -92,6 +115,12 @@ int spl_board_init_f(void)
|
||||||
|
|
||||||
|
pwm_device_init();
|
||||||
|
|
||||||
|
+ ret = init_tmp451_remote_therm_limit();
|
||||||
|
+ if (ret) {
|
||||||
|
+ debug("TMP451 remote THERM limit init failed: %d\n", ret);
|
||||||
|
+ goto end;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
ret = spl_gemgxl_init();
|
||||||
|
if (ret) {
|
||||||
|
debug("Gigabit ethernet PHY (VSC8541) init failed: %d\n", ret);
|
||||||
|
diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig
|
||||||
|
index 74cdb4ea..e843378c 100644
|
||||||
|
--- a/configs/sifive_unmatched_defconfig
|
||||||
|
+++ b/configs/sifive_unmatched_defconfig
|
||||||
|
@@ -68,3 +68,6 @@ CONFIG_SYSRESET=y
|
||||||
|
CONFIG_SYSRESET_SBI=y
|
||||||
|
CONFIG_CMD_POWEROFF=y
|
||||||
|
CONFIG_SYSRESET_CMD_POWEROFF=y
|
||||||
|
+CONFIG_SYS_TMP451_BUS_NUM=0
|
||||||
|
+CONFIG_SYS_I2C_TMP451_ADDR=0x4c
|
||||||
|
+CONFIG_SYS_I2C_TMP451_ADDR_LEN=1
|
||||||
|
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
|
||||||
|
index b5707a15..8ea6f014 100644
|
||||||
|
--- a/drivers/misc/Kconfig
|
||||||
|
+++ b/drivers/misc/Kconfig
|
||||||
|
@@ -552,6 +552,20 @@ config SYS_I2C_EEPROM_ADDR
|
||||||
|
|
||||||
|
if I2C_EEPROM
|
||||||
|
|
||||||
|
+config SYS_TMP451_BUS_NUM
|
||||||
|
+ int "Bus number of TMP451 device"
|
||||||
|
+ default 0
|
||||||
|
+
|
||||||
|
+config SYS_I2C_TMP451_ADDR
|
||||||
|
+ hex "Chip address of the TMP451 device"
|
||||||
|
+ default 0
|
||||||
|
+
|
||||||
|
+config SYS_I2C_TMP451_ADDR_LEN
|
||||||
|
+ int "Length in bytes of the TMP451 memory array address"
|
||||||
|
+ default 1
|
||||||
|
+ help
|
||||||
|
+ Note: This is NOT the chip address length!
|
||||||
|
+
|
||||||
|
config SYS_I2C_EEPROM_ADDR_OVERFLOW
|
||||||
|
hex "EEPROM Address Overflow"
|
||||||
|
default 0x0
|
||||||
|
diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
|
||||||
|
index 74150b7d..6a8eb1e6 100644
|
||||||
|
--- a/include/configs/sifive-unmatched.h
|
||||||
|
+++ b/include/configs/sifive-unmatched.h
|
||||||
|
@@ -13,6 +13,10 @@
|
||||||
|
|
||||||
|
#define CFG_SYS_SDRAM_BASE 0x80000000
|
||||||
|
|
||||||
|
+#define CONFIG_SYS_TMP451_BUS_NUM 0
|
||||||
|
+#define CONFIG_SYS_I2C_TMP451_ADDR 0x4c
|
||||||
|
+#define CONFIG_SYS_I2C_TMP451_ADDR_LEN 0x1
|
||||||
|
+
|
||||||
|
/* Environment options */
|
||||||
|
|
||||||
|
#define BOOT_TARGET_DEVICES(func) \
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
|
@ -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,10 +1,13 @@
|
||||||
a64-olinuxino
|
a64-olinuxino
|
||||||
amarula_a64_relic
|
amarula_a64_relic
|
||||||
|
apple_m1
|
||||||
bananapi_m2_plus_h5
|
bananapi_m2_plus_h5
|
||||||
bananapi_m64
|
bananapi_m64
|
||||||
|
beelink_gs1
|
||||||
dragonboard410c
|
dragonboard410c
|
||||||
dragonboard820c
|
dragonboard820c
|
||||||
espresso7420
|
dragonboard845c
|
||||||
|
eaidk-610-rk3399
|
||||||
evb-rk3328
|
evb-rk3328
|
||||||
evb-rk3399
|
evb-rk3399
|
||||||
ficus-rk3399
|
ficus-rk3399
|
||||||
|
@ -12,12 +15,13 @@ firefly-rk3399
|
||||||
geekbox
|
geekbox
|
||||||
hikey
|
hikey
|
||||||
khadas-edge-captain-rk3399
|
khadas-edge-captain-rk3399
|
||||||
khadas-edge-v-rk3399
|
|
||||||
khadas-edge-rk3399
|
khadas-edge-rk3399
|
||||||
|
khadas-edge-v-rk3399
|
||||||
khadas-vim
|
khadas-vim
|
||||||
khadas-vim2
|
khadas-vim2
|
||||||
khadas-vim3
|
khadas-vim3
|
||||||
khadas-vim3l
|
khadas-vim3l
|
||||||
|
leez-rk3399
|
||||||
libretech-ac
|
libretech-ac
|
||||||
libretech_all_h3_cc_h5
|
libretech_all_h3_cc_h5
|
||||||
libretech_all_h3_it_h5
|
libretech_all_h3_it_h5
|
||||||
|
@ -28,18 +32,24 @@ mvebu_mcbin-88f8040
|
||||||
nanopc-t4-rk3399
|
nanopc-t4-rk3399
|
||||||
nanopi_a64
|
nanopi_a64
|
||||||
nanopi-k2
|
nanopi-k2
|
||||||
nanopi-m4-rk3399
|
|
||||||
nanopi-m4-2gb-rk3399
|
nanopi-m4-2gb-rk3399
|
||||||
|
nanopi-m4b-rk3399
|
||||||
|
nanopi-m4-rk3399
|
||||||
nanopi_neo2
|
nanopi_neo2
|
||||||
nanopi-neo4-rk3399
|
nanopi-neo4-rk3399
|
||||||
nanopi_neo_plus2
|
nanopi_neo_plus2
|
||||||
|
nanopi_r1s_h5
|
||||||
|
nanopi-r2s-rk3328
|
||||||
|
nanopi-r4s-rk3399
|
||||||
odroid-c2
|
odroid-c2
|
||||||
|
orangepi_3
|
||||||
orangepi_lite2
|
orangepi_lite2
|
||||||
orangepi_one_plus
|
orangepi_one_plus
|
||||||
orangepi_pc2
|
orangepi_pc2
|
||||||
orangepi_prime
|
orangepi_prime
|
||||||
orangepi-rk3399
|
orangepi-rk3399
|
||||||
orangepi_win
|
orangepi_win
|
||||||
|
orangepi_zero2
|
||||||
orangepi_zero_plus
|
orangepi_zero_plus
|
||||||
orangepi_zero_plus2
|
orangepi_zero_plus2
|
||||||
p212
|
p212
|
||||||
|
@ -50,25 +60,28 @@ pine64-lts
|
||||||
pine64_plus
|
pine64_plus
|
||||||
pinebook
|
pinebook
|
||||||
pinebook-pro-rk3399
|
pinebook-pro-rk3399
|
||||||
pinephone
|
|
||||||
pinetab
|
|
||||||
pine_h64
|
pine_h64
|
||||||
|
pinephone
|
||||||
|
pinephone-pro-rk3399
|
||||||
|
pinetab
|
||||||
poplar
|
poplar
|
||||||
puma-rk3399
|
puma-rk3399
|
||||||
|
roc-cc-rk3328
|
||||||
rock64-rk3328
|
rock64-rk3328
|
||||||
rock960-rk3399
|
rock960-rk3399
|
||||||
rock-pi-4-rk3399
|
|
||||||
rock-pi-4c-rk3399
|
rock-pi-4c-rk3399
|
||||||
|
rock-pi-4-rk3399
|
||||||
rock-pi-e-rk3328
|
rock-pi-e-rk3328
|
||||||
rock-pi-n10-rk3399pro
|
rock-pi-n10-rk3399pro
|
||||||
rockpro64-rk3399
|
rockpro64-rk3399
|
||||||
roc-cc-rk3328
|
|
||||||
roc-pc-rk3399
|
|
||||||
roc-pc-mezzanine-rk3399
|
roc-pc-mezzanine-rk3399
|
||||||
|
roc-pc-rk3399
|
||||||
rpi_3
|
rpi_3
|
||||||
rpi_4
|
rpi_4
|
||||||
rpi_arm64
|
rpi_arm64
|
||||||
sopine_baseboard
|
sopine_baseboard
|
||||||
|
starqltechn
|
||||||
|
tanix_tx6
|
||||||
teres_i
|
teres_i
|
||||||
turris_mox
|
turris_mox
|
||||||
vexpress_aemv8a_juno
|
vexpress_aemv8a_juno
|
||||||
|
|
143
arm-boards
143
arm-boards
|
@ -1,143 +0,0 @@
|
||||||
A10-OLinuXino-Lime
|
|
||||||
A10s-OLinuXino-M
|
|
||||||
A13-OLinuXino
|
|
||||||
A13-OLinuXinoM
|
|
||||||
A20-Olimex-SOM-EVB
|
|
||||||
A20-OLinuXino-Lime
|
|
||||||
A20-OLinuXino-Lime2
|
|
||||||
A20-OLinuXino_MICRO
|
|
||||||
am335x_evm
|
|
||||||
am57xx_evm
|
|
||||||
Ampe_A76
|
|
||||||
apalis_imx6
|
|
||||||
arndale
|
|
||||||
Auxtek-T003
|
|
||||||
Auxtek-T004
|
|
||||||
ba10_tv_box
|
|
||||||
Bananapi
|
|
||||||
bananapi_m1_plus
|
|
||||||
bananapi_m2_berry
|
|
||||||
Bananapi_m2m
|
|
||||||
bananapi_m2_plus_h3
|
|
||||||
Bananapi_M2_Ultra
|
|
||||||
bananapi_m2_zero
|
|
||||||
Bananapro
|
|
||||||
chiliboard
|
|
||||||
CHIP
|
|
||||||
Chuwi_V7_CW0825
|
|
||||||
clearfog
|
|
||||||
cm_fx6
|
|
||||||
Colombus
|
|
||||||
colorfly_e708_q1
|
|
||||||
CSQ_CS908
|
|
||||||
Cubieboard
|
|
||||||
Cubieboard2
|
|
||||||
Cubieboard4
|
|
||||||
Cubietruck
|
|
||||||
Cubietruck_plus
|
|
||||||
db-mv784mp-gp
|
|
||||||
difrnce_dit4350
|
|
||||||
dserve_dsrv9703c
|
|
||||||
evb-rk3229
|
|
||||||
firefly-rk3288
|
|
||||||
helios4
|
|
||||||
Hummingbird_A31
|
|
||||||
Hyundai_A7HD
|
|
||||||
i12-tvbox
|
|
||||||
icnova-a20-swac
|
|
||||||
inet1
|
|
||||||
iNet_3F
|
|
||||||
iNet_3W
|
|
||||||
inet86dz
|
|
||||||
iNet_86VS
|
|
||||||
inet97fv2
|
|
||||||
inet98v_rev2
|
|
||||||
inet9f_rev03
|
|
||||||
inet_q972
|
|
||||||
Itead_Ibox_A20
|
|
||||||
jesurun_q5
|
|
||||||
jetson-tk1
|
|
||||||
kc1
|
|
||||||
Lamobo_R1
|
|
||||||
libretech_all_h3_cc_h2_plus
|
|
||||||
Linksprite_pcDuino
|
|
||||||
Linksprite_pcDuino3
|
|
||||||
Linksprite_pcDuino3_Nano
|
|
||||||
liteboard
|
|
||||||
marsboard
|
|
||||||
Marsboard_A10
|
|
||||||
Mele_A1000
|
|
||||||
Mele_A1000G_quad
|
|
||||||
Mele_I7
|
|
||||||
Mele_M3
|
|
||||||
Mele_M5
|
|
||||||
Mele_M9
|
|
||||||
Mini-X
|
|
||||||
mk802
|
|
||||||
mk802_a10s
|
|
||||||
mk802ii
|
|
||||||
MK808C
|
|
||||||
MSI_Primo73
|
|
||||||
MSI_Primo81
|
|
||||||
mx6cuboxi
|
|
||||||
nanopi_m1
|
|
||||||
nanopi_m1_plus
|
|
||||||
nanopi_neo
|
|
||||||
novena
|
|
||||||
odroid
|
|
||||||
odroid-xu3
|
|
||||||
omap3_beagle
|
|
||||||
omap4_panda
|
|
||||||
omap5_uevm
|
|
||||||
Orangepi
|
|
||||||
orangepi_2
|
|
||||||
orangepi_lite
|
|
||||||
Orangepi_mini
|
|
||||||
orangepi_one
|
|
||||||
orangepi_pc
|
|
||||||
orangepi_pc_plus
|
|
||||||
orangepi_plus
|
|
||||||
orangepi_plus2e
|
|
||||||
orangepi_r1
|
|
||||||
orangepi_zero
|
|
||||||
origen
|
|
||||||
paz00
|
|
||||||
pinecube
|
|
||||||
polaroid_mid2809pxe04
|
|
||||||
pov_protab2_ips9
|
|
||||||
q8_a13_tablet
|
|
||||||
q8_a23_tablet_800x480
|
|
||||||
q8_a33_tablet_1024x600
|
|
||||||
q8_a33_tablet_800x480
|
|
||||||
qemu_arm
|
|
||||||
r7-tv-dongle
|
|
||||||
riotboard
|
|
||||||
rock
|
|
||||||
rock-pi-n8-rk3288
|
|
||||||
rock2
|
|
||||||
rpi_2
|
|
||||||
rpi_3_32b
|
|
||||||
rpi_4_32b
|
|
||||||
Sinlinx_SinA31s
|
|
||||||
Sinovoip_BPI_M2
|
|
||||||
Sinovoip_BPI_M3
|
|
||||||
stih410-b2260
|
|
||||||
stm32mp15_basic
|
|
||||||
sunxi_Gemei_G9
|
|
||||||
tbs_a711
|
|
||||||
tinker-rk3288
|
|
||||||
tinker-s-rk3288
|
|
||||||
trimslice
|
|
||||||
udoo
|
|
||||||
udoo_neo
|
|
||||||
usbarmory
|
|
||||||
UTOO_P66
|
|
||||||
vexpress_ca15_tc2
|
|
||||||
vexpress_ca9x4
|
|
||||||
wandboard
|
|
||||||
warp
|
|
||||||
warp7
|
|
||||||
Wexler_TAB7200
|
|
||||||
Wits_Pro_A20_DKT
|
|
||||||
Yones_Toptech_BS1078_V2
|
|
||||||
xilinx_zynq_virt
|
|
|
@ -1,8 +0,0 @@
|
||||||
chromebit_mickey_defconfig
|
|
||||||
chromebook_jerry_defconfig
|
|
||||||
chromebook_minnie_defconfig
|
|
||||||
nyan-big_defconfig
|
|
||||||
peach-pi_defconfig
|
|
||||||
peach-pit_defconfig
|
|
||||||
snow_defconfig
|
|
||||||
spring_defconfig
|
|
|
@ -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,115 +0,0 @@
|
||||||
From 8b0274a733cd1ce39ad9ad18e1bd8efdd02a40b7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rob Clark <robdclark@gmail.com>
|
|
||||||
Date: Wed, 21 Jun 2017 14:21:15 -0400
|
|
||||||
Subject: [PATCH 1/3] WIP: fix usb
|
|
||||||
|
|
||||||
---
|
|
||||||
common/usb_storage.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/common/usb_storage.c b/common/usb_storage.c
|
|
||||||
index d92ebb6eb19..9df3c3daaf4 100644
|
|
||||||
--- a/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)
|
|
||||||
|
|
||||||
static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
|
|
||||||
{
|
|
||||||
- int retries = 10;
|
|
||||||
+ int retries = 20;
|
|
||||||
|
|
||||||
do {
|
|
||||||
memset(&srb->cmd[0], 0, 12);
|
|
||||||
@@ -1039,7 +1039,7 @@ static int usb_test_unit_ready(struct scsi_cmd *srb, struct us_data *ss)
|
|
||||||
if ((srb->sense_buf[2] == 0x02) &&
|
|
||||||
(srb->sense_buf[12] == 0x3a))
|
|
||||||
return -1;
|
|
||||||
- mdelay(100);
|
|
||||||
+ mdelay(250);
|
|
||||||
} while (retries--);
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
--
|
|
||||||
2.19.1
|
|
||||||
|
|
||||||
From 7bf41d74ca9d58bc2243b7688f8987c1d373ea56 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rob Clark <robdclark@gmail.com>
|
|
||||||
Date: Mon, 3 Jul 2017 08:34:37 -0400
|
|
||||||
Subject: [PATCH 2/3] HACK: disable emmc
|
|
||||||
|
|
||||||
Hitting some timeout which makes boot take much longer. And
|
|
||||||
uefi/boot/rootfs partitions will be on sd-card or usb disk, etc,
|
|
||||||
so we can just ignore emmc.
|
|
||||||
---
|
|
||||||
arch/arm/dts/dragonboard410c.dts | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts
|
|
||||||
index fa348bc621e..bfe7f15d5ed 100644
|
|
||||||
--- a/arch/arm/dts/dragonboard410c.dts
|
|
||||||
+++ b/arch/arm/dts/dragonboard410c.dts
|
|
||||||
@@ -106,6 +106,7 @@
|
|
||||||
#phy-cells = <0>;
|
|
||||||
};
|
|
||||||
|
|
||||||
+/*
|
|
||||||
sdhci@07824000 {
|
|
||||||
compatible = "qcom,sdhci-msm-v4";
|
|
||||||
reg = <0x7824900 0x11c 0x7824000 0x800>;
|
|
||||||
@@ -115,6 +116,7 @@
|
|
||||||
clock = <&clkc 0>;
|
|
||||||
clock-frequency = <100000000>;
|
|
||||||
};
|
|
||||||
+*/
|
|
||||||
|
|
||||||
sdhci@07864000 {
|
|
||||||
compatible = "qcom,sdhci-msm-v4";
|
|
||||||
--
|
|
||||||
2.19.1
|
|
||||||
|
|
||||||
From 871fe802cf3ab593b9332c4f36ab2b3f179d51ae Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Tue, 4 Sep 2018 12:21:59 +0100
|
|
||||||
Subject: [PATCH 3/3] add options for dm410c config
|
|
||||||
|
|
||||||
---
|
|
||||||
configs/dragonboard410c_defconfig | 10 ++++++++++
|
|
||||||
1 file changed, 10 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig
|
|
||||||
index a55abaf8df5..4ece0cafbe4 100644
|
|
||||||
--- a/configs/dragonboard410c_defconfig
|
|
||||||
+++ b/configs/dragonboard410c_defconfig
|
|
||||||
@@ -7,6 +7,8 @@ CONFIG_NR_DRAM_BANKS=1
|
|
||||||
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
||||||
CONFIG_FIT=y
|
|
||||||
CONFIG_OF_BOARD_SETUP=y
|
|
||||||
+CONFIG_FAT_WRITE=y
|
|
||||||
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
|
|
||||||
CONFIG_MISC_INIT_R=y
|
|
||||||
# CONFIG_DISPLAY_CPUINFO is not set
|
|
||||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
||||||
@@ -41,6 +43,13 @@ CONFIG_DM_PMIC=y
|
|
||||||
CONFIG_PMIC_PM8916=y
|
|
||||||
CONFIG_MSM_SERIAL=y
|
|
||||||
CONFIG_SPMI_MSM=y
|
|
||||||
+CONFIG_DM_ETH=y
|
|
||||||
+CONFIG_DM_KEYBOARD=y
|
|
||||||
+CONFIG_DM_VIDEO=y
|
|
||||||
+# CONFG_VIDEO_BPP8 is not set
|
|
||||||
+CONFIG_NO_FB_CLEAR=y
|
|
||||||
+CONFIG_VIDEO_SIMPLE=y
|
|
||||||
+CONFIG_USB_KEYBOARD=y
|
|
||||||
CONFIG_USB=y
|
|
||||||
CONFIG_DM_USB=y
|
|
||||||
CONFIG_USB_EHCI_HCD=y
|
|
||||||
@@ -57,5 +66,6 @@ CONFIG_USB_HOST_ETHER=y
|
|
||||||
CONFIG_USB_ETHER_ASIX=y
|
|
||||||
CONFIG_USB_ETHER_ASIX88179=y
|
|
||||||
CONFIG_USB_ETHER_MCS7830=y
|
|
||||||
+CONFIG_USB_ETHER_RTL8152=y
|
|
||||||
CONFIG_USB_ETHER_SMSC95XX=y
|
|
||||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
|
||||||
--
|
|
||||||
2.19.1
|
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
qemu-riscv64
|
||||||
|
qemu-riscv64_smode
|
||||||
|
qemu-riscv64_spl
|
||||||
|
sifive_unleashed
|
||||||
|
sifive_unmatched
|
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)
|
|
|
@ -0,0 +1,236 @@
|
||||||
|
From 72400858605c085cf94a6cf5599269c8c39e3e72 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Tue, 14 Mar 2023 12:30:36 +0000
|
||||||
|
Subject: [PATCH] rockchip: pinephone pro: add initial display support
|
||||||
|
|
||||||
|
Add proposed upstream DT patches for display, disable edp,
|
||||||
|
enable mipi and backlight, add required clocks.
|
||||||
|
|
||||||
|
Clocks may not be required based on upstream review. Still
|
||||||
|
need to add panel pieces, the rk3288-evb has an example for
|
||||||
|
panel DT for u-boot, or may need to do a mipi addition to
|
||||||
|
simple-panel, or something else.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/rk3399-pinephone-pro.dts | 123 +++++++++++++++++++++++++
|
||||||
|
configs/pinephone-pro-rk3399_defconfig | 3 +-
|
||||||
|
include/dt-bindings/clock/rk3399-cru.h | 2 +
|
||||||
|
3 files changed, 127 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/rk3399-pinephone-pro.dts b/arch/arm/dts/rk3399-pinephone-pro.dts
|
||||||
|
index 04403a76238..d0609d1b534 100644
|
||||||
|
--- a/arch/arm/dts/rk3399-pinephone-pro.dts
|
||||||
|
+++ b/arch/arm/dts/rk3399-pinephone-pro.dts
|
||||||
|
@@ -29,6 +29,12 @@
|
||||||
|
stdout-path = "serial2:115200n8";
|
||||||
|
};
|
||||||
|
|
||||||
|
+ backlight: backlight {
|
||||||
|
+ compatible = "pwm-backlight";
|
||||||
|
+ pwms = <&pwm0 0 1000000 0>;
|
||||||
|
+ pwm-delay-us = <10000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
gpio-keys {
|
||||||
|
compatible = "gpio-keys";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
@@ -102,6 +108,32 @@
|
||||||
|
/* WL_REG_ON on module */
|
||||||
|
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+ /* MIPI DSI panel 1.8v supply */
|
||||||
|
+ vcc1v8_lcd: vcc1v8-lcd-regulator {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ enable-active-high;
|
||||||
|
+ regulator-name = "vcc1v8_lcd";
|
||||||
|
+ regulator-min-microvolt = <1800000>;
|
||||||
|
+ regulator-max-microvolt = <1800000>;
|
||||||
|
+ vin-supply = <&vcc3v3_sys>;
|
||||||
|
+ gpio = <&gpio3 RK_PA5 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&display_pwren1>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ /* MIPI DSI panel 2.8v supply */
|
||||||
|
+ vcc2v8_lcd: vcc2v8-lcd-regulator {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ enable-active-high;
|
||||||
|
+ regulator-name = "vcc2v8_lcd";
|
||||||
|
+ regulator-min-microvolt = <2800000>;
|
||||||
|
+ regulator-max-microvolt = <2800000>;
|
||||||
|
+ vin-supply = <&vcc3v3_sys>;
|
||||||
|
+ gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&display_pwren>;
|
||||||
|
+ };
|
||||||
|
};
|
||||||
|
|
||||||
|
&cpu_l0 {
|
||||||
|
@@ -132,6 +164,11 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&gpu {
|
||||||
|
+ mali-supply = <&vdd_gpu>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&i2c0 {
|
||||||
|
clock-frequency = <400000>;
|
||||||
|
i2c-scl-rising-time-ns = <168>;
|
||||||
|
@@ -214,6 +251,9 @@
|
||||||
|
regulator-name = "vcc3v0_touch";
|
||||||
|
regulator-min-microvolt = <3000000>;
|
||||||
|
regulator-max-microvolt = <3000000>;
|
||||||
|
+ regulator-state-mem {
|
||||||
|
+ regulator-off-in-suspend;
|
||||||
|
+ };
|
||||||
|
};
|
||||||
|
|
||||||
|
vcca1v8_codec: LDO_REG3 {
|
||||||
|
@@ -347,6 +387,25 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+&i2c3 {
|
||||||
|
+ i2c-scl-rising-time-ns = <450>;
|
||||||
|
+ i2c-scl-falling-time-ns = <15>;
|
||||||
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ touchscreen@14 {
|
||||||
|
+ compatible = "goodix,gt917s";
|
||||||
|
+ reg = <0x14>;
|
||||||
|
+ interrupt-parent = <&gpio3>;
|
||||||
|
+ interrupts = <RK_PB5 IRQ_TYPE_EDGE_RISING>;
|
||||||
|
+ irq-gpios = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ reset-gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ AVDD28-supply = <&vcc3v0_touch>;
|
||||||
|
+ VDDIO-supply = <&vcc3v0_touch>;
|
||||||
|
+ touchscreen-size-x = <720>;
|
||||||
|
+ touchscreen-size-y = <1440>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&io_domains {
|
||||||
|
bt656-supply = <&vcc1v8_dvp>;
|
||||||
|
audio-supply = <&vcca1v8_codec>;
|
||||||
|
@@ -355,6 +414,40 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&mipi_dsi {
|
||||||
|
+ status = "okay";
|
||||||
|
+ clock-master;
|
||||||
|
+
|
||||||
|
+ ports {
|
||||||
|
+ mipi_out: port@1 {
|
||||||
|
+ #address-cells = <0>;
|
||||||
|
+ #size-cells = <0>;
|
||||||
|
+ reg = <1>;
|
||||||
|
+
|
||||||
|
+ mipi_out_panel: endpoint {
|
||||||
|
+ remote-endpoint = <&mipi_in_panel>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ panel@0 {
|
||||||
|
+ compatible = "hannstar,hsd060bhw4";
|
||||||
|
+ reg = <0>;
|
||||||
|
+ backlight = <&backlight>;
|
||||||
|
+ reset-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_LOW>;
|
||||||
|
+ vcc-supply = <&vcc2v8_lcd>;
|
||||||
|
+ iovcc-supply = <&vcc1v8_lcd>;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&display_rst_l>;
|
||||||
|
+
|
||||||
|
+ port {
|
||||||
|
+ mipi_in_panel: endpoint {
|
||||||
|
+ remote-endpoint = <&mipi_out_panel>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&pmu_io_domains {
|
||||||
|
pmu1830-supply = <&vcc_1v8>;
|
||||||
|
status = "okay";
|
||||||
|
@@ -387,6 +480,20 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+ dsi {
|
||||||
|
+ display_rst_l: display-rst-l {
|
||||||
|
+ rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ display_pwren: display-pwren {
|
||||||
|
+ rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ display_pwren1: display-pwren1 {
|
||||||
|
+ rockchip,pins = <3 RK_PA5 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
sound {
|
||||||
|
vcc1v8_codec_en: vcc1v8-codec-en {
|
||||||
|
rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||||
|
@@ -422,6 +529,10 @@
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&pwm0 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&sdmmc {
|
||||||
|
bus-width = <4>;
|
||||||
|
cap-sd-highspeed;
|
||||||
|
@@ -472,3 +583,15 @@
|
||||||
|
&uart2 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
+
|
||||||
|
+&vopb {
|
||||||
|
+ status = "okay";
|
||||||
|
+ assigned-clocks = <&cru DCLK_VOP0_DIV>, <&cru DCLK_VOP0>,
|
||||||
|
+ <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
|
||||||
|
+ assigned-clock-rates = <0>, <0>, <400000000>, <100000000>;
|
||||||
|
+ assigned-clock-parents = <&cru PLL_CPLL>, <&cru DCLK_VOP0_FRAC>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&vopb_mmu {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
diff --git a/configs/pinephone-pro-rk3399_defconfig b/configs/pinephone-pro-rk3399_defconfig
|
||||||
|
index 54f9b90536c..1982131c805 100644
|
||||||
|
--- a/configs/pinephone-pro-rk3399_defconfig
|
||||||
|
+++ b/configs/pinephone-pro-rk3399_defconfig
|
||||||
|
@@ -96,6 +96,7 @@ CONFIG_USB_ETHER_RTL8152=y
|
||||||
|
CONFIG_VIDEO=y
|
||||||
|
CONFIG_DISPLAY=y
|
||||||
|
CONFIG_VIDEO_ROCKCHIP=y
|
||||||
|
-CONFIG_DISPLAY_ROCKCHIP_EDP=y
|
||||||
|
+CONFIG_DISPLAY_ROCKCHIP_MIPI=y
|
||||||
|
+CONFIG_BACKLIGHT_PWM=y
|
||||||
|
CONFIG_SPL_TINY_MEMSET=y
|
||||||
|
CONFIG_ERRNO_STR=y
|
||||||
|
diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h
|
||||||
|
index 211faf8fa89..7866e5266d2 100644
|
||||||
|
--- a/include/dt-bindings/clock/rk3399-cru.h
|
||||||
|
+++ b/include/dt-bindings/clock/rk3399-cru.h
|
||||||
|
@@ -131,6 +131,8 @@
|
||||||
|
#define DCLK_VOP0_DIV 182
|
||||||
|
#define DCLK_VOP1_DIV 183
|
||||||
|
#define DCLK_M0_PERILP 184
|
||||||
|
+#define DCLK_VOP0_FRAC 185
|
||||||
|
+#define DCLK_VOP1_FRAC 186
|
||||||
|
|
||||||
|
#define FCLK_CM0S 190
|
||||||
|
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
|
@ -0,0 +1,136 @@
|
||||||
|
From 2d9350c50a9659cc2a247cdea07f0eacffa3cb32 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Sun, 12 Jun 2022 14:44:44 +0100
|
||||||
|
Subject: [PATCH] rockchip: pinebook-pro: minor SPI flash fixes
|
||||||
|
|
||||||
|
Set a default offset for environment so it doesn't write it to
|
||||||
|
unexpected locations, drop unneeded mtd config option.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
configs/pinebook-pro-rk3399_defconfig | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
|
||||||
|
index 8ca1d0708f9..aaa52c6ea70 100644
|
||||||
|
--- a/configs/pinebook-pro-rk3399_defconfig
|
||||||
|
+++ b/configs/pinebook-pro-rk3399_defconfig
|
||||||
|
@@ -5,6 +5,7 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||||
|
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||||
|
CONFIG_NR_DRAM_BANKS=1
|
||||||
|
CONFIG_ENV_SIZE=0x8000
|
||||||
|
+CONFIG_ENV_OFFSET=0x3F8000
|
||||||
|
CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
|
||||||
|
CONFIG_ROCKCHIP_RK3399=y
|
||||||
|
CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
|
||||||
|
@@ -22,7 +23,6 @@ CONFIG_MISC_INIT_R=y
|
||||||
|
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
||||||
|
CONFIG_SPL_STACK_R=y
|
||||||
|
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
|
||||||
|
-CONFIG_SPL_MTD_SUPPORT=y
|
||||||
|
CONFIG_SPL_SPI_LOAD=y
|
||||||
|
CONFIG_TPL=y
|
||||||
|
CONFIG_CMD_BOOTZ=y
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
||||||
|
From 27ba8e2f904063aec5196f86dd0332bf58a60259 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Sun, 12 Jun 2022 14:50:42 +0100
|
||||||
|
Subject: [PATCH] rockchip: rockpro64: enable leds
|
||||||
|
|
||||||
|
The Rockpro64 has some GPIO leds so let's enable them so the
|
||||||
|
user gets some output in early boot.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
configs/rockpro64-rk3399_defconfig | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
||||||
|
index e6f7a8469a3..b0c3527fab0 100644
|
||||||
|
--- a/configs/rockpro64-rk3399_defconfig
|
||||||
|
+++ b/configs/rockpro64-rk3399_defconfig
|
||||||
|
@@ -42,6 +42,8 @@ CONFIG_AHCI_PCI=y
|
||||||
|
CONFIG_SATA_SIL=y
|
||||||
|
CONFIG_ROCKCHIP_GPIO=y
|
||||||
|
CONFIG_SYS_I2C_ROCKCHIP=y
|
||||||
|
+CONFIG_LED=y
|
||||||
|
+CONFIG_LED_GPIO=y
|
||||||
|
CONFIG_MISC=y
|
||||||
|
CONFIG_ROCKCHIP_EFUSE=y
|
||||||
|
CONFIG_MMC_DW=y
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
||||||
|
From 8bca90472e0d71e5344711b6f5fe8dc95e19af5a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
Date: Sun, 12 Jun 2022 15:12:47 +0100
|
||||||
|
Subject: [PATCH] rockchip: pinebook-pro: sync PBP dtb to 5.18
|
||||||
|
|
||||||
|
Sync the pinebook pro to upstream 5.18, in particular this brings
|
||||||
|
brings in a fix so the DP is disabled so Linux will actually boot.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/rk3399-pinebook-pro.dts | 11 +++--------
|
||||||
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts b/arch/arm/dts/rk3399-pinebook-pro.dts
|
||||||
|
index 2b5f001ff4a..d6b68d77d63 100644
|
||||||
|
--- a/arch/arm/dts/rk3399-pinebook-pro.dts
|
||||||
|
+++ b/arch/arm/dts/rk3399-pinebook-pro.dts
|
||||||
|
@@ -17,6 +17,7 @@
|
||||||
|
/ {
|
||||||
|
model = "Pine64 Pinebook Pro";
|
||||||
|
compatible = "pine64,pinebook-pro", "rockchip,rk3399";
|
||||||
|
+ chassis-type = "laptop";
|
||||||
|
|
||||||
|
aliases {
|
||||||
|
mmc0 = &sdio0;
|
||||||
|
@@ -242,12 +243,12 @@
|
||||||
|
vdd_log: vdd-log {
|
||||||
|
compatible = "pwm-regulator";
|
||||||
|
pwms = <&pwm2 0 25000 1>;
|
||||||
|
+ pwm-supply = <&vcc_sysin>;
|
||||||
|
regulator-name = "vdd_log";
|
||||||
|
regulator-always-on;
|
||||||
|
regulator-boot-on;
|
||||||
|
regulator-min-microvolt = <800000>;
|
||||||
|
regulator-max-microvolt = <1400000>;
|
||||||
|
- vin-supply = <&vcc_sysin>;
|
||||||
|
|
||||||
|
regulator-state-mem {
|
||||||
|
regulator-on-in-suspend;
|
||||||
|
@@ -385,10 +386,6 @@
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
-&cdn_dp {
|
||||||
|
- status = "okay";
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
&cpu_b0 {
|
||||||
|
cpu-supply = <&vdd_cpu_b>;
|
||||||
|
};
|
||||||
|
@@ -475,8 +472,6 @@
|
||||||
|
vcc10-supply = <&vcc_sysin>;
|
||||||
|
vcc11-supply = <&vcc_sysin>;
|
||||||
|
vcc12-supply = <&vcc3v3_sys>;
|
||||||
|
- vcc13-supply = <&vcc_sysin>;
|
||||||
|
- vcc14-supply = <&vcc_sysin>;
|
||||||
|
|
||||||
|
regulators {
|
||||||
|
/* rk3399 center logic supply */
|
||||||
|
@@ -711,7 +706,7 @@
|
||||||
|
|
||||||
|
connector {
|
||||||
|
compatible = "usb-c-connector";
|
||||||
|
- data-role = "host";
|
||||||
|
+ data-role = "dual";
|
||||||
|
label = "USB-C";
|
||||||
|
op-sink-microwatt = <1000000>;
|
||||||
|
power-role = "dual";
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
|
@ -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,7 +1,13 @@
|
||||||
From f10f94831450671a77f61fe413b4a57459963860 Mon Sep 17 00:00:00 2001
|
From 52b75976133683dc9fe66e8ad35127125f938bed 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, 28 Feb 2023 12:04:34 +0000
|
||||||
Subject: [PATCH] rpi: Use firmware provided device tree
|
Subject: [PATCH 2/2] rpi: Use OF_BOARD rather than OF_EMBED
|
||||||
|
|
||||||
|
The use of OF_EMBED isn't recommended for standard use and the OF_BOARD
|
||||||
|
is actually a better fit for the Raspberry Pi as the prior firmware
|
||||||
|
provides a DT that can be used by U-Boot and the subsequent OS too, but
|
||||||
|
it still allows the loading of a DT from disk as well if users wish
|
||||||
|
to use the upstream kernel DT.
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
---
|
---
|
||||||
|
@ -10,14 +16,17 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||||
configs/rpi_3_32b_defconfig | 2 +-
|
configs/rpi_3_32b_defconfig | 2 +-
|
||||||
configs/rpi_3_b_plus_defconfig | 2 +-
|
configs/rpi_3_b_plus_defconfig | 2 +-
|
||||||
configs/rpi_3_defconfig | 2 +-
|
configs/rpi_3_defconfig | 2 +-
|
||||||
|
configs/rpi_4_32b_defconfig | 1 +
|
||||||
|
configs/rpi_4_defconfig | 1 +
|
||||||
|
configs/rpi_arm64_defconfig | 1 +
|
||||||
configs/rpi_defconfig | 2 +-
|
configs/rpi_defconfig | 2 +-
|
||||||
6 files changed, 6 insertions(+), 6 deletions(-)
|
9 files changed, 9 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 5249b29d76c..8c217848ca2 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
|
@@ -23,7 +23,7 @@ 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_CMD_FS_UUID=y
|
||||||
|
@ -27,10 +36,10 @@ index bba5e12b12..0241f4c6d3 100644
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=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 154284765f4..bfc5679fb7e 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
|
@@ -24,7 +24,7 @@ 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_CMD_FS_UUID=y
|
||||||
|
@ -40,10 +49,10 @@ index 1c2bbb29ce..9573e475f4 100644
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=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 ef1f25d2ad7..54cdcee980a 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
|
@@ -23,7 +23,7 @@ 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_CMD_FS_UUID=y
|
||||||
|
@ -53,10 +62,10 @@ index b8a3d17f43..252df994e6 100644
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||||
diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
|
diff --git a/configs/rpi_3_b_plus_defconfig b/configs/rpi_3_b_plus_defconfig
|
||||||
index 4c361438fa..3b2996a2f9 100644
|
index 154615d78a1..3008c7a1c18 100644
|
||||||
--- a/configs/rpi_3_b_plus_defconfig
|
--- a/configs/rpi_3_b_plus_defconfig
|
||||||
+++ b/configs/rpi_3_b_plus_defconfig
|
+++ b/configs/rpi_3_b_plus_defconfig
|
||||||
@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y
|
@@ -22,7 +22,7 @@ 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_CMD_FS_UUID=y
|
||||||
|
@ -66,10 +75,10 @@ index 4c361438fa..3b2996a2f9 100644
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=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 f0cf7f8e236..f7b9108ba00 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
|
@@ -22,7 +22,7 @@ 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_CMD_FS_UUID=y
|
||||||
|
@ -78,11 +87,47 @@ index 9b281a4f15..1e9ee6122e 100644
|
||||||
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||||
|
diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig
|
||||||
|
index 713b2ee231c..fa20ab767fe 100644
|
||||||
|
--- a/configs/rpi_4_32b_defconfig
|
||||||
|
+++ b/configs/rpi_4_32b_defconfig
|
||||||
|
@@ -24,6 +24,7 @@ CONFIG_CMD_MMC=y
|
||||||
|
CONFIG_CMD_PCI=y
|
||||||
|
CONFIG_CMD_USB=y
|
||||||
|
CONFIG_CMD_FS_UUID=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_4_defconfig b/configs/rpi_4_defconfig
|
||||||
|
index 24f70b14fe8..741d4dbbbf4 100644
|
||||||
|
--- a/configs/rpi_4_defconfig
|
||||||
|
+++ b/configs/rpi_4_defconfig
|
||||||
|
@@ -24,6 +24,7 @@ CONFIG_CMD_MMC=y
|
||||||
|
CONFIG_CMD_PCI=y
|
||||||
|
CONFIG_CMD_USB=y
|
||||||
|
CONFIG_CMD_FS_UUID=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_arm64_defconfig b/configs/rpi_arm64_defconfig
|
||||||
|
index 1d1ff12a58c..5e1195dd786 100644
|
||||||
|
--- a/configs/rpi_arm64_defconfig
|
||||||
|
+++ b/configs/rpi_arm64_defconfig
|
||||||
|
@@ -23,6 +23,7 @@ CONFIG_CMD_MMC=y
|
||||||
|
CONFIG_CMD_PCI=y
|
||||||
|
CONFIG_CMD_USB=y
|
||||||
|
CONFIG_CMD_FS_UUID=y
|
||||||
|
+CONFIG_OF_BOARD=y
|
||||||
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
||||||
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||||
|
CONFIG_TFTP_TSIZE=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 28b92b14456..1504093eddf 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
|
@@ -23,7 +23,7 @@ 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_CMD_FS_UUID=y
|
||||||
|
@ -92,5 +137,5 @@ index b5ad53c37b..223fc03275 100644
|
||||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||||
--
|
--
|
||||||
2.26.2
|
2.39.2
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,544 @@
|
||||||
|
From patchwork Tue Sep 6 13:44:25 2022
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||||
|
X-Patchwork-Id: 1674857
|
||||||
|
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||||
|
X-Original-To: incoming@patchwork.ozlabs.org
|
||||||
|
Delivered-To: patchwork-incoming@legolas.ozlabs.org
|
||||||
|
Authentication-Results: legolas.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: legolas.ozlabs.org;
|
||||||
|
dkim=pass (2048-bit key;
|
||||||
|
unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256
|
||||||
|
header.s=google header.b=wUY2RcfH;
|
||||||
|
dkim-atps=neutral
|
||||||
|
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 ECDSA (P-384))
|
||||||
|
(No client certificate requested)
|
||||||
|
by legolas.ozlabs.org (Postfix) with ESMTPS id 4MMRT72TCPz1yhd
|
||||||
|
for <incoming@patchwork.ozlabs.org>; Tue, 6 Sep 2022 23:44:43 +1000 (AEST)
|
||||||
|
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
|
||||||
|
by phobos.denx.de (Postfix) with ESMTP id 498F2849CE;
|
||||||
|
Tue, 6 Sep 2022 15:44:39 +0200 (CEST)
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
dmarc=pass (p=none dis=none) header.from=linaro.org
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
dkim=pass (2048-bit key;
|
||||||
|
unprotected) header.d=linaro.org header.i=@linaro.org header.b="wUY2RcfH";
|
||||||
|
dkim-atps=neutral
|
||||||
|
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||||
|
id A8842849CF; Tue, 6 Sep 2022 15:44:37 +0200 (CEST)
|
||||||
|
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
||||||
|
X-Spam-Level:
|
||||||
|
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
|
||||||
|
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS,
|
||||||
|
T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2
|
||||||
|
Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com
|
||||||
|
[IPv6:2a00:1450:4864:20::52d])
|
||||||
|
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))
|
||||||
|
(No client certificate requested)
|
||||||
|
by phobos.denx.de (Postfix) with ESMTPS id 403A5849AA
|
||||||
|
for <u-boot@lists.denx.de>; Tue, 6 Sep 2022 15:44:35 +0200 (CEST)
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
dmarc=pass (p=none dis=none) header.from=linaro.org
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org
|
||||||
|
Received: by mail-ed1-x52d.google.com with SMTP id x73so8243364ede.10
|
||||||
|
for <u-boot@lists.denx.de>; Tue, 06 Sep 2022 06:44:35 -0700 (PDT)
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
|
||||||
|
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
|
||||||
|
:to:from:from:to:cc:subject:date;
|
||||||
|
bh=YBbhuTYZcGSI4FSsstTIADofj6ZEC8vsTpd/U8gWDlU=;
|
||||||
|
b=wUY2RcfHqhMQ1dgd2my7jtmfsgHjAF8xFa3HnTkB/tUGQL/oQyls7ODcVui/VImHlf
|
||||||
|
Ah33xwYqK1nwEuoS8HqkWcksTr48pKf/EikkkBbHif0XnfS4oySI3RHo7WW6Yi8HQUoP
|
||||||
|
tbuQ3LPSYgo+62HaqTYVoJ2g6jc1qiEFe/+y6hR2BfmyKd0g/SxwLS9P1QuQosdhX+uO
|
||||||
|
DKWWukFYFV06Nn7x/3oiyoXq33VAWatgQBv/sPC7dBgh/EpnobDpI8NhNhJAkFIcAUrU
|
||||||
|
B91PBwNRtB1Lsf+Eo3WjLtQbinL3h/VvogRSvZEoKCmHY5dbTYB8G1uNzksnK6QecIRu
|
||||||
|
q9qA==
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20210112;
|
||||||
|
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
|
||||||
|
:to:from:x-gm-message-state:from:to:cc:subject:date;
|
||||||
|
bh=YBbhuTYZcGSI4FSsstTIADofj6ZEC8vsTpd/U8gWDlU=;
|
||||||
|
b=KfQ/P0sYI7szdfgs6GA5oPXctzQ8yfxjRs7PgVHFg7jl09SeFl3jpKzaMGbC7GlEgM
|
||||||
|
JXt2VP6w9TndL/D71cR8w9BObY2mZJoLRP/s25LpSU6izkisnuueyGeqKegGEfGE+4B3
|
||||||
|
9xaG/EUlPZmHlAem6bOf9Dl6lE5WkT6SnTDopwODIbcTAWlIa8Gjtw9XBaaa8iRnVuTn
|
||||||
|
S3IwY9R7DLaSFBQXTVHmAYnhCc2b5XCRKlSNwmDE65+LqvOdAu3MTbA5/YyL9pEPjHi9
|
||||||
|
4q0ZQksAE0olpQQwxyjHrvz7h7ktSuJoesa/A4dX3PEbzSbBmPI1CGtPy27/luAUCH3F
|
||||||
|
e8Vw==
|
||||||
|
X-Gm-Message-State: ACgBeo2YRons+T+T1+BdP4+uyEFge3LrQ/gS2VYwuVZg325XGZ8HVnXH
|
||||||
|
Lq8no+qriMaFPrto6+L889ufiYLHsm+dZQ==
|
||||||
|
X-Google-Smtp-Source:
|
||||||
|
AA6agR6coLdFIB45xwZJzpltd9Qfi6bEAn6J22G77ibwSDNyt1L1YbxRL9dlK4pmf9A6n2RN31Ug2w==
|
||||||
|
X-Received: by 2002:aa7:c84f:0:b0:446:2bfb:5a63 with SMTP id
|
||||||
|
g15-20020aa7c84f000000b004462bfb5a63mr17498596edt.172.1662471874779;
|
||||||
|
Tue, 06 Sep 2022 06:44:34 -0700 (PDT)
|
||||||
|
Received: from localhost.localdomain ([46.103.15.185])
|
||||||
|
by smtp.gmail.com with ESMTPSA id
|
||||||
|
p23-20020a056402501700b0043ba7df7a42sm8473330eda.26.2022.09.06.06.44.33
|
||||||
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||||
|
Tue, 06 Sep 2022 06:44:34 -0700 (PDT)
|
||||||
|
From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||||
|
To: u-boot@lists.denx.de
|
||||||
|
Cc: trini@konsulko.com, sjg@chromium.org, heinrich.schuchardt@canonical.com,
|
||||||
|
pbrobinson@gmail.com, Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||||
|
Subject: [PATCH 1/2] smbios: Simplify reporting of unknown values
|
||||||
|
Date: Tue, 6 Sep 2022 16:44:25 +0300
|
||||||
|
Message-Id: <20220906134426.53748-1-ilias.apalodimas@linaro.org>
|
||||||
|
X-Mailer: git-send-email 2.37.2
|
||||||
|
MIME-Version: 1.0
|
||||||
|
X-BeenThere: u-boot@lists.denx.de
|
||||||
|
X-Mailman-Version: 2.1.39
|
||||||
|
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.103.6 at phobos.denx.de
|
||||||
|
X-Virus-Status: Clean
|
||||||
|
|
||||||
|
If a value is not valid during the DT or SYSINFO parsing, we explicitly
|
||||||
|
set that to "Unknown Product" and "Unknown" for the product and
|
||||||
|
manufacturer respectively. It's cleaner if we move the checks insisde
|
||||||
|
smbios_add_string() and always report "Unknown" regardless of the missing
|
||||||
|
field.
|
||||||
|
|
||||||
|
pre-patch dmidecode
|
||||||
|
<snip>
|
||||||
|
Handle 0x0001, DMI type 1, 27 bytes
|
||||||
|
System Information
|
||||||
|
Manufacturer: Unknown
|
||||||
|
Product Name: Unknown Product
|
||||||
|
Version: Not Specified
|
||||||
|
Serial Number: Not Specified
|
||||||
|
UUID: Not Settable
|
||||||
|
Wake-up Type: Reserved
|
||||||
|
SKU Number: Not Specified
|
||||||
|
Family: Not Specified
|
||||||
|
|
||||||
|
Handle 0x0002, DMI type 2, 14 bytes
|
||||||
|
Base Board Information
|
||||||
|
Manufacturer: Unknown
|
||||||
|
Product Name: Unknown Product
|
||||||
|
Version: Not Specified
|
||||||
|
Serial Number: Not Specified
|
||||||
|
Asset Tag: Not Specified
|
||||||
|
Features:
|
||||||
|
Board is a hosting board
|
||||||
|
Location In Chassis: Not Specified
|
||||||
|
Chassis Handle: 0x0000
|
||||||
|
Type: Motherboard
|
||||||
|
<snip>
|
||||||
|
|
||||||
|
post-patch dmidecode:
|
||||||
|
|
||||||
|
Handle 0x0001, DMI type 1, 27 bytes
|
||||||
|
System Information
|
||||||
|
Manufacturer: Unknown
|
||||||
|
Product Name: Unknown
|
||||||
|
Version: Unknown
|
||||||
|
Serial Number: Unknown
|
||||||
|
UUID: Not Settable
|
||||||
|
Wake-up Type: Reserved
|
||||||
|
SKU Number: Unknown
|
||||||
|
Family: Unknown
|
||||||
|
|
||||||
|
Handle 0x0002, DMI type 2, 14 bytes
|
||||||
|
Base Board Information
|
||||||
|
Manufacturer: Unknown
|
||||||
|
Product Name: Unknown
|
||||||
|
Version: Unknown
|
||||||
|
Serial Number: Not Specified
|
||||||
|
Asset Tag: Unknown
|
||||||
|
Features:
|
||||||
|
Board is a hosting board
|
||||||
|
Location In Chassis: Not Specified
|
||||||
|
Chassis Handle: 0x0000
|
||||||
|
Type: Motherboard
|
||||||
|
|
||||||
|
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||||
|
---
|
||||||
|
lib/smbios.c | 17 +++--------------
|
||||||
|
1 file changed, 3 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/smbios.c b/lib/smbios.c
|
||||||
|
index d7f4999e8b2a..fcc8686993ef 100644
|
||||||
|
--- a/lib/smbios.c
|
||||||
|
+++ b/lib/smbios.c
|
||||||
|
@@ -102,7 +102,7 @@ static int smbios_add_string(struct smbios_ctx *ctx, const char *str)
|
||||||
|
int i = 1;
|
||||||
|
char *p = ctx->eos;
|
||||||
|
|
||||||
|
- if (!*str)
|
||||||
|
+ if (!str || !*str)
|
||||||
|
str = "Unknown";
|
||||||
|
|
||||||
|
for (;;) {
|
||||||
|
@@ -151,8 +151,7 @@ static int smbios_add_prop_si(struct smbios_ctx *ctx, const char *prop,
|
||||||
|
const char *str;
|
||||||
|
|
||||||
|
str = ofnode_read_string(ctx->node, prop);
|
||||||
|
- if (str)
|
||||||
|
- return smbios_add_string(ctx, str);
|
||||||
|
+ return smbios_add_string(ctx, str);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
@@ -231,7 +230,7 @@ static int smbios_write_type0(ulong *current, int handle,
|
||||||
|
t->vendor = smbios_add_string(ctx, "U-Boot");
|
||||||
|
|
||||||
|
t->bios_ver = smbios_add_prop(ctx, "version");
|
||||||
|
- if (!t->bios_ver)
|
||||||
|
+ if (!strcmp(ctx->last_str, "Unknown"))
|
||||||
|
t->bios_ver = smbios_add_string(ctx, PLAIN_VERSION);
|
||||||
|
if (t->bios_ver)
|
||||||
|
gd->smbios_version = ctx->last_str;
|
||||||
|
@@ -281,11 +280,7 @@ static int smbios_write_type1(ulong *current, int handle,
|
||||||
|
fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle);
|
||||||
|
smbios_set_eos(ctx, t->eos);
|
||||||
|
t->manufacturer = smbios_add_prop(ctx, "manufacturer");
|
||||||
|
- if (!t->manufacturer)
|
||||||
|
- t->manufacturer = smbios_add_string(ctx, "Unknown");
|
||||||
|
t->product_name = smbios_add_prop(ctx, "product");
|
||||||
|
- if (!t->product_name)
|
||||||
|
- t->product_name = smbios_add_string(ctx, "Unknown Product");
|
||||||
|
t->version = smbios_add_prop_si(ctx, "version",
|
||||||
|
SYSINFO_ID_SMBIOS_SYSTEM_VERSION);
|
||||||
|
if (serial_str) {
|
||||||
|
@@ -315,11 +310,7 @@ static int smbios_write_type2(ulong *current, int handle,
|
||||||
|
fill_smbios_header(t, SMBIOS_BOARD_INFORMATION, len, handle);
|
||||||
|
smbios_set_eos(ctx, t->eos);
|
||||||
|
t->manufacturer = smbios_add_prop(ctx, "manufacturer");
|
||||||
|
- if (!t->manufacturer)
|
||||||
|
- t->manufacturer = smbios_add_string(ctx, "Unknown");
|
||||||
|
t->product_name = smbios_add_prop(ctx, "product");
|
||||||
|
- if (!t->product_name)
|
||||||
|
- t->product_name = smbios_add_string(ctx, "Unknown Product");
|
||||||
|
t->version = smbios_add_prop_si(ctx, "version",
|
||||||
|
SYSINFO_ID_SMBIOS_BASEBOARD_VERSION);
|
||||||
|
t->asset_tag_number = smbios_add_prop(ctx, "asset-tag");
|
||||||
|
@@ -344,8 +335,6 @@ static int smbios_write_type3(ulong *current, int handle,
|
||||||
|
fill_smbios_header(t, SMBIOS_SYSTEM_ENCLOSURE, len, handle);
|
||||||
|
smbios_set_eos(ctx, t->eos);
|
||||||
|
t->manufacturer = smbios_add_prop(ctx, "manufacturer");
|
||||||
|
- if (!t->manufacturer)
|
||||||
|
- t->manufacturer = smbios_add_string(ctx, "Unknown");
|
||||||
|
t->chassis_type = SMBIOS_ENCLOSURE_DESKTOP;
|
||||||
|
t->bootup_state = SMBIOS_STATE_SAFE;
|
||||||
|
t->power_supply_state = SMBIOS_STATE_SAFE;
|
||||||
|
|
||||||
|
From patchwork Tue Sep 6 13:44:26 2022
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
X-Patchwork-Submitter: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||||
|
X-Patchwork-Id: 1674858
|
||||||
|
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||||
|
X-Original-To: incoming@patchwork.ozlabs.org
|
||||||
|
Delivered-To: patchwork-incoming@legolas.ozlabs.org
|
||||||
|
Authentication-Results: legolas.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: legolas.ozlabs.org;
|
||||||
|
dkim=pass (2048-bit key;
|
||||||
|
unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256
|
||||||
|
header.s=google header.b=wBCOiKYw;
|
||||||
|
dkim-atps=neutral
|
||||||
|
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 ECDSA (P-384))
|
||||||
|
(No client certificate requested)
|
||||||
|
by legolas.ozlabs.org (Postfix) with ESMTPS id 4MMRTM5pHRz1yhk
|
||||||
|
for <incoming@patchwork.ozlabs.org>; Tue, 6 Sep 2022 23:44:55 +1000 (AEST)
|
||||||
|
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
|
||||||
|
by phobos.denx.de (Postfix) with ESMTP id 3639F849EA;
|
||||||
|
Tue, 6 Sep 2022 15:44:53 +0200 (CEST)
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
dmarc=pass (p=none dis=none) header.from=linaro.org
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
dkim=pass (2048-bit key;
|
||||||
|
unprotected) header.d=linaro.org header.i=@linaro.org header.b="wBCOiKYw";
|
||||||
|
dkim-atps=neutral
|
||||||
|
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||||
|
id E57FC84A1A; Tue, 6 Sep 2022 15:44:51 +0200 (CEST)
|
||||||
|
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
||||||
|
X-Spam-Level:
|
||||||
|
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
|
||||||
|
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS,
|
||||||
|
T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2
|
||||||
|
Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com
|
||||||
|
[IPv6:2a00:1450:4864:20::52f])
|
||||||
|
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))
|
||||||
|
(No client certificate requested)
|
||||||
|
by phobos.denx.de (Postfix) with ESMTPS id 60CD0849AA
|
||||||
|
for <u-boot@lists.denx.de>; Tue, 6 Sep 2022 15:44:49 +0200 (CEST)
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
dmarc=pass (p=none dis=none) header.from=linaro.org
|
||||||
|
Authentication-Results: phobos.denx.de;
|
||||||
|
spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org
|
||||||
|
Received: by mail-ed1-x52f.google.com with SMTP id z21so5172669edi.1
|
||||||
|
for <u-boot@lists.denx.de>; Tue, 06 Sep 2022 06:44:49 -0700 (PDT)
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
|
||||||
|
h=content-transfer-encoding:mime-version:references:in-reply-to
|
||||||
|
:message-id:date:subject:cc:to:from:from:to:cc:subject:date;
|
||||||
|
bh=KsGBN7dLy4q3TeQQmsDywPtn2m3V5eSK1ppBgO8D3xg=;
|
||||||
|
b=wBCOiKYwM4mGDZUo6l68tblLVt57cCnO0dlzFPj9+m6cwKXe3agxiM3w4t9T5c822i
|
||||||
|
vHmFd2F08bUrX81t/h4PDzg0mngbB9Rc9o4i3td1G9Zw6NdmogU7T7gEUyKKcTc80AWl
|
||||||
|
QbbYgxulWB5Eg2dTQ3tlb2xmb5BU1/X0zl/rOC6l89urohdQtpIJ4XgFlijFlBgxh8XD
|
||||||
|
aHytniLKGTLlVdJAIobcF9aM/ihpO7LPTDZ4SPCBt4t9+UWGW7vuTPDPDkCRiaaFestv
|
||||||
|
9P32ZrGj43CH92zBQtpgZICS0UhzD3oYWJkwsmFbfxddgY5VD5SQi69VzD1CfFOvTGgX
|
||||||
|
5HBg==
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20210112;
|
||||||
|
h=content-transfer-encoding:mime-version:references:in-reply-to
|
||||||
|
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
|
||||||
|
:subject:date;
|
||||||
|
bh=KsGBN7dLy4q3TeQQmsDywPtn2m3V5eSK1ppBgO8D3xg=;
|
||||||
|
b=h1yL2aMN8ooI48PrqxwSNjw+MAj6qGtRMJjV8AWmRfv7nVQ97I/cXbauy/NItVEWP0
|
||||||
|
eO4WFqVMQO+xyGn1S5w0MXYGVbEpVNxf0gwM7n7Ad+K2E2PDHyu6glGTvcqCW11gPGOJ
|
||||||
|
uNDyo6pu7OtmOBso2OaL5eMGhw66ZGqQbzlQtO0mhqJf1RtQ9fRduRZrfTzAR9wIrM4Y
|
||||||
|
qR3iK6b4O97tu0W0SctGf3rCNzI2bDv/zBKRvfSJ6q7s4DhLDxBJyQjySBo0Ee6UIwKc
|
||||||
|
5q8zldycF/JfIbqzlJe6DaeoeDbzJ7qLBPvDmxQ7owSV9ftEa8lh/IIdPn13uDL2Bxjz
|
||||||
|
WLbg==
|
||||||
|
X-Gm-Message-State: ACgBeo0DsGDn9dDw7GQ5K44iwyXJqKH0pM3NWFxuDlmBNzKLyzH8SEzb
|
||||||
|
03ImCopxuD/6oyVtH7ygeEl2Cc6GlNzVNQ==
|
||||||
|
X-Google-Smtp-Source:
|
||||||
|
AA6agR6kpp8KIkqO+/pui5Dy7mRTrk+S2U0k99eVOJv3PGkIDZ8H0oqIBypOwW5nogFds0FAjF4TXg==
|
||||||
|
X-Received: by 2002:a05:6402:f18:b0:44d:9a45:394 with SMTP id
|
||||||
|
i24-20020a0564020f1800b0044d9a450394mr12375719eda.138.1662471889015;
|
||||||
|
Tue, 06 Sep 2022 06:44:49 -0700 (PDT)
|
||||||
|
Received: from localhost.localdomain ([46.103.15.185])
|
||||||
|
by smtp.gmail.com with ESMTPSA id
|
||||||
|
p23-20020a056402501700b0043ba7df7a42sm8473330eda.26.2022.09.06.06.44.48
|
||||||
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||||||
|
Tue, 06 Sep 2022 06:44:48 -0700 (PDT)
|
||||||
|
From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||||
|
To: u-boot@lists.denx.de
|
||||||
|
Cc: trini@konsulko.com, sjg@chromium.org, heinrich.schuchardt@canonical.com,
|
||||||
|
pbrobinson@gmail.com, Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||||
|
Subject: [PATCH 2/2] smbios: Fallback to the default DT if sysinfo nodes are
|
||||||
|
missing
|
||||||
|
Date: Tue, 6 Sep 2022 16:44:26 +0300
|
||||||
|
Message-Id: <20220906134426.53748-2-ilias.apalodimas@linaro.org>
|
||||||
|
X-Mailer: git-send-email 2.37.2
|
||||||
|
In-Reply-To: <20220906134426.53748-1-ilias.apalodimas@linaro.org>
|
||||||
|
References: <20220906134426.53748-1-ilias.apalodimas@linaro.org>
|
||||||
|
MIME-Version: 1.0
|
||||||
|
X-BeenThere: u-boot@lists.denx.de
|
||||||
|
X-Mailman-Version: 2.1.39
|
||||||
|
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.103.6 at phobos.denx.de
|
||||||
|
X-Virus-Status: Clean
|
||||||
|
|
||||||
|
In order to fill in the SMBIOS tables U-Boot currently relies on a
|
||||||
|
"u-boot,sysinfo-smbios" compatible node. This is fine for the boards
|
||||||
|
that already include such nodes. However with some recent EFI changes,
|
||||||
|
the majority of boards can boot up distros, which usually rely on
|
||||||
|
things like dmidecode etc for their reporting. For boards that
|
||||||
|
lack this special node the SMBIOS output looks like:
|
||||||
|
|
||||||
|
System Information
|
||||||
|
Manufacturer: Unknown
|
||||||
|
Product Name: Unknown
|
||||||
|
Version: Unknown
|
||||||
|
Serial Number: Unknown
|
||||||
|
UUID: Not Settable
|
||||||
|
Wake-up Type: Reserved
|
||||||
|
SKU Number: Unknown
|
||||||
|
Family: Unknown
|
||||||
|
|
||||||
|
This looks problematic since most of the info are "Unknown". The DT spec
|
||||||
|
specifies standard properties containing relevant information like
|
||||||
|
'model' and 'compatible' for which the suggested format is
|
||||||
|
<manufacturer,model>. So let's add a last resort to our current
|
||||||
|
smbios parsing. If none of the sysinfo properties are found, we can
|
||||||
|
scan the root node for 'model' and 'compatible'.
|
||||||
|
|
||||||
|
pre-patch dmidecode:
|
||||||
|
<snip>
|
||||||
|
Handle 0x0001, DMI type 1, 27 bytes
|
||||||
|
System Information
|
||||||
|
Manufacturer: Unknown
|
||||||
|
Product Name: Unknown
|
||||||
|
Version: Unknown
|
||||||
|
Serial Number: Unknown
|
||||||
|
UUID: Not Settable
|
||||||
|
Wake-up Type: Reserved
|
||||||
|
SKU Number: Unknown
|
||||||
|
Family: Unknown
|
||||||
|
|
||||||
|
Handle 0x0002, DMI type 2, 14 bytes
|
||||||
|
Base Board Information
|
||||||
|
Manufacturer: Unknown
|
||||||
|
Product Name: Unknown
|
||||||
|
Version: Unknown
|
||||||
|
Serial Number: Not Specified
|
||||||
|
Asset Tag: Unknown
|
||||||
|
Features:
|
||||||
|
Board is a hosting board
|
||||||
|
Location In Chassis: Not Specified
|
||||||
|
Chassis Handle: 0x0000
|
||||||
|
Type: Motherboard
|
||||||
|
|
||||||
|
Handle 0x0003, DMI type 3, 21 bytes
|
||||||
|
Chassis Information
|
||||||
|
Manufacturer: Unknown
|
||||||
|
Type: Desktop
|
||||||
|
Lock: Not Present
|
||||||
|
Version: Not Specified
|
||||||
|
Serial Number: Not Specified
|
||||||
|
Asset Tag: Not Specified
|
||||||
|
Boot-up State: Safe
|
||||||
|
Power Supply State: Safe
|
||||||
|
Thermal State: Safe
|
||||||
|
Security Status: None
|
||||||
|
OEM Information: 0x00000000
|
||||||
|
Height: Unspecified
|
||||||
|
Number Of Power Cords: Unspecified
|
||||||
|
Contained Elements: 0
|
||||||
|
<snip>
|
||||||
|
|
||||||
|
post-pastch dmidecode:
|
||||||
|
<snip>
|
||||||
|
Handle 0x0001, DMI type 1, 27 bytes
|
||||||
|
System Information
|
||||||
|
Manufacturer: socionext,developer-box
|
||||||
|
Product Name: Socionext Developer Box
|
||||||
|
Version: Unknown
|
||||||
|
Serial Number: Unknown
|
||||||
|
UUID: Not Settable
|
||||||
|
Wake-up Type: Reserved
|
||||||
|
SKU Number: Unknown
|
||||||
|
Family: Unknown
|
||||||
|
|
||||||
|
Handle 0x0002, DMI type 2, 14 bytes
|
||||||
|
Base Board Information
|
||||||
|
Manufacturer: socionext,developer-box
|
||||||
|
Product Name: Socionext Developer Box
|
||||||
|
Version: Unknown
|
||||||
|
Serial Number: Not Specified
|
||||||
|
Asset Tag: Unknown
|
||||||
|
Features:
|
||||||
|
Board is a hosting board
|
||||||
|
Location In Chassis: Not Specified
|
||||||
|
Chassis Handle: 0x0000
|
||||||
|
Type: Motherboard
|
||||||
|
|
||||||
|
Handle 0x0003, DMI type 3, 21 bytes
|
||||||
|
Chassis Information
|
||||||
|
Manufacturer: socionext,developer-box
|
||||||
|
Type: Desktop
|
||||||
|
Lock: Not Present
|
||||||
|
Version: Not Specified
|
||||||
|
Serial Number: Not Specified
|
||||||
|
Asset Tag: Not Specified
|
||||||
|
Boot-up State: Safe
|
||||||
|
Power Supply State: Safe
|
||||||
|
Thermal State: Safe
|
||||||
|
Security Status: None
|
||||||
|
OEM Information: 0x00000000
|
||||||
|
Height: Unspecified
|
||||||
|
Number Of Power Cords: Unspecified
|
||||||
|
Contained Elements: 0
|
||||||
|
<snip>
|
||||||
|
|
||||||
|
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||||
|
---
|
||||||
|
lib/smbios.c | 41 +++++++++++++++++++++++++++++++++++++++--
|
||||||
|
1 file changed, 39 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/smbios.c b/lib/smbios.c
|
||||||
|
index fcc8686993ef..f2eb961f514b 100644
|
||||||
|
--- a/lib/smbios.c
|
||||||
|
+++ b/lib/smbios.c
|
||||||
|
@@ -43,6 +43,20 @@
|
||||||
|
|
||||||
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
|
+/**
|
||||||
|
+ * struct sysifno_to_dt - Mapping of sysinfo strings to DT
|
||||||
|
+ *
|
||||||
|
+ * @sysinfo_str: sysinfo string
|
||||||
|
+ * @dt_str: DT string
|
||||||
|
+ */
|
||||||
|
+static const struct {
|
||||||
|
+ const char *sysinfo_str;
|
||||||
|
+ const char *dt_str;
|
||||||
|
+} sysifno_to_dt[] = {
|
||||||
|
+ { .sysinfo_str = "product", .dt_str = "model" },
|
||||||
|
+ { .sysinfo_str = "manufacturer", .dt_str = "compatible" },
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* struct smbios_ctx - context for writing SMBIOS tables
|
||||||
|
*
|
||||||
|
@@ -87,6 +101,18 @@ struct smbios_write_method {
|
||||||
|
const char *subnode_name;
|
||||||
|
};
|
||||||
|
|
||||||
|
+static const char *convert_sysinfo_to_dt(const char *sysinfo_str)
|
||||||
|
+{
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < ARRAY_SIZE(sysifno_to_dt); i++) {
|
||||||
|
+ if (!strcmp(sysinfo_str, sysifno_to_dt[i].sysinfo_str))
|
||||||
|
+ return sysifno_to_dt[i].dt_str;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return NULL;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* smbios_add_string() - add a string to the string area
|
||||||
|
*
|
||||||
|
@@ -148,9 +174,20 @@ static int smbios_add_prop_si(struct smbios_ctx *ctx, const char *prop,
|
||||||
|
return smbios_add_string(ctx, val);
|
||||||
|
}
|
||||||
|
if (IS_ENABLED(CONFIG_OF_CONTROL)) {
|
||||||
|
- const char *str;
|
||||||
|
+ const char *str = NULL;
|
||||||
|
|
||||||
|
- str = ofnode_read_string(ctx->node, prop);
|
||||||
|
+ /*
|
||||||
|
+ * If the node is not valid fallback and try the entire DT
|
||||||
|
+ * so we can at least fill in maufacturer and board type
|
||||||
|
+ */
|
||||||
|
+ if (!ofnode_valid(ctx->node)) {
|
||||||
|
+ const char *nprop = convert_sysinfo_to_dt(prop);
|
||||||
|
+
|
||||||
|
+ if (nprop)
|
||||||
|
+ str = ofnode_read_string(ofnode_root(), nprop);
|
||||||
|
+ } else {
|
||||||
|
+ str = ofnode_read_string(ctx->node, prop);
|
||||||
|
+ }
|
||||||
|
return smbios_add_string(ctx, str);
|
||||||
|
}
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (u-boot-2021.01-rc4.tar.bz2) = 6de2c60d02276f4eed31b5baf2d8239ad0af30c9d341339a4cd7fa0786068cb5faa1ab8bd0b4155e536962e1a4869906f60f1d2a1e50b0ed15e98c2e84d6a97b
|
SHA512 (u-boot-2023.04.tar.bz2) = 31a44083af8084cd657c08233f485ff9503002bbaf95114c6135d483881fa14dc5a1b7ab42fd91f1fdd6b330556e76958d475280115018cb59c62b6ab4b508e6
|
||||||
|
|
|
@ -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
|
|
489
uboot-tools.spec
489
uboot-tools.spec
|
@ -1,74 +1,73 @@
|
||||||
%global candidate rc4
|
#global candidate rc0
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%bcond_with toolsonly
|
||||||
|
%else
|
||||||
|
%bcond_without toolsonly
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Set it to "opensbi" (stable) or opensbi-unstable (unstable, git)
|
||||||
|
%global opensbi opensbi-unstable
|
||||||
|
|
||||||
Name: uboot-tools
|
Name: uboot-tools
|
||||||
Version: 2021.01
|
Version: 2023.04
|
||||||
Release: 0.4%{?candidate:.%{candidate}}%{?dist}
|
Release: 1%{?candidate:.%{candidate}}.4.riscv64%{?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
|
ExcludeArch: s390x
|
||||||
Source1: arm-boards
|
Source0: https://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
|
||||||
Source2: arm-chromebooks
|
Source1: aarch64-boards
|
||||||
Source3: aarch64-boards
|
Source2: riscv64-boards
|
||||||
Source4: aarch64-chromebooks
|
|
||||||
|
|
||||||
# Fedoraisms patches
|
# Fedoraisms patches
|
||||||
# Needed to find DT on boot partition that's not the first partition
|
# Needed to find DT on boot partition that's not the first partition
|
||||||
Patch1: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
Patch1: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||||
# Needed due to issues with shim
|
Patch2: smbios-Simplify-reporting-of-unknown-values.patch
|
||||||
Patch2: uefi-use-Fedora-specific-path-name.patch
|
|
||||||
# RPi - uses RPI firmware device tree for HAT support
|
|
||||||
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
|
# RPi - uses RPI firmware device tree for HAT support
|
||||||
Patch6: rng-Add-iProc-RNG200-driver.patch
|
Patch3: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||||
# AllWinner improvements
|
|
||||||
Patch10: AllWinner-PineTab.patch
|
|
||||||
Patch11: sunxi-add-PineCube-board.patch
|
|
||||||
Patch12: 0001-Fixes-for-AllWinner-ethernet-network-interfaces.patch
|
|
||||||
# TI fixes
|
|
||||||
Patch13: 0001-Fix-BeagleAI-detection.patch
|
|
||||||
# Rockchips improvements
|
# Rockchips improvements
|
||||||
Patch14: arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch
|
Patch6: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
|
||||||
Patch15: rk3399-Pinebook-pro-EDP-support.patch
|
|
||||||
|
# RISC-V (riscv64) patches
|
||||||
|
Patch20: 0001-Improve-riscv-defconfigs.patch
|
||||||
|
Patch21: 0002-board-sifive-spl-Initialized-the-PWM-setting-in-the-.patch
|
||||||
|
Patch22: 0003-board-sifive-spl-Set-remote-thermal-of-TMP451-to-85-.patch
|
||||||
|
|
||||||
BuildRequires: bc
|
BuildRequires: bc
|
||||||
|
BuildRequires: bison
|
||||||
BuildRequires: dtc
|
BuildRequires: dtc
|
||||||
BuildRequires: make
|
BuildRequires: flex
|
||||||
# Requirements for building on el7
|
|
||||||
%if 0%{?rhel} == 7
|
|
||||||
BuildRequires: devtoolset-7-build
|
|
||||||
BuildRequires: devtoolset-7-binutils
|
|
||||||
BuildRequires: devtoolset-7-gcc
|
|
||||||
BuildRequires: python2-devel
|
|
||||||
BuildRequires: python2-setuptools
|
|
||||||
BuildRequires: python2-libfdt
|
|
||||||
%else
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gnutls-devel
|
||||||
|
BuildRequires: libuuid-devel
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: ncurses-devel
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: perl-interpreter
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
BuildRequires: python3-libfdt
|
BuildRequires: python3-libfdt
|
||||||
%endif
|
BuildRequires: SDL2-devel
|
||||||
BuildRequires: flex bison
|
|
||||||
BuildRequires: openssl-devel
|
|
||||||
BuildRequires: SDL-devel
|
|
||||||
BuildRequires: swig
|
BuildRequires: swig
|
||||||
%ifarch %{arm} aarch64
|
%if %{with toolsonly}
|
||||||
BuildRequires: vboot-utils
|
|
||||||
%endif
|
|
||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
BuildRequires: arm-trusted-firmware-armv8
|
BuildRequires: arm-trusted-firmware-armv8
|
||||||
|
BuildRequires: python3-pyelftools
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
Requires: dtc
|
Requires: dtc
|
||||||
|
%ifarch riscv64
|
||||||
|
BuildRequires: %{opensbi}
|
||||||
|
%endif
|
||||||
|
|
||||||
%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
|
||||||
and fw_printenv/fw_setenv for manipulating the boot environment variables.
|
and fw_printenv/fw_setenv for manipulating the boot environment variables.
|
||||||
|
|
||||||
|
%if %{with toolsonly}
|
||||||
%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 firmware images for aarch64 boards
|
||||||
|
@ -78,163 +77,423 @@ BuildArch: noarch
|
||||||
U-Boot firmware binaries for aarch64 boards
|
U-Boot firmware binaries for aarch64 boards
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{arm}
|
%ifarch riscv64
|
||||||
%package -n uboot-images-armv7
|
%package -n uboot-images-riscv64
|
||||||
Summary: U-Boot firmware images for armv7 boards
|
Summary: u-boot bootloader images for riscv64 boards
|
||||||
|
Requires: uboot-tools
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description -n uboot-images-armv7
|
%description -n uboot-images-riscv64
|
||||||
U-Boot firmware binaries for armv7 boards
|
u-boot bootloader binaries for riscv64 boards
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n u-boot-%{version}%{?candidate:-%{candidate}}
|
%autosetup -p1 -n u-boot-%{version}%{?candidate:-%{candidate}}
|
||||||
|
|
||||||
cp %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4 .
|
cp %SOURCE1 %SOURCE2 .
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir builds
|
mkdir builds
|
||||||
|
|
||||||
%if 0%{?rhel} == 7
|
%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-only_defconfig O=builds/
|
||||||
#Enabling DTS for .el7
|
%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-all O=builds/
|
||||||
%{?enable_devtoolset7:%{enable_devtoolset7}}
|
|
||||||
|
%if %{with toolsonly}
|
||||||
|
%ifarch riscv64
|
||||||
|
export OPENSBI=%{_datadir}/%{opensbi}/generic/firmware/fw_dynamic.bin
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch aarch64 %{arm}
|
%ifarch aarch64 riscv64
|
||||||
for board in $(cat %{_arch}-boards)
|
for board in $(cat %{_arch}-boards)
|
||||||
do
|
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 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)
|
||||||
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)
|
sun50h6=(beelink_gs1 orangepi_3 orangepi_lite2 orangepi_one_plus orangepi_zero2 pine_h64 tanix_tx6)
|
||||||
if [[ " ${sun50h6[*]} " == *" $board "* ]]; then
|
if [[ " ${sun50h6[*]} " == *" $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)
|
rk3328=(evb-rk3328 nanopi-r2s-rk3328 rock64-rk3328 rock-pi-e-rk3328 roc-cc-rk3328)
|
||||||
if [[ " ${rk3328[*]} " == *" $board "* ]]; then
|
if [[ " ${rk3328[*]} " == *" $board "* ]]; then
|
||||||
echo "Board: $board using rk3328"
|
echo "Board: $board using rk3328"
|
||||||
cp /usr/share/arm-trusted-firmware/rk3328/* builds/$(echo $board)/
|
cp /usr/share/arm-trusted-firmware/rk3328/bl31.elf builds/$(echo $board)/atf-bl31
|
||||||
fi
|
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)
|
rk3399=(evb-rk3399 ficus-rk3399 firefly-rk3399 khadas-edge-captain-rk3399 khadas-edge-rk3399 khadas-edge-v-rk3399 leez-rk3399 nanopc-t4-rk3399 nanopi-m4-2gb-rk3399 nanopi-m4b-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 nanopi-r4s-rk3399 orangepi-rk3399 pinebook-pro-rk3399 pinephone-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 eaidk-610-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)/
|
||||||
|
cp builds/$(echo $board)/bl31.elf builds/$(echo $board)/atf-bl31
|
||||||
fi
|
fi
|
||||||
# End ATF
|
# End ATF
|
||||||
make $(echo $board)_defconfig O=builds/$(echo $board)/
|
|
||||||
%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" O=builds/$(echo $board)/
|
BINMAN_ALLOW_MISSING=1 make $(echo $board)_defconfig O=builds/$(echo $board)/
|
||||||
|
BINMAN_ALLOW_MISSING=1 %make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" O=builds/$(echo $board)/
|
||||||
|
|
||||||
|
# build spi images for rockchip boards with SPI flash
|
||||||
|
rkspi=(rock64-rk3328)
|
||||||
|
if [[ " ${rkspi[*]} " == *" $board "* ]]; then
|
||||||
|
echo "Board: $board with SPI flash"
|
||||||
|
builds/$(echo $board)/tools/mkimage -n rk3328 -T rkspi -d builds/$(echo $board)/tpl/u-boot-tpl.bin:builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/idbloader.spi
|
||||||
|
fi
|
||||||
|
rkspi=(evb-rk3399 khadas-edge-captain-rk3399 khadas-edge-rk3399 khadas-edge-v-rk3399 nanopc-t4-rk3399 pinebook-pro-rk3399 pinephone-pro-rk3399 rockpro64-rk3399 roc-pc-mezzanine-rk3399 roc-pc-rk3399)
|
||||||
|
if [[ " ${rkspi[*]} " == *" $board "* ]]; then
|
||||||
|
echo "Board: $board with SPI flash"
|
||||||
|
builds/$(echo $board)/tools/mkimage -n rk3399 -T rkspi -d builds/$(echo $board)/tpl/u-boot-tpl.bin:builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/idbloader.spi
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-only_defconfig O=builds/
|
|
||||||
%make_build HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" tools-all O=builds/
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
mkdir -p %{buildroot}%{_bindir}
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
|
mkdir -p %{buildroot}%{_mandir}/man1
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
|
mkdir -p %{buildroot}%{_datadir}/uboot/
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/
|
|
||||||
|
|
||||||
|
%if %{with toolsonly}
|
||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
for board in $(cat %{_arch}-boards)
|
for board in $(ls builds)
|
||||||
do
|
do
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
|
mkdir -p %{buildroot}%{_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 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 idbloader.spi spl/boot.bin 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) %{buildroot}%{_datadir}/uboot/$(echo $board)/
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
# For Apple M1 we also need the nodtb variant
|
||||||
|
install -p -m 0644 builds/apple_m1/u-boot-nodtb.bin %{buildroot}%{_datadir}/uboot/apple_m1/u-boot-nodtb.bin
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch riscv64
|
||||||
|
for board in $(ls builds)
|
||||||
|
do
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/uboot/$(echo $board)/
|
||||||
|
for file in u-boot.bin u-boot.dtb u-boot.img u-boot-nodtb.bin u-boot-dtb.bin u-boot.itb u-boot-dtb.img u-boot.its spl/u-boot-spl.bin spl/u-boot-spl-nodtb.bin spl/u-boot-spl.dtb spl/u-boot-spl-dtb.bin
|
||||||
|
do
|
||||||
|
if [ -f builds/$(echo $board)/$(echo $file) ]; then
|
||||||
|
install -p -m 0644 builds/$(echo $board)/$(echo $file) %{buildroot}%{_datadir}/uboot/$(echo $board)/
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{arm}
|
|
||||||
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/*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
|
|
||||||
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
|
|
||||||
|
|
||||||
# Bit of a hack to remove binaries we don't use as they're large
|
# Bit of a hack to remove binaries we don't use as they're large
|
||||||
for board in $(cat %{_arch}-boards)
|
%ifarch aarch64
|
||||||
|
for board in $(ls builds)
|
||||||
do
|
do
|
||||||
if [ -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-sunxi-with-spl.bin ]; then
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.dtb
|
||||||
rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.*
|
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot-sunxi-with-spl.bin ]; then
|
||||||
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot{,-dtb}.*
|
||||||
fi
|
fi
|
||||||
if [ -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/MLO ]; then
|
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/MLO ]; then
|
||||||
rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
||||||
fi
|
fi
|
||||||
if [ -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/SPL ]; then
|
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/SPL ]; then
|
||||||
rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
||||||
fi
|
fi
|
||||||
if [ -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.imx ]; then
|
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.imx ]; then
|
||||||
rm -f $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
||||||
|
fi
|
||||||
|
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot-spl.kwb ]; then
|
||||||
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.*
|
||||||
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot-spl.bin
|
||||||
|
fi
|
||||||
|
if [ -f %{buildroot}%{_datadir}/uboot/$(echo $board)/idbloader.img ]; then
|
||||||
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot.bin
|
||||||
|
rm -f %{buildroot}%{_datadir}/uboot/$(echo $board)/u-boot{,-dtb}.img
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
%endif
|
%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
|
for tool in dumpimage env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr gen_ethaddr_crc ifwitool img2srec kwboot mkeficapsule mkenvimage mkimage mksunxiboot ncb proftool sunxi-spl-image-builder
|
||||||
do
|
do
|
||||||
install -p -m 0755 builds/tools/$tool $RPM_BUILD_ROOT%{_bindir}
|
install -p -m 0755 builds/tools/$tool %{buildroot}%{_bindir}
|
||||||
done
|
done
|
||||||
install -p -m 0644 doc/mkimage.1 $RPM_BUILD_ROOT%{_mandir}/man1
|
install -p -m 0644 doc/mkimage.1 %{buildroot}%{_mandir}/man1
|
||||||
|
|
||||||
install -p -m 0755 builds/tools/env/fw_printenv $RPM_BUILD_ROOT%{_bindir}
|
install -p -m 0755 builds/tools/env/fw_printenv %{buildroot}%{_bindir}
|
||||||
( cd $RPM_BUILD_ROOT%{_bindir}; ln -sf fw_printenv fw_setenv )
|
( cd %{buildroot}%{_bindir}; ln -sf fw_printenv fw_setenv )
|
||||||
|
|
||||||
install -p -m 0644 tools/env/fw_env.config $RPM_BUILD_ROOT%{_sysconfdir}
|
# Copy some useful docs over
|
||||||
|
|
||||||
# Copy sone useful docs over
|
|
||||||
mkdir -p builds/docs
|
mkdir -p builds/docs
|
||||||
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/rockchip/evb_rk3399/README builds/docs/README.evb_rk3399
|
cp -p board/rockchip/evb_rk3399/README builds/docs/README.evb_rk3399
|
||||||
cp -p board/solidrun/clearfog/README builds/docs/README.clearfog
|
|
||||||
cp -p board/solidrun/mx6cuboxi/README builds/docs/README.mx6cuboxi
|
|
||||||
cp -p board/sunxi/README.sunxi64 builds/docs/README.sunxi64
|
cp -p board/sunxi/README.sunxi64 builds/docs/README.sunxi64
|
||||||
cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
|
cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
|
||||||
cp -p board/ti/am335x/README builds/docs/README.am335x
|
|
||||||
cp -p board/ti/omap5_uevm/README builds/docs/README.omap5_uevm
|
|
||||||
cp -p board/udoo/README builds/docs/README.udoo
|
|
||||||
cp -p board/wandboard/README builds/docs/README.wandboard
|
|
||||||
cp -p board/warp/README builds/docs/README.warp
|
|
||||||
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/develop/distro.rst doc/README.gpt
|
||||||
%doc doc/README.odroid doc/README.rockchip doc/uefi doc/uImage.FIT doc/arch/arm64.rst
|
%doc doc/README.rockchip doc/develop/uefi doc/uImage.FIT doc/arch/arm64.rst
|
||||||
%doc doc/README.chromium builds/docs/*
|
%doc builds/docs/* doc/board/amlogic/ doc/board/rockchip/
|
||||||
%doc doc/board/amlogic/ doc/board/rockchip/
|
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_mandir}/man1/mkimage.1*
|
%{_mandir}/man1/mkimage.1*
|
||||||
%dir %{_datadir}/uboot/
|
%dir %{_datadir}/uboot/
|
||||||
%config(noreplace) %{_sysconfdir}/fw_env.config
|
|
||||||
|
|
||||||
|
%if %{with toolsonly}
|
||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
%files -n uboot-images-armv8
|
%files -n uboot-images-armv8
|
||||||
%{_datadir}/uboot/*
|
%{_datadir}/uboot/*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch %{arm}
|
%ifarch riscv64
|
||||||
%files -n uboot-images-armv7
|
%files -n uboot-images-riscv64
|
||||||
%{_datadir}/uboot/*
|
%{_datadir}/uboot/*
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 07 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2023.04-1.4.riscv64
|
||||||
|
- Rebuild for a new OpenSBI (v1.3-45-g94197a8)
|
||||||
|
|
||||||
|
* Tue Aug 01 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2023.04-1.3.riscv64
|
||||||
|
- Rebuild for a new OpenSBI (v1.3.1)
|
||||||
|
|
||||||
|
* Tue Aug 01 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2023.04-1.2.riscv64
|
||||||
|
- Rebuild for a new OpenSBI (v1.3-40-gc2e6027)
|
||||||
|
|
||||||
|
* Wed Jul 05 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2023.04-1.1.riscv64
|
||||||
|
- Rebuild for a new OpenSBI (v1.3-2-geb736a5)
|
||||||
|
|
||||||
|
* Wed May 03 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2023.04-1.0.riscv64
|
||||||
|
- Add support for riscv64
|
||||||
|
|
||||||
|
* Tue Apr 04 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.04-1
|
||||||
|
- Update to 2023.04 GA
|
||||||
|
|
||||||
|
* Tue Mar 28 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.04-0.4.rc5
|
||||||
|
- Update to 2023.04 RC5
|
||||||
|
- Drop upstreamed patches
|
||||||
|
- Rockchip boot fixes
|
||||||
|
|
||||||
|
* Tue Mar 14 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.04-0.3.rc4
|
||||||
|
- Update to 2023.04 RC4
|
||||||
|
|
||||||
|
* Fri Feb 17 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.04-0.2.rc2
|
||||||
|
- Update to 2023.04 RC2
|
||||||
|
|
||||||
|
* Tue Jan 31 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.04-0.1.rc1
|
||||||
|
- Update to 2023.04 RC1
|
||||||
|
- Drop bmp_logo tool
|
||||||
|
|
||||||
|
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.01-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 18 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.01-1
|
||||||
|
- Update to 2023.01 GA
|
||||||
|
|
||||||
|
* Sat Dec 31 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.01-0.4.rc4
|
||||||
|
- Update PinePhone Pro to latest rev
|
||||||
|
|
||||||
|
* Tue Dec 20 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.01-0.3.rc4
|
||||||
|
- Update to 2023.01 RC4
|
||||||
|
|
||||||
|
* Mon Dec 05 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.01-0.2.rc3
|
||||||
|
- Update to 2023.01 RC3
|
||||||
|
|
||||||
|
* Thu Nov 24 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.01-0.1.rc2
|
||||||
|
- Update to U-Boot 2023.01 RC2
|
||||||
|
- Update Pinephone Pro patches
|
||||||
|
|
||||||
|
* Mon Oct 10 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.10-1
|
||||||
|
- Update to 2022.10 GA
|
||||||
|
|
||||||
|
* Tue Sep 06 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.10-0.6.rc4
|
||||||
|
- Update SMBIOS patch
|
||||||
|
|
||||||
|
* Tue Sep 06 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.10-0.5.rc4
|
||||||
|
- Update to 2022.10 RC4
|
||||||
|
- Fix for booting Rockchip devices from NVME
|
||||||
|
|
||||||
|
* Tue Aug 23 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.10-0.4.rc3
|
||||||
|
- Update to 2022.10 RC3
|
||||||
|
|
||||||
|
* Mon Aug 22 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 2022.10-0.3.rc1
|
||||||
|
- Install nodtb variant for Apple M1 (rhbz#2068958)
|
||||||
|
|
||||||
|
* Tue Aug 16 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.10-0.2.rc1
|
||||||
|
- Fix for DT property propogation via firmware
|
||||||
|
|
||||||
|
* Thu Jul 28 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.10-0.1.rc1
|
||||||
|
- Update to 2022.10 RC1
|
||||||
|
- Enable LTO for firmware builds
|
||||||
|
|
||||||
|
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.07-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jul 17 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.07-1
|
||||||
|
- Update to 2022.07 GA
|
||||||
|
|
||||||
|
* Mon Jul 04 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.07-0.6.rc6
|
||||||
|
- Update to 2022.07 RC6
|
||||||
|
|
||||||
|
* Mon Jun 20 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.07-0.5.rc5
|
||||||
|
- Update to 2022.07 RC5
|
||||||
|
|
||||||
|
* Sun Jun 12 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.07-0.4.rc4
|
||||||
|
- Update to 2022.07 RC4
|
||||||
|
- Some minor Rockchips device fixes
|
||||||
|
|
||||||
|
* Wed May 25 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.07-0.3.rc3
|
||||||
|
- Update to 2022.07 RC3
|
||||||
|
|
||||||
|
* Sat May 14 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.07-0.2.rc2
|
||||||
|
- Update to 2022.07 RC2
|
||||||
|
|
||||||
|
* Tue Apr 26 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.07-0.1.rc1
|
||||||
|
- Update to 2022.07 RC1
|
||||||
|
|
||||||
|
* Mon Apr 04 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.04-1
|
||||||
|
- Update to 2022.04 GA
|
||||||
|
|
||||||
|
* Mon Mar 28 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.04-0.4.rc5
|
||||||
|
- Update to 2022.04 RC5
|
||||||
|
|
||||||
|
* Tue Mar 08 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.04-0.3.rc3
|
||||||
|
- Update to 2022.04 RC3
|
||||||
|
- Enable new Rockchip devices
|
||||||
|
|
||||||
|
* Tue Feb 15 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.04-0.2.rc2
|
||||||
|
- Update to 2022.04 RC2
|
||||||
|
|
||||||
|
* Wed Feb 02 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.04-0.1.rc1
|
||||||
|
- Update to 2022.04 RC1
|
||||||
|
|
||||||
|
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.01-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 10 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.01-1
|
||||||
|
- Update to 2022.01
|
||||||
|
|
||||||
|
* Wed Jan 05 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.01-0.3.rc4
|
||||||
|
- Upstream fixes for PHY and UEFI
|
||||||
|
|
||||||
|
* Mon Dec 20 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.01-0.2.rc4
|
||||||
|
- Update to 2022.01 RC4
|
||||||
|
|
||||||
|
* Mon Nov 15 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2022.01-0.1.rc2
|
||||||
|
- Update to 2022.01 RC2
|
||||||
|
|
||||||
|
* Mon Nov 15 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-3
|
||||||
|
- Fixes for rk3399 devices
|
||||||
|
|
||||||
|
* Thu Oct 14 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-2
|
||||||
|
- Fix booting from MMC for Rockchip 3399 (rhbz #2014182)
|
||||||
|
- Enable new rk3399 devices (Leez, NanoPi-M4B, NanoPi-4S, NanoPi-T4) (rhbz #2009126)
|
||||||
|
|
||||||
|
* Mon Oct 04 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-1
|
||||||
|
- Update to 2021.10
|
||||||
|
|
||||||
|
* Mon Sep 27 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-0.7.rc5
|
||||||
|
- Update to 2021.10 RC5
|
||||||
|
|
||||||
|
* Wed Sep 15 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-0.6.rc4
|
||||||
|
- Update to 2021.10 RC4
|
||||||
|
- Proposed fix for RPi MMC clock issue
|
||||||
|
|
||||||
|
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2021.10-0.6.rc3
|
||||||
|
- Rebuilt with OpenSSL 3.0.0
|
||||||
|
|
||||||
|
* Mon Aug 30 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-0.5.rc3
|
||||||
|
- Update to 2021.10 RC3
|
||||||
|
|
||||||
|
* Tue Aug 24 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-0.4.rc2
|
||||||
|
- Fix for Raspberry Pi firmware properties
|
||||||
|
|
||||||
|
* Mon Aug 23 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-0.3.rc2
|
||||||
|
- Fix for rockchip SPI
|
||||||
|
|
||||||
|
* Mon Aug 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-0.2.rc2
|
||||||
|
- Update to 2021.10 RC2
|
||||||
|
|
||||||
|
* Sun Aug 08 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.10-0.1.rc1
|
||||||
|
- Update to 2021.10 RC1
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-2
|
||||||
|
- Fix regression for Rockchip devices running firmware from SPI flash
|
||||||
|
|
||||||
|
* Mon Jul 05 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-1
|
||||||
|
- Update to 2021.07 GA
|
||||||
|
|
||||||
|
* Mon Jun 28 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.6.rc5
|
||||||
|
- Update to 2021.07 RC5
|
||||||
|
- Build SPI fash images for ROC-PC-RK3399
|
||||||
|
|
||||||
|
* Mon Jun 07 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.5.rc4
|
||||||
|
- Update to 2021.07 RC4
|
||||||
|
|
||||||
|
* Sat Jun 05 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.4.rc3
|
||||||
|
- Fix AllWinner devices booting from mSD/MMC
|
||||||
|
|
||||||
|
* Tue May 25 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.3.rc3
|
||||||
|
- Update to 2021.07 RC3
|
||||||
|
- Build against ATF 2.5 GA
|
||||||
|
|
||||||
|
* Thu May 13 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.2.rc2
|
||||||
|
- Build against new ATF 2.5-rc1
|
||||||
|
|
||||||
|
* Mon May 10 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.1.rc2
|
||||||
|
- Update to 2021.07 RC2
|
||||||
|
|
||||||
|
* Wed Apr 28 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.04-3
|
||||||
|
- Upstream fix for console regression (rhbz 1946278)
|
||||||
|
- Fix for fallback.efi crash (rhbz 1733817)
|
||||||
|
|
||||||
|
* Wed Apr 21 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.04-2
|
||||||
|
- Revert keyboard console regression change (rhbz 1946278)
|
||||||
|
|
||||||
|
* Sun Apr 18 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.04-1
|
||||||
|
- Update to 2021.04 GA
|
||||||
|
- Fix DTB load check (rhbz 1946278)
|
||||||
|
- Build Rockchip SPI support as idbloader.spi
|
||||||
|
- Fixes for Rockchip devices
|
||||||
|
- Build Turris Omnia for MMC/SPI/UART
|
||||||
|
|
||||||
|
* Wed Mar 17 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.04-0.6.rc4
|
||||||
|
- Update to 2021.04 RC4
|
||||||
|
- Move to upstream fix for SMP on RPi3B and RPi3B+
|
||||||
|
|
||||||
|
* Sat Mar 13 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.04-0.5.rc3
|
||||||
|
- Fix for SMP on RPi3B and RPi3B+
|
||||||
|
- Initial support for Pinephone 3Gb edition
|
||||||
|
|
||||||
|
* Mon Mar 08 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.04-0.4.rc3
|
||||||
|
- Update to 2021.04 RC3
|
||||||
|
|
||||||
|
* Tue Feb 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.04-0.3.rc2
|
||||||
|
- Update to 2021.04 RC2
|
||||||
|
|
||||||
|
* Mon Feb 15 2021 Dennis Gilmore <dennis@ausil.us>
|
||||||
|
- build spi and uart images in addition to mmc for helios4 and clearfog
|
||||||
|
|
||||||
|
* Wed Feb 10 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.04-0.2.rc1
|
||||||
|
- Fixes for network issues on some Allwinner devices
|
||||||
|
|
||||||
|
* Mon Feb 01 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.04-0.1.rc1
|
||||||
|
- Update to 2021.04 RC1
|
||||||
|
- Add new upstream devices
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021.01-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 11 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-1
|
||||||
|
- Update to 2021.01 GA
|
||||||
|
- Updates for Raspberry Pi 4 Series of devices
|
||||||
|
|
||||||
|
* Tue Jan 5 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.5.rc5
|
||||||
|
- Update to 2021.01 RC5
|
||||||
|
|
||||||
* Sun Dec 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.4.rc4
|
* Sun Dec 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.01-0.4.rc4
|
||||||
- Update to 2021.01 RC4
|
- Update to 2021.01 RC4
|
||||||
- Latest RPi-400/CM4 support patch
|
- Latest RPi-400/CM4 support patch
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From cc3700b5c65494547308df395fe63166ff48a1e3 Mon Sep 17 00:00:00 2001
|
From 4306c538d4a00dd1aa46c55c3c4005c2b0bf7cd5 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: Thu, 24 Nov 2022 12:57:55 +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 | 37 +++++++++++++++++++++------------
|
||||||
1 file changed, 23 insertions(+), 10 deletions(-)
|
1 file changed, 24 insertions(+), 13 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 fcb319a20ae..e71004fad9c 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 @@
|
@@ -155,28 +155,39 @@
|
||||||
|
"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" \
|
||||||
|
@ -42,11 +44,13 @@ index ff29ef5a905..769477cd80e 100644
|
||||||
+ "scan_dev_for_dtb=" \
|
+ "scan_dev_for_dtb=" \
|
||||||
"setenv efi_fdtfile ${fdtfile}; " \
|
"setenv efi_fdtfile ${fdtfile}; " \
|
||||||
BOOTENV_EFI_SET_FDTFILE_FALLBACK \
|
BOOTENV_EFI_SET_FDTFILE_FALLBACK \
|
||||||
|
BOOTENV_RUN_EXTENSION_INIT \
|
||||||
- "for prefix in ${efi_dtb_prefixes}; do " \
|
- "for prefix in ${efi_dtb_prefixes}; do " \
|
||||||
- "if test -e ${devtype} " \
|
- "if test -e ${devtype} " \
|
||||||
- "${devnum}:${distro_bootpart} " \
|
- "${devnum}:${distro_bootpart} " \
|
||||||
- "${prefix}${efi_fdtfile}; then " \
|
- "${prefix}${efi_fdtfile}; then " \
|
||||||
- "run load_efi_dtb; " \
|
- "run load_efi_dtb; " \
|
||||||
|
- BOOTENV_RUN_EXTENSION_APPLY \
|
||||||
- "fi;" \
|
- "fi;" \
|
||||||
- "done;" \
|
- "done;" \
|
||||||
- "run boot_efi_bootmgr;" \
|
- "run boot_efi_bootmgr;" \
|
||||||
|
@ -63,10 +67,11 @@ index ff29ef5a905..769477cd80e 100644
|
||||||
+ "${devnum}:${dtb_devp} " \
|
+ "${devnum}:${dtb_devp} " \
|
||||||
+ "${prefix}${efi_fdtfile};"\
|
+ "${prefix}${efi_fdtfile};"\
|
||||||
+ "run load_efi_dtb; " \
|
+ "run load_efi_dtb; " \
|
||||||
|
+ BOOTENV_RUN_EXTENSION_APPLY \
|
||||||
+ "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/boot/"BOOTEFI_NAME"; then " \
|
||||||
|
@ -78,5 +83,5 @@ index ff29ef5a905..769477cd80e 100644
|
||||||
"fi; " \
|
"fi; " \
|
||||||
"setenv efi_fdtfile\0"
|
"setenv efi_fdtfile\0"
|
||||||
--
|
--
|
||||||
2.29.2
|
2.38.1
|
||||||
|
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
From d8fcb72d566b0ebca1613555ac13c0798817487e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Tue, 24 Nov 2020 10:37:28 +0000
|
|
||||||
Subject: [PATCH 2/2] use Fedora specific EFI path/name
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
include/config_distro_bootcmd.h | 10 +++++-----
|
|
||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
|
||||||
index 769477cd80e..22ce3685758 100644
|
|
||||||
--- a/include/config_distro_bootcmd.h
|
|
||||||
+++ b/include/config_distro_bootcmd.h
|
|
||||||
@@ -92,9 +92,9 @@
|
|
||||||
|
|
||||||
#ifdef CONFIG_EFI_LOADER
|
|
||||||
#if defined(CONFIG_ARM64)
|
|
||||||
-#define BOOTEFI_NAME "bootaa64.efi"
|
|
||||||
+#define BOOTEFI_NAME "grubaa64.efi"
|
|
||||||
#elif defined(CONFIG_ARM)
|
|
||||||
-#define BOOTEFI_NAME "bootarm.efi"
|
|
||||||
+#define BOOTEFI_NAME "grubarm.efi"
|
|
||||||
#elif defined(CONFIG_X86_RUN_32BIT)
|
|
||||||
#define BOOTEFI_NAME "bootia32.efi"
|
|
||||||
#elif defined(CONFIG_X86_RUN_64BIT)
|
|
||||||
@@ -132,7 +132,7 @@
|
|
||||||
\
|
|
||||||
"boot_efi_binary=" \
|
|
||||||
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
|
||||||
- "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \
|
|
||||||
+ "${kernel_addr_r} efi/fedora/"BOOTEFI_NAME"; " \
|
|
||||||
"if fdt addr ${fdt_addr_r}; then " \
|
|
||||||
"bootefi ${kernel_addr_r} ${fdt_addr_r};" \
|
|
||||||
"else " \
|
|
||||||
@@ -169,9 +169,9 @@
|
|
||||||
"run boot_efi_bootmgr\0" \
|
|
||||||
"scan_dev_for_efi=" \
|
|
||||||
"if test -e ${devtype} ${devnum}:${distro_bootpart} " \
|
|
||||||
- "efi/boot/"BOOTEFI_NAME"; then " \
|
|
||||||
+ "efi/fedora/"BOOTEFI_NAME"; then " \
|
|
||||||
"echo Found EFI removable media binary " \
|
|
||||||
- "efi/boot/"BOOTEFI_NAME"; " \
|
|
||||||
+ "efi/fedora/"BOOTEFI_NAME"; " \
|
|
||||||
"run scan_dev_for_dtb; " \
|
|
||||||
"echo EFI LOAD FAILED: continuing...; " \
|
|
||||||
"fi; " \
|
|
||||||
--
|
|
||||||
2.29.2
|
|
||||||
|
|
|
@ -1,115 +0,0 @@
|
||||||
From a49845f198af088c4e5e0019edbf519344d78c97 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
Date: Tue, 4 Dec 2018 15:29:14 +0000
|
|
||||||
Subject: [PATCH] usb kbd fixes
|
|
||||||
|
|
||||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
||||||
---
|
|
||||||
common/usb_kbd.c | 66 +++++++++++++++++++++++++++++++++++------------
|
|
||||||
include/console.h | 2 --
|
|
||||||
2 files changed, 50 insertions(+), 18 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
|
|
||||||
index 020f0d4117f..47674ce4458 100644
|
|
||||||
--- a/common/usb_kbd.c
|
|
||||||
+++ b/common/usb_kbd.c
|
|
||||||
@@ -518,25 +518,59 @@ static int probe_usb_keyboard(struct usb_device *dev)
|
|
||||||
return error;
|
|
||||||
|
|
||||||
stdinname = env_get("stdin");
|
|
||||||
-#if CONFIG_IS_ENABLED(CONSOLE_MUX)
|
|
||||||
- error = iomux_doenv(stdin, stdinname);
|
|
||||||
- if (error)
|
|
||||||
- return error;
|
|
||||||
-#else
|
|
||||||
- /* Check if this is the standard input device. */
|
|
||||||
- if (strcmp(stdinname, DEVNAME))
|
|
||||||
- return 1;
|
|
||||||
+ if (CONFIG_IS_ENABLED(CONSOLE_MUX)) {
|
|
||||||
+ char *devname = DEVNAME;
|
|
||||||
+ char *newstdin = NULL;
|
|
||||||
+ /*
|
|
||||||
+ * stdin might not be set yet.. either way, with console-
|
|
||||||
+ * mux the sensible thing to do is add ourselves to the
|
|
||||||
+ * list of stdio devices:
|
|
||||||
+ */
|
|
||||||
+ if (stdinname && !strstr(stdinname, DEVNAME)) {
|
|
||||||
+ newstdin = malloc(strlen(stdinname) +
|
|
||||||
+ strlen(","DEVNAME) + 1);
|
|
||||||
+ sprintf(newstdin, "%s,"DEVNAME, stdinname);
|
|
||||||
+ stdinname = newstdin;
|
|
||||||
+ } else if (!stdinname) {
|
|
||||||
+ stdinname = devname;
|
|
||||||
+ }
|
|
||||||
+ error = iomux_doenv(stdin, stdinname);
|
|
||||||
+ free(newstdin);
|
|
||||||
+ if (error)
|
|
||||||
+ goto unregister_stdio;
|
|
||||||
+ } else {
|
|
||||||
+ /* Check if this is the standard input device. */
|
|
||||||
+ if (strcmp(stdinname, DEVNAME)) {
|
|
||||||
+ error = -1;
|
|
||||||
+ goto unregister_stdio;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- /* Reassign the console */
|
|
||||||
- if (overwrite_console())
|
|
||||||
- return 1;
|
|
||||||
+ /* Reassign the console */
|
|
||||||
+ if (overwrite_console()) {
|
|
||||||
+ error = -1;
|
|
||||||
+ goto unregister_stdio;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- error = console_assign(stdin, DEVNAME);
|
|
||||||
- if (error)
|
|
||||||
- return error;
|
|
||||||
-#endif
|
|
||||||
+ error = console_assign(stdin, DEVNAME);
|
|
||||||
+ if (error)
|
|
||||||
+ goto unregister_stdio;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
|
|
||||||
+unregister_stdio:
|
|
||||||
+ /*
|
|
||||||
+ * If probe fails, the device will be removed.. leaving dangling
|
|
||||||
+ * pointers if the stdio device is not unregistered. If u-boot
|
|
||||||
+ * is built without stdio_deregister(), just pretend to succeed
|
|
||||||
+ * in order to avoid dangling pointers.
|
|
||||||
+ */
|
|
||||||
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
|
|
||||||
+ stdio_deregister(DEVNAME, 1);
|
|
||||||
+ return error;
|
|
||||||
+#else
|
|
||||||
return 0;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#if !CONFIG_IS_ENABLED(DM_USB)
|
|
||||||
@@ -642,7 +676,7 @@ static int usb_kbd_remove(struct udevice *dev)
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
err:
|
|
||||||
- printf("%s: warning, ret=%d", __func__, ret);
|
|
||||||
+ printf("%s: warning, ret=%d\n", __func__, ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/include/console.h b/include/console.h
|
|
||||||
index e935c601f12..6382ec8e0d6 100644
|
|
||||||
--- a/include/console.h
|
|
||||||
+++ b/include/console.h
|
|
||||||
@@ -56,8 +56,6 @@ int console_announce_r(void);
|
|
||||||
/*
|
|
||||||
* CONSOLE multiplexing.
|
|
||||||
*/
|
|
||||||
-#ifdef CONFIG_CONSOLE_MUX
|
|
||||||
#include <iomux.h>
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
--
|
|
||||||
2.19.2
|
|
||||||
|
|
Loading…
Reference in New Issue