mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-28 07:26:28 +00:00
Fix symbole
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
Pascal Vizeli
parent
445d6b2bf9
commit
e5ac0b674b
@ -1,8 +1,9 @@
|
||||
From ef723a74044c8b3ed29a1f3d048debd50fc9df96 Mon Sep 17 00:00:00 2001
|
||||
From 6344ec5c84a49c2df4c2f26b52d317a34e3bc0c7 Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
Date: Tue, 22 May 2018 20:11:13 +0000
|
||||
Subject: [PATCH 1/1] ARM: dts: bcm2836-rpi-2: re-enable booting from SD card
|
||||
Date: Mon, 4 Jun 2018 07:55:46 +0000
|
||||
Subject: [PATCH 1/3] 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(+)
|
||||
|
||||
@ -0,0 +1,112 @@
|
||||
From e3e89d8d6fd9ba6567bccb65a9d8221b5b01492e 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/3] 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 | 6 ++++++
|
||||
dts/src/arm/bcm283x.dtsi | 12 ++++--------
|
||||
4 files changed, 10 insertions(+), 16 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..2bb406e28 100644
|
||||
--- a/dts/src/arm/bcm2835-rpi.dtsi
|
||||
+++ b/dts/src/arm/bcm2835-rpi.dtsi
|
||||
@@ -27,6 +27,12 @@
|
||||
firmware = <&firmware>;
|
||||
#power-domain-cells = <1>;
|
||||
};
|
||||
+
|
||||
+ fb: fb {
|
||||
+ compatible = "brcm,bcm2708-fb";
|
||||
+ firmware = <&firmware>;
|
||||
+ 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
|
||||
|
||||
@ -1,88 +0,0 @@
|
||||
From af010303ac0e920ac517dc6d742b5ed703841005 Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
Date: Tue, 22 May 2018 21:08:15 +0000
|
||||
Subject: [PATCH 1/1] Add HassOS bootchoiser state
|
||||
|
||||
---
|
||||
arch/arm/dts/bcm2836-rpi-2.dts | 68 ++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 68 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/dts/bcm2836-rpi-2.dts b/arch/arm/dts/bcm2836-rpi-2.dts
|
||||
index 2fa1c8bb4..d882a9f86 100644
|
||||
--- a/arch/arm/dts/bcm2836-rpi-2.dts
|
||||
+++ b/arch/arm/dts/bcm2836-rpi-2.dts
|
||||
@@ -18,3 +18,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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 7b50b95d4da82135ce496a8f57325b7810f94342 Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
Date: Sun, 3 Jun 2018 22:42:58 +0000
|
||||
Subject: [PATCH 1/1] Remove kernel uart debug
|
||||
|
||||
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
|
||||
---
|
||||
arch/arm/dts/bcm2836-rpi-2.dts | 4 ----
|
||||
dts/src/arm/bcm283x.dtsi | 4 ----
|
||||
2 files changed, 8 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/dts/bcm2836-rpi-2.dts b/arch/arm/dts/bcm2836-rpi-2.dts
|
||||
index 6559b77b2..e41def570 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/bcm283x.dtsi b/dts/src/arm/bcm283x.dtsi
|
||||
index 9d293decf..dd50d5482 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>;
|
||||
--
|
||||
2.17.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user