summaryrefslogtreecommitdiffstats
path: root/configs/platform-v7a/patches/barebox-2020.01.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2020-02-19 11:43:45 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2020-02-19 16:28:49 +0100
commit1d84e5419f509c984efcf5d81e1d7a25aff51c1c (patch)
tree3f919339e649db091a728311050faa16210cd0cc /configs/platform-v7a/patches/barebox-2020.01.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch
parentdc788e1c1c1921321377754e47fc558558456019 (diff)
downloadDistroKit-1d84e5419f509c984efcf5d81e1d7a25aff51c1c.tar.gz
DistroKit-1d84e5419f509c984efcf5d81e1d7a25aff51c1c.tar.xz
v7a: barebox: version bump 2020.01.0 -> 2020.02.0
barebox v2020.02.0 has just been released. Drop the now upstream rpi patches, oldconfig the configs and use it. As seen in the config diffs, two of our configuration options have changed with this release: CONFIG_CLOCKSOURCE_ARMV8_TIMER=y: barebox support for ARMv7 (and ARMv8) architected timers on >= ARMv7 has now been reenabled. This should improve clocksource accuracy on the rpi3 and vexpress. The name will be changed to indicate that it's not ARMv8 specific in v2020.03.0. CONFIG_DEFAULT_ENVIRONMENT=n in am335x-mlo: This symbol became selectable even without CONFIG_ENV_HANDLING. We didn't use the environment before for this configuration, so we probably don't want to start now, so this is left disabled. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Diffstat (limited to 'configs/platform-v7a/patches/barebox-2020.01.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch')
-rw-r--r--configs/platform-v7a/patches/barebox-2020.01.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch59
1 files changed, 0 insertions, 59 deletions
diff --git a/configs/platform-v7a/patches/barebox-2020.01.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch
deleted file mode 100644
index 54cc301..0000000
--- a/configs/platform-v7a/patches/barebox-2020.01.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Sascha Hauer <s.hauer@pengutronix.de>
-Date: Wed, 18 Dec 2019 14:55:15 +0100
-Subject: [PATCH] ARM: rpi: Do not warn when firmware doesn't pass a dtb
-
-When there is no dtb placed in the boot partition then none is passed by
-the firmware to barebox. This may be intended, so do not warn about it.
-
-Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
----
- arch/arm/boards/raspberry-pi/lowlevel.c | 9 ++++++++-
- arch/arm/boards/raspberry-pi/rpi-common.c | 11 +++++++----
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/boards/raspberry-pi/lowlevel.c b/arch/arm/boards/raspberry-pi/lowlevel.c
-index 70f1936522e2..d58beb605255 100644
---- a/arch/arm/boards/raspberry-pi/lowlevel.c
-+++ b/arch/arm/boards/raspberry-pi/lowlevel.c
-@@ -11,8 +11,15 @@ static void copy_vc_fdt(void *dest, void *src, unsigned long max_size)
- {
- struct fdt_header *oftree_src = src;
- struct fdt_header *oftree_dest = dest;
-+ unsigned long size;
-
-- unsigned long size = be32_to_cpu(oftree_src->totalsize);
-+ if (!src) {
-+ oftree_dest->magic = cpu_to_be32(VIDEOCORE_FDT_ERROR);
-+ oftree_dest->totalsize = cpu_to_be32(0);
-+ return;
-+ }
-+
-+ size = be32_to_cpu(oftree_src->totalsize);
- if (size > max_size) {
- oftree_dest->magic = cpu_to_be32(VIDEOCORE_FDT_ERROR);
- /* Save an error code after the magic value for easier
-diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
-index dd6bbd5bdd9c..acb26f6a6491 100644
---- a/arch/arm/boards/raspberry-pi/rpi-common.c
-+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
-@@ -433,13 +433,16 @@ static void rpi_vc_fdt(void)
-
- oftree = saved_vc_fdt;
- magic = be32_to_cpu(oftree->magic);
-- if (magic != FDT_MAGIC) {
-- pr_err("videocore fdt saved in pbl has invalid magic\n");
-
-- if (magic == VIDEOCORE_FDT_ERROR) {
-+ if (magic == VIDEOCORE_FDT_ERROR) {
-+ if (oftree->totalsize)
- pr_err("there was an error copying fdt in pbl: %d\n",
- be32_to_cpu(oftree->totalsize));
-- }
-+ return;
-+ }
-+
-+ if (magic != FDT_MAGIC) {
-+ pr_err("videocore fdt saved in pbl has invalid magic\n");
- return;
- }
-