mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
bf6002e74b
octeon/patches-5.10 -> octeon/patches-5.15 Removed 140-octeon_e300_support.patch as E300 support appears to be upstreamed. Reworked 130-add_itus_support.patch to compensate for the upstreaming of E300 octeon/config-5.15 The following Kernel Symbols were ADDED: Line 5: +CONFIG_AF_UNIX_OOB=y Line 6: +CONFIG_AHCI_OCTEON=y Line 9: +CONFIG_ARCH_KEEP_MEMBLOCK=y Line 16: +CONFIG_ATA=y Line 17: +CONFIG_BINARY_PRINTF=y Line 29: +CONFIG_CPU_R4K_FPU=y Line 45: +CONFIG_FWNODE_MDIO=y Line 51: +CONFIG_GENERIC_FIND_FIRST_BIT=y Line 59: +CONFIG_GLOB=y Line 61: +CONFIG_GPIO_CDEV=y Line 77: +CONFIG_LTO_NONE=y Line 85: +CONFIG_MIPS_FP_SUPPORT=y Line 93: +CONFIG_NET_SELFTESTS=y Line 94: +CONFIG_NET_SOCK_MSG=y Line 105: +CONFIG_PATA_OCTEON_CF=y Line 106: +CONFIG_PATA_TIMINGS=y Line 114: +CONFIG_PTP_1588_CLOCK_OPTIONAL=y Line 121: +CONFIG_SATA_AHCI_PLATFORM=y Line 122: +CONFIG_SATA_HOST=y Line 124: +CONFIG_SCSI_COMMON=y Line 132: +CONFIG_SOCK_RX_QUEUE_MAPPING=y Line 157: +CONFIG_USB_XHCI_HCD=y Line 158: +CONFIG_USB_XHCI_PLATFORM=y The following kernel symbols were REMOVED: Line 21: -CONFIG_BLK_SCSI_REQUEST=y Line 37: -CONFIG_ENABLE_MUST_CHECK=y Line 69: -CONFIG_HOLES_IN_ZONE=y Line 102: -CONFIG_OF_NET=y Line 140: -CONFIG_SYS_SUPPORTS_HUGETLBFS=y Compiled for Itus Shield, Boots successfully, continuing to test for existing 5.10 memory leak. Signed-off-by: Donald Hoskins <grommish@gmail.com> [refresh patches] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
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
|
|
@@ -650,6 +650,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
|
|
+
|
|
/**
|
|
* prom_init - Early entry point for arch setup
|
|
*/
|
|
@@ -873,6 +902,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");
|