mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
8df12d76c6
Refreshed all patches. Removed: - 030-PCI-dwc-skip-MSI-init-if-MSIs-have-been-explicitly-d.patch Altered: - 366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch - 650-netfilter-add-xt_OFFLOAD-target.patch - 662-remove_pfifo_fast.patch - 332-arc-add-OWRTDTB-section.patch - 100-clocksource-drivers-arch_timer-Workaround-for-Allwin.patch - 702-phy_add_aneg_done_function.patch New symbols: - ARC_IRQ_NO_AUTOSAVE - SUN50I_ERRATUM_UNKNOWN1 Compile-tested: cns3xxx, imx6, sunxi Runtime-tested: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
48 lines
1.1 KiB
Diff
48 lines
1.1 KiB
Diff
--- a/arch/mips/cavium-octeon/setup.c
|
|
+++ b/arch/mips/cavium-octeon/setup.c
|
|
@@ -651,6 +651,35 @@ void octeon_user_io_init(void)
|
|
write_c0_derraddr1(0);
|
|
}
|
|
|
|
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
|
|
+extern char __image_cmdline[];
|
|
+
|
|
+static int __init octeon_use_image_cmdline(void)
|
|
+{
|
|
+ char *p = __image_cmdline;
|
|
+ int replace = 0;
|
|
+
|
|
+ if (*p == '-') {
|
|
+ replace = 1;
|
|
+ p++;
|
|
+ }
|
|
+
|
|
+ if (*p == '\0')
|
|
+ return 0;
|
|
+
|
|
+ if (replace) {
|
|
+ strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
+ } else {
|
|
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
|
|
+ strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
+ }
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+#else
|
|
+static inline int octeon_use_image_cmdline(void) { return 0; }
|
|
+#endif
|
|
+
|
|
/**
|
|
* Early entry point for arch setup
|
|
*/
|
|
@@ -895,6 +924,8 @@ void __init prom_init(void)
|
|
}
|
|
}
|
|
|
|
+ octeon_use_image_cmdline();
|
|
+
|
|
if (strstr(arcs_cmdline, "console=") == NULL) {
|
|
if (octeon_uart == 1)
|
|
strcat(arcs_cmdline, " console=ttyS1,115200");
|