From b90bae1426b9b11a1e9f1e21de8a9e97ad6ab6ee Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 19:10:02 +0200 Subject: rb532 fixes --- target/config/Config.in.endian.choice | 1 + target/linux/config/Config.in.flash | 16 +--------------- .../mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch | 11 ----------- .../mikrotik-rb532/patches/3.15-rc5/rb532-serial.patch | 15 --------------- .../mips/mikrotik-rb532/patches/3.15-rc6/rb532-pci.patch | 11 +++++++++++ .../mikrotik-rb532/patches/3.15-rc6/rb532-serial.patch | 15 +++++++++++++++ 6 files changed, 28 insertions(+), 41 deletions(-) delete mode 100644 target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch delete mode 100644 target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-serial.patch create mode 100644 target/mips/mikrotik-rb532/patches/3.15-rc6/rb532-pci.patch create mode 100644 target/mips/mikrotik-rb532/patches/3.15-rc6/rb532-serial.patch (limited to 'target') diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice index 2ad269525..303d117c6 100644 --- a/target/config/Config.in.endian.choice +++ b/target/config/Config.in.endian.choice @@ -5,6 +5,7 @@ choice ADK_TARGET_ENDIAN_MODE prompt "Target Endianess" depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM depends on ADK_LINUX_SH || ADK_LINUX_MIPS || ADK_LINUX_MICROBLAZE || ADK_LINUX_MIPS64 +depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 config ADK_TARGET_LITTLE_ENDIAN boolean "Little endian" diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index eec15af42..f0a6df433 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -29,13 +29,6 @@ config ADK_KERNEL_MTD_BLOCK config ADK_KERNEL_MTD_PARTITIONS boolean -config ADK_KERNEL_MTD_REDBOOT_PARTS - boolean - -config ADK_KERNEL_MTD_REDBOOT_DIRECTORY_BLOCK - int - default "-3" - config ADK_KERNEL_MTD_ROOTFS_ROOT_DEV boolean @@ -89,14 +82,7 @@ config ADK_KERNEL_MTD_M25P80 select ADK_KERNEL_MTD_OF_PARTS select ADK_KERNEL_SPI select ADK_KERNEL_SPI_MASTER - default n - -config ADK_KERNEL_MTD_AR2315 - boolean - select ADK_KERNEL_MTD_REDBOOT_PARTS - select ADK_KERNEL_MTD_CFI_ADV_OPTIONS - depends on ADK_TARGET_SYSTEM_FON_FON2100 - default y if ADK_TARGET_SYSTEM_FON_FON2100 + depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE default n config ADK_KERNEL_MTD_NAND_PLATFORM diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch deleted file mode 100644 index 173e49c35..000000000 --- a/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c linux-3.15-rc5/arch/mips/pci/pci-rc32434.c ---- linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c 2014-05-09 22:10:52.000000000 +0200 -+++ linux-3.15-rc5/arch/mips/pci/pci-rc32434.c 2014-05-16 10:38:10.000000000 +0200 -@@ -53,7 +53,6 @@ - .start = 0x50000000, - .end = 0x5FFFFFFF, - .flags = IORESOURCE_MEM, -- .parent = &rc32434_res_pci_mem1, - .sibling = NULL, - .child = &rc32434_res_pci_mem2 - }; diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-serial.patch b/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-serial.patch deleted file mode 100644 index 6c6951895..000000000 --- a/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-serial.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c linux-3.15-rc5/drivers/tty/serial/serial_core.c ---- linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c 2014-05-09 22:10:52.000000000 +0200 -+++ linux-3.15-rc5/drivers/tty/serial/serial_core.c 2014-05-20 10:30:52.000000000 +0200 -@@ -2686,9 +2686,10 @@ - - /* - * If the port is used as a console, unregister it -- */ -+ * DISABLE: breaks serial console on rb532 - if (uart_console(uport)) - unregister_console(uport->cons); -+ */ - - /* - * Free the port IO and memory resources, if any. diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc6/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.15-rc6/rb532-pci.patch new file mode 100644 index 000000000..173e49c35 --- /dev/null +++ b/target/mips/mikrotik-rb532/patches/3.15-rc6/rb532-pci.patch @@ -0,0 +1,11 @@ +diff -Nur linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c linux-3.15-rc5/arch/mips/pci/pci-rc32434.c +--- linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c 2014-05-09 22:10:52.000000000 +0200 ++++ linux-3.15-rc5/arch/mips/pci/pci-rc32434.c 2014-05-16 10:38:10.000000000 +0200 +@@ -53,7 +53,6 @@ + .start = 0x50000000, + .end = 0x5FFFFFFF, + .flags = IORESOURCE_MEM, +- .parent = &rc32434_res_pci_mem1, + .sibling = NULL, + .child = &rc32434_res_pci_mem2 + }; diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc6/rb532-serial.patch b/target/mips/mikrotik-rb532/patches/3.15-rc6/rb532-serial.patch new file mode 100644 index 000000000..6c6951895 --- /dev/null +++ b/target/mips/mikrotik-rb532/patches/3.15-rc6/rb532-serial.patch @@ -0,0 +1,15 @@ +diff -Nur linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c linux-3.15-rc5/drivers/tty/serial/serial_core.c +--- linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c 2014-05-09 22:10:52.000000000 +0200 ++++ linux-3.15-rc5/drivers/tty/serial/serial_core.c 2014-05-20 10:30:52.000000000 +0200 +@@ -2686,9 +2686,10 @@ + + /* + * If the port is used as a console, unregister it +- */ ++ * DISABLE: breaks serial console on rb532 + if (uart_console(uport)) + unregister_console(uport->cons); ++ */ + + /* + * Free the port IO and memory resources, if any. -- cgit v1.2.3