diff options
| author | Chris Fiege <chris@tinyhost.de> | 2018-11-19 20:37:40 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2018-11-28 08:39:24 +0100 |
| commit | 84bf0178665c6ccc7f7bbe3261aa7cbfe57f41f4 (patch) | |
| tree | 785ca1b0deb778cab4f426b3234be0dad5c18fde /configs/platform-rpi/patches | |
| parent | adf01496514ce6b3836a1a6d80eeb119e99630a9 (diff) | |
| download | DistroKit-84bf0178665c6ccc7f7bbe3261aa7cbfe57f41f4.tar.gz DistroKit-84bf0178665c6ccc7f7bbe3261aa7cbfe57f41f4.tar.xz | |
platform-rpi: Remove barebox-2017.11.0 patches
These patch has been merged by upstream and is part of barebox
since 2017.12.0.
Signed-off-by: Chris Fiege <chris@tinyhost.de>
Diffstat (limited to 'configs/platform-rpi/patches')
| -rw-r--r-- | configs/platform-rpi/patches/barebox-2017.11.0/0001-ARM-dts-bcm2835-rpi-re-enable-booting-from-SD-card.patch | 41 | ||||
| -rw-r--r-- | configs/platform-rpi/patches/barebox-2017.11.0/series | 4 |
2 files changed, 0 insertions, 45 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 deleted file mode 100644 index 8278da4..0000000 --- a/configs/platform-rpi/patches/barebox-2017.11.0/0001-ARM-dts-bcm2835-rpi-re-enable-booting-from-SD-card.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 25f37f2..0000000 --- a/configs/platform-rpi/patches/barebox-2017.11.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# 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 |