From 3d793dc7ef827a75556f24f926bf1984dea99731 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 29 Apr 2021 11:26:55 +0200 Subject: [PATCH] Drop global patch from Raspberry Pi patchset (#1346) Since 0001-CMD-read-string-from-fileinto-env.patch is in the global directory to be applied for U-Boot, drop it from the Raspberry Pi specific patch directory. --- ...01-CMD-read-string-from-fileinto-env.patch | 96 ------------------- ...IG_OF_BOARD-instead-of-CONFIG_EMBED.patch} | 8 +- ...-Disable-simple-framebuffer-support.patch} | 10 +- 3 files changed, 8 insertions(+), 106 deletions(-) delete mode 100644 buildroot-external/board/raspberrypi/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch rename buildroot-external/board/raspberrypi/patches/uboot/{0002-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch => 0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch} (86%) rename buildroot-external/board/raspberrypi/patches/uboot/{0003-raspberrypi-Disable-simple-framebuffer-support.patch => 0002-raspberrypi-Disable-simple-framebuffer-support.patch} (85%) diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch b/buildroot-external/board/raspberrypi/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch deleted file mode 100644 index b9bcd7324..000000000 --- a/buildroot-external/board/raspberrypi/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 340ac75139cb193e7510ca997b2ebe4ebf9b7591 Mon Sep 17 00:00:00 2001 -Message-Id: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> -From: Pascal Vizeli -Date: Sun, 5 Aug 2018 20:43:03 +0000 -Subject: [PATCH 1/3] CMD: read string from fileinto env - -Signed-off-by: Pascal Vizeli ---- - cmd/Kconfig | 5 +++++ - cmd/Makefile | 1 + - cmd/fileenv.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 51 insertions(+) - create mode 100644 cmd/fileenv.c - -diff --git a/cmd/Kconfig b/cmd/Kconfig -index 863b7f9fda..5c67b6d719 100644 ---- a/cmd/Kconfig -+++ b/cmd/Kconfig -@@ -1397,6 +1397,11 @@ config CMD_SETEXPR - Also supports loading the value at a memory location into a variable. - If CONFIG_REGEX is enabled, setexpr also supports a gsub function. - -+config CMD_FILEENV -+ bool "fileenv" -+ help -+ Read a file into memory and store it to env. -+ - endmenu - - menu "Android support commands" -diff --git a/cmd/Makefile b/cmd/Makefile -index 567e2b79d2..8804b70ca8 100644 ---- a/cmd/Makefile -+++ b/cmd/Makefile -@@ -140,6 +140,7 @@ obj-$(CONFIG_CMD_SF) += sf.o - obj-$(CONFIG_CMD_SCSI) += scsi.o disk.o - obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o - obj-$(CONFIG_CMD_SETEXPR) += setexpr.o -+obj-$(CONFIG_CMD_FILEENV) += fileenv.o - obj-$(CONFIG_CMD_SPI) += spi.o - obj-$(CONFIG_CMD_STRINGS) += strings.o - obj-$(CONFIG_CMD_SMC) += smccc.o -diff --git a/cmd/fileenv.c b/cmd/fileenv.c -new file mode 100644 -index 0000000000..af24d22d0e ---- /dev/null -+++ b/cmd/fileenv.c -@@ -0,0 +1,45 @@ -+#include -+#include -+#include -+#include -+ -+static char *fs_argv[5]; -+ -+int do_fileenv(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) -+{ -+ if (argc < 6) -+ return CMD_RET_USAGE; -+ -+ fs_argv[0] = "fatload"; -+ fs_argv[1] = argv[1]; -+ fs_argv[2] = argv[2]; -+ fs_argv[3] = argv[3]; -+ fs_argv[4] = argv[4]; -+ -+ if (do_fat_fsload(cmdtp, 0, 5, fs_argv) != 0) -+ return 1; -+ -+ char *addr = (char *)simple_strtoul(argv[3], NULL, 16); -+ size_t size = env_get_hex("filesize", 0); -+ -+ // Prepare string -+ addr[size] = 0x00; -+ char *s = addr; -+ while(*s != 0x00) { -+ if (isprint(*s)) { -+ s++; -+ } -+ else { -+ *s = 0x00; -+ } -+ } -+ -+ return env_set(argv[5], addr); -+} -+ -+U_BOOT_CMD( -+ fileenv, 6, 0, do_fileenv, -+ "Read file and store it into env.", -+ " \n" -+ " - Read file from fat32 and store it as env." -+); --- -2.31.1 - diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch b/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch similarity index 86% rename from buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch index 5d6f9a13e..c3274c7bc 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch @@ -1,10 +1,8 @@ -From 9cb97076d98f7f68534abb3d1f596644ae730841 Mon Sep 17 00:00:00 2001 -Message-Id: <9cb97076d98f7f68534abb3d1f596644ae730841.1617731519.git.stefan@agner.ch> -In-Reply-To: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> -References: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> +From 76cd0b31510f2019e411593e1a177ca8280b56b3 Mon Sep 17 00:00:00 2001 +Message-Id: <76cd0b31510f2019e411593e1a177ca8280b56b3.1619686343.git.stefan@agner.ch> From: Pascal Vizeli Date: Tue, 10 Dec 2019 09:48:46 +0000 -Subject: [PATCH 2/3] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED +Subject: [PATCH 1/2] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED Signed-off-by: Pascal Vizeli --- diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0003-raspberrypi-Disable-simple-framebuffer-support.patch b/buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch similarity index 85% rename from buildroot-external/board/raspberrypi/patches/uboot/0003-raspberrypi-Disable-simple-framebuffer-support.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch index c2d2aea12..c1bf890b2 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0003-raspberrypi-Disable-simple-framebuffer-support.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch @@ -1,10 +1,10 @@ -From 69ac2930e69ca876f8da95d80f4a1cb8cc23bb6a Mon Sep 17 00:00:00 2001 -Message-Id: <69ac2930e69ca876f8da95d80f4a1cb8cc23bb6a.1617731519.git.stefan@agner.ch> -In-Reply-To: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> -References: <340ac75139cb193e7510ca997b2ebe4ebf9b7591.1617731519.git.stefan@agner.ch> +From 8c11937b388dfafcdff27914d361532dc805245f Mon Sep 17 00:00:00 2001 +Message-Id: <8c11937b388dfafcdff27914d361532dc805245f.1619686343.git.stefan@agner.ch> +In-Reply-To: <76cd0b31510f2019e411593e1a177ca8280b56b3.1619686343.git.stefan@agner.ch> +References: <76cd0b31510f2019e411593e1a177ca8280b56b3.1619686343.git.stefan@agner.ch> From: Florin Sarbu Date: Thu, 12 Sep 2019 12:31:31 +0200 -Subject: [PATCH 3/3] raspberrypi: Disable simple framebuffer support +Subject: [PATCH 2/2] raspberrypi: Disable simple framebuffer support On 4.19 kernels this u-boot driver clashes with bcm2708_fb. So let's disable it from here so that we have bcm2708_fb