From 7deff88709fa6773bc8ea5b35f0fa81f810c813f Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Mon, 11 Sep 2023 23:01:40 +0800
Subject: [PATCH] ipq40xx: fixes k5.10 boot issue

Fixes: #11530
---
 .../generic/hack-5.10/920-device_tree_cmdline.patch  | 12 ++++++++++++
 target/linux/ipq40xx/Makefile                        |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 target/linux/generic/hack-5.10/920-device_tree_cmdline.patch

diff --git a/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch b/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch
new file mode 100644
index 000000000..27d4d7f1e
--- /dev/null
+++ b/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch
@@ -0,0 +1,12 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -1055,6 +1055,9 @@ int __init early_init_dt_scan_chosen(uns
+ 	p = of_get_flat_dt_prop(node, "bootargs", &l);
+ 	if (p != NULL && l > 0)
+ 		strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
++	p = of_get_flat_dt_prop(node, "bootargs-append", &l);
++	if (p != NULL && l > 0)
++		strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
+ 
+ 	/*
+ 	 * CONFIG_CMDLINE is meant to be a default in case nothing else
diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile
index b704e1b54..775938ef3 100644
--- a/target/linux/ipq40xx/Makefile
+++ b/target/linux/ipq40xx/Makefile
@@ -17,8 +17,8 @@ include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
 	kmod-usb-dwc3-qcom \
 	kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
-	kmod-ath10k-ct wpad-basic-wolfssl \
+	kmod-ath10k-ct wpad-openssl \
 	kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \
-	uboot-envtools
+	uboot-envtools autocore-arm htop luci-app-cpufreq
 
 $(eval $(call BuildTarget))