From d4372b0df2be0da55cf2e72268954dd456fed037 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 3 Jul 2023 23:39:46 -0700 Subject: [PATCH] coreboot: drop CONFIG_LINUX_COMMAND_LINE patch This patch is no longer needed, and in fact it now ends up clobbering the command line in the FIT DTB, so we must drop it. --- src/coreboot/default.nix | 1 - ...l-linux-allow-CONFIG_LINUX_COMMAND_L.patch | 40 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 src/coreboot/patches/0008-payloads-external-linux-allow-CONFIG_LINUX_COMMAND_L.patch diff --git a/src/coreboot/default.nix b/src/coreboot/default.nix index 21e0159..b1eb260 100644 --- a/src/coreboot/default.nix +++ b/src/coreboot/default.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation { ./patches/0006-remove-submodules.patch # additional Kconfig options - ./patches/0008-payloads-external-linux-allow-CONFIG_LINUX_COMMAND_L.patch ./patches/0009-payloads-Kconfig-add-CONFIG_UNCOMPRESSED_PAYLOAD.patch # rk3399 patches diff --git a/src/coreboot/patches/0008-payloads-external-linux-allow-CONFIG_LINUX_COMMAND_L.patch b/src/coreboot/patches/0008-payloads-external-linux-allow-CONFIG_LINUX_COMMAND_L.patch deleted file mode 100644 index 50c19b8..0000000 --- a/src/coreboot/patches/0008-payloads-external-linux-allow-CONFIG_LINUX_COMMAND_L.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0074685d4afbb281d642eee021ace560c81181fe Mon Sep 17 00:00:00 2001 -From: root -Subject: [PATCH 08/22] payloads/external/linux: allow - CONFIG_LINUX_COMMAND_LINE without CONFIG_LINUX - ---- - payloads/external/linux/Kconfig | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/payloads/external/linux/Kconfig b/payloads/external/linux/Kconfig -index 8b15f99cdc..1e11b29cb7 100644 ---- a/payloads/external/linux/Kconfig -+++ b/payloads/external/linux/Kconfig -@@ -6,12 +6,6 @@ config PAYLOAD_FILE - help - The path and filename of the bzImage kernel to use as payload. - --config LINUX_COMMAND_LINE -- string "Linux command line" -- default "" -- help -- A command line to add to the Linux kernel. -- - config LINUX_INITRD - string "Linux initrd" - default "" -@@ -19,3 +13,10 @@ config LINUX_INITRD - An initrd image to add to the Linux kernel. - - endif -+ -+config LINUX_COMMAND_LINE -+ string "Linux command line" -+ default "" -+ help -+ A command line to add to the Linux kernel. -+ --- -2.36.1 -