jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-28 15:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix overlay sdhost

Browse Source
This commit is contained in:
Pascal Vizeli 2018-06-04 16:30:01 +00:00
parent e5ac0b674b
commit 2afef71117
8 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot-external/board/rpi2/barebox-env/init/rpi_bootargs
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
global linux.bootargs.rpi="cma=64M" global linux.bootargs.rpi="bcm2708_fb.fbwidth=656 bcm2708_fb.fbheight=416 bcm2708_fb.fbswap=1 vc_mem.mem_base=0x3ec00000 vc_mem.mem_size=0x40000000"

BIN
buildroot-external/board/rpi2/barebox-env/overlay/rpi-dwc.dtbo
View File

Binary file not shown.

BIN
buildroot-external/board/rpi2/barebox-env/overlay/rpi-v3d.dtbo
View File

Binary file not shown.

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

@ -1,7 +1,7 @@
From 6344ec5c84a49c2df4c2f26b52d317a34e3bc0c7 Mon Sep 17 00:00:00 2001 From 6344ec5c84a49c2df4c2f26b52d317a34e3bc0c7 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch> From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 4 Jun 2018 07:55:46 +0000 Date: Mon, 4 Jun 2018 07:55:46 +0000
Subject: [PATCH 1/3] ARM: dts: bcm2836-rpi-2: re-enable booting from SD card Subject: [PATCH 1/2] ARM: dts: bcm2836-rpi-2: re-enable booting from SD card
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
--- ---

61
buildroot-external/board/rpi2/patches/barebox/0002-ARM-dts-add-more-functions.patch
View File

@ -1,15 +1,15 @@
From e3e89d8d6fd9ba6567bccb65a9d8221b5b01492e Mon Sep 17 00:00:00 2001 From 1f5edc2b907c89a3e27f55490479a0999b1127dc Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch> From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 4 Jun 2018 09:17:25 +0000 Date: Mon, 4 Jun 2018 09:17:25 +0000
Subject: [PATCH 2/3] ARM: dts: add more functions Subject: [PATCH 2/2] ARM: dts: add more functions
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
--- ---
arch/arm/dts/bcm2835-rpi.dts | 4 ---- arch/arm/dts/bcm2835-rpi.dts | 4 ----
arch/arm/dts/bcm2836-rpi-2.dts | 4 ---- arch/arm/dts/bcm2836-rpi-2.dts | 4 ----
dts/src/arm/bcm2835-rpi.dtsi | 6 ++++++ dts/src/arm/bcm2835-rpi.dtsi | 38 ++++++++++++++++++++++++++++++++--
dts/src/arm/bcm283x.dtsi | 12 ++++-------- dts/src/arm/bcm283x.dtsi | 12 ++++-------
4 files changed, 10 insertions(+), 16 deletions(-) 4 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts
index c23e7c7c1..22d60e961 100644 index c23e7c7c1..22d60e961 100644
@ -42,10 +42,10 @@ index 2fa1c8bb4..bdee1296e 100644
reg = <0x0 0x0>; reg = <0x0 0x0>;
}; };
diff --git a/dts/src/arm/bcm2835-rpi.dtsi b/dts/src/arm/bcm2835-rpi.dtsi diff --git a/dts/src/arm/bcm2835-rpi.dtsi b/dts/src/arm/bcm2835-rpi.dtsi
index e36c392a2..2bb406e28 100644 index e36c392a2..86f1d493c 100644
--- a/dts/src/arm/bcm2835-rpi.dtsi --- a/dts/src/arm/bcm2835-rpi.dtsi
+++ b/dts/src/arm/bcm2835-rpi.dtsi +++ b/dts/src/arm/bcm2835-rpi.dtsi
@@ -27,6 +27,12 @@ @@ -27,6 +27,39 @@
firmware = <&firmware>; firmware = <&firmware>;
#power-domain-cells = <1>; #power-domain-cells = <1>;
}; };
@ -53,11 +53,58 @@ index e36c392a2..2bb406e28 100644
+ fb: fb { + fb: fb {
+ compatible = "brcm,bcm2708-fb"; + compatible = "brcm,bcm2708-fb";
+ firmware = <&firmware>; + 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"; + 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,4 @@
&dsi1 {
power-domains = <&power RPI_POWER_DOMAIN_DSI1>;
};
+
diff --git a/dts/src/arm/bcm283x.dtsi b/dts/src/arm/bcm283x.dtsi diff --git a/dts/src/arm/bcm283x.dtsi b/dts/src/arm/bcm283x.dtsi
index 9d293decf..0abb72a47 100644 index 9d293decf..0abb72a47 100644
--- a/dts/src/arm/bcm283x.dtsi --- a/dts/src/arm/bcm283x.dtsi

BIN
fdt/rpi-dwc.dtbo
View File

Binary file not shown.

2
fdt/rpi-dwc.dtso
View File

@ -8,7 +8,7 @@
target = <&usb>; target = <&usb>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
dwc2_usb: __overlay__ { __overlay__ {
compatible = "brcm,bcm2835-usb"; compatible = "brcm,bcm2835-usb";
reg = <0x7e980000 0x10000>; reg = <0x7e980000 0x10000>;
interrupts = <1 9>; interrupts = <1 9>;

5
scripts/update-dtb.sh
View File

@ -9,7 +9,8 @@ dtc -@ -I dts -O dtb -o fdt/barebox-state-rpi.dtbo fdt/barebox-state-rpi.dtso
cp -f fdt/barebox-state-rpi.dtbo buildroot-external/board/rpi2/barebox-env/overlay/ cp -f fdt/barebox-state-rpi.dtbo buildroot-external/board/rpi2/barebox-env/overlay/
dtc -@ -I dts -O dtb -o fdt/rpi-v3d.dtbo fdt/rpi-v3d.dtso dtc -@ -I dts -O dtb -o fdt/rpi-v3d.dtbo fdt/rpi-v3d.dtso
cp -f fdt/rpi-v3d.dtbo buildroot-external/board/rpi2/barebox-env/overlay/ #cp -f fdt/rpi-v3d.dtbo buildroot-external/board/rpi2/barebox-env/overlay/
dtc -@ -I dts -O dtb -o fdt/rpi-dwc.dtbo fdt/rpi-dwc.dtso dtc -@ -I dts -O dtb -o fdt/rpi-dwc.dtbo fdt/rpi-dwc.dtso
cp -f fdt/rpi-dwc.dtbo buildroot-external/board/rpi2/barebox-env/overlay/ #cp -f fdt/rpi-dwc.dtbo buildroot-external/board/rpi2/barebox-env/overlay/