From 6b37c34cef1bf8049ece54475151d3a02e79a662 Mon Sep 17 00:00:00 2001 From: Artur Artamonov Date: Fri, 27 Sep 2013 12:29:26 +0300 Subject: patch collection that fixes, crashes, mips16 usage and bsp profile usage --- .../patches-2.6.30/002-use-openwrt-toolchain.patch | 11 ---- .../patches-2.6.30/9994-Makefile-prepare.patch | 11 ++++ .../fix-rtl865x_uncashedmalloc-trick.patch | 14 ++++ .../mips16_removed_usage_attribute.patch | 77 ++++++++++++++++++++++ 4 files changed, 102 insertions(+), 11 deletions(-) delete mode 100644 target/linux/realtek/patches-2.6.30/002-use-openwrt-toolchain.patch create mode 100644 target/linux/realtek/patches-2.6.30/9994-Makefile-prepare.patch create mode 100644 target/linux/realtek/patches-2.6.30/fix-rtl865x_uncashedmalloc-trick.patch create mode 100644 target/linux/realtek/patches-2.6.30/mips16_removed_usage_attribute.patch diff --git a/target/linux/realtek/patches-2.6.30/002-use-openwrt-toolchain.patch b/target/linux/realtek/patches-2.6.30/002-use-openwrt-toolchain.patch deleted file mode 100644 index 163e66f08..000000000 --- a/target/linux/realtek/patches-2.6.30/002-use-openwrt-toolchain.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-2.6.30.9.orig/arch/rlx/Makefile 2013-09-05 11:51:23.000000000 +0000 -+++ linux-2.6.30.9.orig/arch/rlx/Makefile 2013-09-02 13:49:09.000000000 +0000 -@@ -32,6 +32,8 @@ vmlinux-32 = vmlinux - cflags-y := -ffunction-sections - cflags-y += $(call cc-option, -mno-check-zero-division) - cflags-y += -mabi=32 -+cflags-$(CONFIG_ARCH_CPU_RLX4181) += -march=rlx4181 -+cflags-$(CONFIG_ARCH_CPU_RLX5281) += -march=rlx5281 - - # - # GCC uses -G 0 -mabicalls -fpic as default. We don't want PIC in the kernel diff --git a/target/linux/realtek/patches-2.6.30/9994-Makefile-prepare.patch b/target/linux/realtek/patches-2.6.30/9994-Makefile-prepare.patch new file mode 100644 index 000000000..71a9ac93d --- /dev/null +++ b/target/linux/realtek/patches-2.6.30/9994-Makefile-prepare.patch @@ -0,0 +1,11 @@ +--- a./Makefile 2013-09-24 15:30:01.000000000 +0300 ++++ b./Makefile 2013-09-24 15:25:23.000000000 +0300 +@@ -990,7 +990,7 @@ prepare0: archprepare FORCE + $(Q)$(MAKE) $(build)=. missing-syscalls + + # All the preparing.. +-prepare: prepare0 ++prepare: bsp prepare0 + + # Leave this as default for preprocessing vmlinux.lds.S, which is now + # done in arch/$(ARCH)/kernel/Makefile diff --git a/target/linux/realtek/patches-2.6.30/fix-rtl865x_uncashedmalloc-trick.patch b/target/linux/realtek/patches-2.6.30/fix-rtl865x_uncashedmalloc-trick.patch new file mode 100644 index 000000000..1340ac22a --- /dev/null +++ b/target/linux/realtek/patches-2.6.30/fix-rtl865x_uncashedmalloc-trick.patch @@ -0,0 +1,14 @@ +diff --git a/target/linux/realtek/files/drivers/net/rtl819x/rtl865xc_swNic.h b/target/linux/realtek/files/drivers/net/rtl819x/rtl865xc_swNic.h +index 3d1f1fa..bd76230 100644 +--- a/drivers/net/rtl819x/rtl865xc_swNic.h ++++ b/drivers/net/rtl819x/rtl865xc_swNic.h +@@ -295,7 +295,8 @@ struct ring_que { + + static inline void *UNCACHED_MALLOC(int size) + { +- return ((void *)(((uint32)kmalloc(size, GFP_ATOMIC)) | UNCACHE_MASK)); ++ //return ((void *)(((uint32)kmalloc(size, GFP_ATOMIC)) | UNCACHE_MASK)); ++ return ((void *)(((uint32)kmalloc(size, GFP_ATOMIC)))); + } + + #endif /* _SWNIC_H */ diff --git a/target/linux/realtek/patches-2.6.30/mips16_removed_usage_attribute.patch b/target/linux/realtek/patches-2.6.30/mips16_removed_usage_attribute.patch new file mode 100644 index 000000000..d623db76a --- /dev/null +++ b/target/linux/realtek/patches-2.6.30/mips16_removed_usage_attribute.patch @@ -0,0 +1,77 @@ +diff --git a/drivers/net/wireless/rtl8192cd/8192cd_cfg.h b/drivers/net/wireless/rtl8192cd/8192cd_cfg.h +index 2e3e92a..61091a0 100644 +--- a/drivers/net/wireless/rtl8192cd/8192cd_cfg.h ++++ b/drivers/net/wireless/rtl8192cd/8192cd_cfg.h +@@ -1042,7 +1042,7 @@ + #undef __MIPS16 + #ifdef __ECOS + #ifdef RTLPKG_DEVS_ETH_RLTK_819X_USE_MIPS16 +-#define __MIPS16 __attribute__ ((mips16)) ++#define __MIPS16 + #else + #define __MIPS16 + #endif +@@ -1050,7 +1050,7 @@ + #if defined(CONFIG_WIRELESS_LAN_MODULE) + #define __MIPS16 + #else +-#define __MIPS16 __attribute__ ((mips16)) ++#define __MIPS16 + #endif + #endif + +diff --git a/drivers/net/wireless/rtl8192cd/rtl_types.h b/drivers/net/wireless/rtl8192cd/rtl_types.h +index 9563326..004b4fe 100644 +--- a/drivers/net/wireless/rtl8192cd/rtl_types.h ++++ b/drivers/net/wireless/rtl8192cd/rtl_types.h +@@ -352,8 +352,8 @@ + + #if defined(__linux__)&&defined(__KERNEL__)&&defined(CONFIG_RTL_819X) && !defined(CONFIG_RTL_8196C) + #ifndef CONFIG_WIRELESS_LAN_MODULE +- #define __NOMIPS16 __attribute__((nomips16)) /* Inidcate to prevent from MIPS16 */ +- #define __MIPS16 __attribute__((mips16)) /* Inidcate to use MIPS16 */ ++ #define __NOMIPS16 /* Inidcate to prevent from MIPS16 */ ++ #define __MIPS16 /* Inidcate to use MIPS16 */ + #else + #define __NOMIPS16 + #define __MIPS16 +diff --git a/drivers/net/wireless/rtl8192e/8192cd_cfg.h b/drivers/net/wireless/rtl8192e/8192cd_cfg.h +index 4e21fb7..03f157f 100644 +--- a/drivers/net/wireless/rtl8192e/8192cd_cfg.h ++++ b/drivers/net/wireless/rtl8192e/8192cd_cfg.h +@@ -982,7 +982,7 @@ + #undef __MIPS16 + #ifdef __ECOS + #ifdef RTLPKG_DEVS_ETH_RLTK_819X_USE_MIPS16 +-#define __MIPS16 __attribute__ ((mips16)) ++#define __MIPS16 + #else + #define __MIPS16 + #endif +@@ -990,7 +990,7 @@ + #if defined(CONFIG_WIRELESS_LAN_MODULE) + #define __MIPS16 + #else +-#define __MIPS16 __attribute__ ((mips16)) ++#define __MIPS16 + #endif + #endif + +diff --git a/drivers/net/wireless/rtl8192e/bin2c.pl b/drivers/net/wireless/rtl8192e/bin2c.pl +old mode 100644 +new mode 100755 +diff --git a/include/net/rtl/rtl_types.h b/include/net/rtl/rtl_types.h +index 2b662c5..c01a7c8 100644 +--- a/include/net/rtl/rtl_types.h ++++ b/include/net/rtl/rtl_types.h +@@ -351,8 +351,8 @@ + #undef __MIPS16 + + #if defined(__linux__)&&defined(__KERNEL__)&&defined(CONFIG_RTL_819X) && !defined(CONFIG_RTL_8196C) +- #define __NOMIPS16 __attribute__((nomips16)) /* Inidcate to prevent from MIPS16 */ +- #define __MIPS16 __attribute__((mips16)) /* Inidcate to use MIPS16 */ ++ #define __NOMIPS16 /* Inidcate to prevent from MIPS16 */ ++ #define __MIPS16 /* Inidcate to use MIPS16 */ + #else + #define __NOMIPS16 + #define __MIPS16 -- cgit v1.2.3