From 2fdc4e881aef95a8ce1a6329e515a190a39327ef Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Tue, 15 Sep 2020 20:59:12 +0200 Subject: rpi: barebox: version bump 2018.03.0 -> 2020.08.1 Update to the latest barebox version, which also has the side effect that it can boot the newer Linux kernel (first bad Distrokit commit was 61b5ec910db2fe82a39f, 2019-05-06: "platform-rpi/v7a: kernel version bump 5.0 -> 5.1"). Enable regulator support to get around a build issue in the RPi board code [1], and allow color by default on the console. Also enable PINCTRL_BCM283X, since it was renamed from GPIO_BCM283X. For all other settings, use their default value. Add a patch to fix a build failure with the bcm2835 sdhci driver. [1]: "rpi-common.c:462:8: error: implicit declaration of function 'regulator_get_name'; did you mean 'regulator_enable'? [-Werror=implicit-function-declaration]", fixed upstream via Tested-by: Roland Hieber on rpi1-b, rpi-zero-w Signed-off-by: Roland Hieber --- .../0001-mci-bcm283x-depend-on-sdhci.patch | 34 ++++++++++++++++++++++ .../platform-rpi/patches/barebox-2020.08.1/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 configs/platform-rpi/patches/barebox-2020.08.1/0001-mci-bcm283x-depend-on-sdhci.patch create mode 100644 configs/platform-rpi/patches/barebox-2020.08.1/series (limited to 'configs/platform-rpi/patches') diff --git a/configs/platform-rpi/patches/barebox-2020.08.1/0001-mci-bcm283x-depend-on-sdhci.patch b/configs/platform-rpi/patches/barebox-2020.08.1/0001-mci-bcm283x-depend-on-sdhci.patch new file mode 100644 index 0000000..ca36da0 --- /dev/null +++ b/configs/platform-rpi/patches/barebox-2020.08.1/0001-mci-bcm283x-depend-on-sdhci.patch @@ -0,0 +1,34 @@ +From f4e43cb3efb3fefe3169a8697a96d8fb72d9e882 Mon Sep 17 00:00:00 2001 +From: Roland Hieber +Date: Tue, 15 Sep 2020 12:51:37 +0200 +Subject: [PATCH] mci: bcm283x: depend on sdhci + +The driver uses functions defined in sdhci.o, and will fail to build +otherwise: + + drivers/mci/mci-bcm2835.o: in function `bcm2835_mci_request': + drivers/mci/mci-bcm2835.c:134: undefined reference to `sdhci_set_cmd_xfer_mode' + arm-v5te-linux-gnueabi-ld: drivers/mci/mci-bcm2835.c:169: undefined reference to `sdhci_read_response' + arm-v5te-linux-gnueabi-ld: drivers/mci/mci-bcm2835.c:175: undefined reference to `sdhci_transfer_data' + +Forwarded: https://www.mail-archive.com/barebox@lists.infradead.org/msg36329.html +Signed-off-by: Roland Hieber +--- + drivers/mci/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig +index f7dc5c508912..6fb1c200f43e 100644 +--- a/drivers/mci/Kconfig ++++ b/drivers/mci/Kconfig +@@ -68,6 +68,7 @@ config MCI_S3C + + config MCI_BCM283X + bool "MCI support for BCM283X" ++ select MCI_SDHCI + depends on ARCH_BCM283X || COMPILE_TEST + + config MCI_BCM283X_SDHOST +-- +2.28.0 + diff --git a/configs/platform-rpi/patches/barebox-2020.08.1/series b/configs/platform-rpi/patches/barebox-2020.08.1/series new file mode 100644 index 0000000..74582b4 --- /dev/null +++ b/configs/platform-rpi/patches/barebox-2020.08.1/series @@ -0,0 +1 @@ +0001-mci-bcm283x-depend-on-sdhci.patch -- cgit v1.2.1