summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorRoland Hieber <r.hieber@pengutronix.de>2017-12-06 16:52:57 +0100
committerRoland Hieber <r.hieber@pengutronix.de>2017-12-06 17:28:27 +0100
commita62ac3ec55152e8ccc3e730ad43b8a7f9f54a359 (patch)
tree5b1c8397a6351cc2c4565ecbcf641ab99cb43031 /configs
parenteaa4e2c02b78c1d4ac8e676767af3ccc406fe876 (diff)
downloadDistroKit-a62ac3ec55152e8ccc3e730ad43b8a7f9f54a359.tar.gz
DistroKit-a62ac3ec55152e8ccc3e730ad43b8a7f9f54a359.tar.xz
platform-rpi: barebox: re-enable booting from SD card
Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Diffstat (limited to 'configs')
-rw-r--r--configs/platform-rpi/patches/barebox-2017.11.0/0001-ARM-dts-bcm2835-rpi-re-enable-booting-from-SD-card.patch41
-rw-r--r--configs/platform-rpi/patches/barebox-2017.11.0/series4
2 files changed, 45 insertions, 0 deletions
diff --git a/configs/platform-rpi/patches/barebox-2017.11.0/0001-ARM-dts-bcm2835-rpi-re-enable-booting-from-SD-card.patch b/configs/platform-rpi/patches/barebox-2017.11.0/0001-ARM-dts-bcm2835-rpi-re-enable-booting-from-SD-card.patch
new file mode 100644
index 0000000..8278da4
--- /dev/null
+++ b/configs/platform-rpi/patches/barebox-2017.11.0/0001-ARM-dts-bcm2835-rpi-re-enable-booting-from-SD-card.patch
@@ -0,0 +1,41 @@
+From: Roland Hieber <rohieb@rohieb.name>
+Date: Wed, 6 Dec 2017 13:48:50 +0100
+Subject: [PATCH] ARM: dts: bcm2835-rpi: re-enable booting from SD card
+
+Kernel commit a19adf8d86e822eba502486524127595372c85f6 [0] changed the
+RPi1 device tree from &sdhci to &sdhost, which was imported in barebox
+commit d14b844b08635c717fb52a294ed8d6872e260315. It seems that barebox
+does not have a driver for brcm,bcm2835-sdhost (yet), which resulted in
+barebox unable to boot from SD card. However, the driver for
+brcm,bcm2835-sdhci worked fine in the past.
+
+Although the upstream change was made for good reasons, the simplest
+change for barebox for now is to revert to using &sdhci and disable
+&sdhost.
+
+Thanks to Alexander Dahl for raising this issue on the DistroKit
+mailing list!
+
+[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a19adf8d86e822eba502486524127595372c85f6
+
+Forwarded: barebox@lists.infradead.org; <20171206151233.29342-1-r.hieber@pengutronix.de>
+Signed-off-by: Roland Hieber <rohieb@rohieb.name>
+---
+ arch/arm/dts/bcm2835-rpi.dts | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/dts/bcm2835-rpi.dts b/arch/arm/dts/bcm2835-rpi.dts
+index 0095f58a3ce8..ab2d6dff64f5 100644
+--- a/arch/arm/dts/bcm2835-rpi.dts
++++ b/arch/arm/dts/bcm2835-rpi.dts
+@@ -9,3 +9,10 @@
+ reg = <0x0 0x0>;
+ };
+ };
++&sdhci {
++ status = "okay";
++};
++
++&sdhost {
++ status = "disabled";
++};
diff --git a/configs/platform-rpi/patches/barebox-2017.11.0/series b/configs/platform-rpi/patches/barebox-2017.11.0/series
new file mode 100644
index 0000000..25f37f2
--- /dev/null
+++ b/configs/platform-rpi/patches/barebox-2017.11.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-ARM-dts-bcm2835-rpi-re-enable-booting-from-SD-card.patch
+# ce4b7a36039f20595d7dd5b1da0828b3 - git-ptx-patches magic