d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better group boards like rpi

Browse Source 
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
Pascal Vizeli
2018-06-08 13:00:18 +00:00
parent 96a5f891ba
commit a57864c199
29 changed files with 11 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
buildroot-external/board/raspberrypi/patches/barebox/0001-ARM-dts-bcm2836-rpi-2-re-enable-booting-from-SD-card.patch Normal file
View File

@@ -0,0 +1,30 @@
From 6344ec5c84a49c2df4c2f26b52d317a34e3bc0c7 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 4 Jun 2018 07:55:46 +0000
Subject: [PATCH 1/2] ARM: dts: bcm2836-rpi-2: re-enable booting from SD card
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
arch/arm/dts/bcm2836-rpi-2.dts | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/dts/bcm2836-rpi-2.dts b/arch/arm/dts/bcm2836-rpi-2.dts
index 42b6abb18..2fa1c8bb4 100644
--- a/arch/arm/dts/bcm2836-rpi-2.dts
+++ b/arch/arm/dts/bcm2836-rpi-2.dts
@@ -9,3 +9,12 @@
reg = <0x0 0x0>;
};
};
+
+&sdhci {
+ status = "okay";
+};
+
+&sdhost {
+ status = "disabled";
+};
+
--
2.17.0

167
buildroot-external/board/raspberrypi/patches/barebox/0002-ARM-dts-add-more-functions.patch Normal file
View File

@@ -0,0 +1,167 @@
From 114c8fd0327f1c0f1bf886953c600e2a72a55df7 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 4 Jun 2018 09:17:25 +0000
Subject: [PATCH 2/2] ARM: dts: add more functions
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
arch/arm/dts/bcm2835-rpi.dts | 4 ---
arch/arm/dts/bcm2836-rpi-2.dts | 4 ---
dts/src/arm/bcm2835-rpi.dtsi | 46 ++++++++++++++++++++++++++++++++--
dts/src/arm/bcm283x.dtsi | 12 +++------
4 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts
index c23e7c7c1..22d60e961 100644
--- a/arch/arm/dts/bcm2835-rpi.dts
+++ b/arch/arm/dts/bcm2835-rpi.dts
@@ -1,10 +1,6 @@
#include <arm/bcm2835-rpi-a.dts>
/ {
- chosen {
- stdout-path = &uart0;
- };
-
memory {
reg = <0x0 0x0>;
};
diff --git a/arch/arm/dts/bcm2836-rpi-2.dts b/arch/arm/dts/bcm2836-rpi-2.dts
index 2fa1c8bb4..bdee1296e 100644
--- a/arch/arm/dts/bcm2836-rpi-2.dts
+++ b/arch/arm/dts/bcm2836-rpi-2.dts
@@ -1,10 +1,6 @@
#include <arm/bcm2836-rpi-2-b.dts>
/ {
- chosen {
- stdout-path = &uart0;
- };
-
memory {
reg = <0x0 0x0>;
};
diff --git a/dts/src/arm/bcm2835-rpi.dtsi b/dts/src/arm/bcm2835-rpi.dtsi
index e36c392a2..d3dfb4b3e 100644
--- a/dts/src/arm/bcm2835-rpi.dtsi
+++ b/dts/src/arm/bcm2835-rpi.dtsi
@@ -27,6 +27,39 @@
firmware = <&firmware>;
#power-domain-cells = <1>;
};
+
+ fb: fb {
+ compatible = "brcm,bcm2708-fb";
+ firmware = <&firmware>;
+ status = "okay";
+ };
+
+ vchiq: vchiq {
+ compatible = "brcm,bcm2835-vchiq";
+ reg = <0x7e00b840 0xf>;
+ interrupts = <0 2>;
+ cache-line-size = <32>;
+ firmware = <&firmware>;
+ };
+
+ vcsm: vcsm {
+ compatible = "raspberrypi,bcm2835-vcsm";
+ firmware = <&firmware>;
+ status = "okay";
+ };
+
+ /* Onboard audio */
+ audio: audio {
+ compatible = "brcm,bcm2835-audio";
+ brcm,pwm-channels = <8>;
+ status = "okay";
+ };
+
+ /* External sound card */
+ sound: sound {
+ status = "disabled";
+ };
+
};
};
@@ -91,12 +124,12 @@
&hdmi {
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
- status = "okay";
+ status = "disabled";
};
&vec {
power-domains = <&power RPI_POWER_DOMAIN_VEC>;
- status = "okay";
+ status = "disabled";
};
&dsi0 {
@@ -106,3 +139,12 @@
&dsi1 {
power-domains = <&power RPI_POWER_DOMAIN_DSI1>;
};
+
+&v3d {
+ status = "disabled";
+};
+
+&vc4 {
+ status = "disabled";
+};
+
diff --git a/dts/src/arm/bcm283x.dtsi b/dts/src/arm/bcm283x.dtsi
index 9d293decf..0abb72a47 100644
--- a/dts/src/arm/bcm283x.dtsi
+++ b/dts/src/arm/bcm283x.dtsi
@@ -26,10 +26,6 @@
serial1 = &uart1;
};
- chosen {
- stdout-path = "serial0:115200n8";
- };
-
thermal-zones {
cpu_thermal: cpu-thermal {
polling-delay-passive = <0>;
@@ -426,13 +422,13 @@
status = "disabled";
};
- pixelvalve@7e206000 {
+ pixelvalve0: pixelvalve@7e206000 {
compatible = "brcm,bcm2835-pixelvalve0";
reg = <0x7e206000 0x100>;
interrupts = <2 13>; /* pwa0 */
};
- pixelvalve@7e207000 {
+ pixelvalve1: pixelvalve@7e207000 {
compatible = "brcm,bcm2835-pixelvalve1";
reg = <0x7e207000 0x100>;
interrupts = <2 14>; /* pwa1 */
@@ -518,7 +514,7 @@
status = "disabled";
};
- hvs@7e400000 {
+ hvs: hvs@7e400000 {
compatible = "brcm,bcm2835-hvs";
reg = <0x7e400000 0x6000>;
interrupts = <2 1>;
@@ -572,7 +568,7 @@
status = "disabled";
};
- pixelvalve@7e807000 {
+ pixelvalve2: pixelvalve@7e807000 {
compatible = "brcm,bcm2835-pixelvalve2";
reg = <0x7e807000 0x100>;
interrupts = <2 10>; /* pixelvalve */
--
2.17.0

167
buildroot-external/board/raspberrypi/patches/barebox/0003-Add-HassOS-bootchoiser-state.patch Normal file
View File

@@ -0,0 +1,167 @@
From 3fe92c12e01e35cc97fbd92d8ae098ac583cfa1f Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 4 Jun 2018 09:25:40 +0000
Subject: [PATCH 3/3] Add HassOS bootchoiser state
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
arch/arm/dts/bcm2835-rpi.dts | 69 ++++++++++++++++++++++++++++++++++
arch/arm/dts/bcm2836-rpi-2.dts | 68 +++++++++++++++++++++++++++++++++
2 files changed, 137 insertions(+)
diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts
index 22d60e961..3357d06b7 100644
--- a/arch/arm/dts/bcm2835-rpi.dts
+++ b/arch/arm/dts/bcm2835-rpi.dts
@@ -13,3 +13,72 @@
&sdhost {
status = "disabled";
};
+
+/ {
+
+ aliases {
+ state = &state;
+ };
+
+ state: state {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ magic = <0xef98423f>;
+ compatible = "barebox,state";
+ backend = <&backend_state>;
+ backend-type = "raw";
+ backend-stridesize = <4048>;
+
+ bootstate {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ system0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ remaining_attempts@0 {
+ reg = <0x0 0x4>;
+ type = "uint32";
+ default = <3>;
+ };
+ priority@4 {
+ reg = <0x4 0x4>;
+ type = "uint32";
+ default = <20>;
+ };
+ };
+ system1 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ remaining_attempts@8 {
+ reg = <0x8 0x4>;
+ type = "uint32";
+ default = <0>;
+ };
+ priority@c {
+ reg = <0xc 0x4>;
+ type = "uint32";
+ default = <10>;
+ };
+ };
+ last_chosen@10 {
+ reg = <0x10 0x4>;
+ type = "uint32";
+ };
+ };
+ };
+};
+
+&sdhci {
+ partitions {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "fixed-partitions";
+
+ backend_state: partition@22100000 {
+ label = "state";
+ reg = <0x22100000 0x800000>;
+ };
+ };
+};
+
diff --git a/arch/arm/dts/bcm2836-rpi-2.dts b/arch/arm/dts/bcm2836-rpi-2.dts
index bdee1296e..e41def570 100644
--- a/arch/arm/dts/bcm2836-rpi-2.dts
+++ b/arch/arm/dts/bcm2836-rpi-2.dts
@@ -14,3 +14,71 @@
status = "disabled";
};
+/ {
+
+ aliases {
+ state = &state;
+ };
+
+ state: state {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ magic = <0xef98423f>;
+ compatible = "barebox,state";
+ backend = <&backend_state>;
+ backend-type = "raw";
+ backend-stridesize = <4048>;
+
+ bootstate {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ system0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ remaining_attempts@0 {
+ reg = <0x0 0x4>;
+ type = "uint32";
+ default = <3>;
+ };
+ priority@4 {
+ reg = <0x4 0x4>;
+ type = "uint32";
+ default = <20>;
+ };
+ };
+ system1 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ remaining_attempts@8 {
+ reg = <0x8 0x4>;
+ type = "uint32";
+ default = <0>;
+ };
+ priority@c {
+ reg = <0xc 0x4>;
+ type = "uint32";
+ default = <10>;
+ };
+ };
+ last_chosen@10 {
+ reg = <0x10 0x4>;
+ type = "uint32";
+ };
+ };
+ };
+};
+
+&sdhci {
+ partitions {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "fixed-partitions";
+
+ backend_state: partition@22100000 {
+ label = "state";
+ reg = <0x22100000 0x800000>;
+ };
+ };
+};
+
--
2.17.0

42
buildroot-external/board/raspberrypi/patches/barebox/0004-common-state-allow-to-overlay-state-backend.patch Normal file
View File

@@ -0,0 +1,42 @@
From 19ab0b433893cc7d16e8f4a6052f0f784131c43a Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Sat, 2 Jun 2018 22:08:31 +0000
Subject: [PATCH 1/1] common: state: allow to overlay state backend
This allow to use overlay for state backends. I.e. on raspberry you need
use barebox with SDHCI (slow) and after linux boot it will use SDHOST driver.
But the problem now is, that the state is on SDHCI and dt-utils need it on
SDHOST. Actual it is not possible to overwrite this.
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
common/state/state.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/common/state/state.c b/common/state/state.c
index 25d950211..e6259043f 100644
--- a/common/state/state.c
+++ b/common/state/state.c
@@ -494,8 +494,17 @@ static int of_state_fixup(struct device_node *root, void *ctx)
}
/* backend phandle */
- backend_node = of_find_node_by_reproducible_name(root,
- state->backend_reproducible_name);
+ if (node) {
+ ret = of_property_read_u32(node, "backend", &phandle);
+ if (ret)
+ goto out;
+
+ backend_node = of_find_node_by_phandle_from(phandle, root);
+ } else {
+ backend_node = of_find_node_by_reproducible_name(root,
+ state->backend_reproducible_name);
+ }
+
if (!backend_node) {
ret = -ENODEV;
goto out;
--
2.17.0