mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-16 01:40:26 +00:00
b389c3d66f
Manually adapted:
bcm27xx/patches-5.15/950-0166-xhci-Use-more-event-ring-segment-table-entries.patch
I replaced it with the version from main branch which applies more easily
bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
generic/hack-5.15/645-netfilter-connmark-introduce-set-dscpmark.patch
Added patch:
generic/backport-5.15/777-netfilter-xtables-fix-typo-causing-some-targets-to-not-load-on-IPv6.patch
This fixes a bug intoduced in this version.
Adapt kernel configuration for newly added option
CONFIG_PROC_MEM_ALWAYS_FORCE.
Link: https://github.com/openwrt/openwrt/pull/16882
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
--- a/arch/arm/Kconfig
|
|
+++ b/arch/arm/Kconfig
|
|
@@ -1730,6 +1730,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
|
|
|
endchoice
|
|
|
|
+config CMDLINE_OVERRIDE
|
|
+ bool "Use alternative cmdline from device tree"
|
|
+ help
|
|
+ Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can
|
|
+ be used, this is not a good option for kernels that are shared across
|
|
+ devices. This setting enables using "chosen/cmdline-override" as the
|
|
+ cmdline if it exists in the device tree.
|
|
+
|
|
config CMDLINE
|
|
string "Default kernel command string"
|
|
default ""
|
|
--- a/drivers/of/fdt.c
|
|
+++ b/drivers/of/fdt.c
|
|
@@ -1162,6 +1162,17 @@ int __init early_init_dt_scan_chosen(uns
|
|
if (p != NULL && l > 0)
|
|
strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
|
|
|
|
+ /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
|
|
+ * device tree option of chosen/bootargs-override. This is
|
|
+ * helpful on boards where u-boot sets bootargs, and is unable
|
|
+ * to be modified.
|
|
+ */
|
|
+#ifdef CONFIG_CMDLINE_OVERRIDE
|
|
+ p = of_get_flat_dt_prop(node, "bootargs-override", &l);
|
|
+ if (p != NULL && l > 0)
|
|
+ strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
|
|
+#endif
|
|
+
|
|
/*
|
|
* CONFIG_CMDLINE is meant to be a default in case nothing else
|
|
* managed to set the command line, unless CONFIG_CMDLINE_FORCE
|
|
--- a/arch/arm64/Kconfig
|
|
+++ b/arch/arm64/Kconfig
|
|
@@ -2099,6 +2099,14 @@ config CMDLINE_FORCE
|
|
|
|
endchoice
|
|
|
|
+config CMDLINE_OVERRIDE
|
|
+ bool "Use alternative cmdline from device tree"
|
|
+ help
|
|
+ Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can
|
|
+ be used, this is not a good option for kernels that are shared across
|
|
+ devices. This setting enables using "chosen/cmdline-override" as the
|
|
+ cmdline if it exists in the device tree.
|
|
+
|
|
config EFI_STUB
|
|
bool
|
|
|