remove hardware byte swapping support

SVN-Revision: 8102

diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index f22330490f21b74717b2b59b3025c087c7b6d2f7..dced1785ab86f95ec970243d3c71061929e5b9e8 100644 (file)
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -1,7 +1,6 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 # CONFIG_64BIT_PHYS_ADDR is not set
-CONFIG_ADM5120_HARDWARE_SWAB=y
 CONFIG_ADM5120_NR_UARTS=2
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set

diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig b/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
index 1b73a370b4dcf62fc8e47861e8592640e95d959d..584b2daef092f5e5aa743c5f71b40ab0c0181880 100644 (file)
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
@@ -7,10 +7,6 @@ config PCI_ADM5120
        select PCI
        default y
 
-config ADM5120_HARDWARE_SWAB
-       bool "Enable hardware accelerated byte-swapping"
-       default y
-
 endmenu
 
 endif

diff --git a/target/linux/adm5120-2.6/patches-2.6.22/008-adm5120_hardware_swab.patch b/target/linux/adm5120-2.6/patches-2.6.22/008-adm5120_hardware_swab.patch
deleted file mode 100644 (file)
index c0fd645..0000000
--- a/target/linux/adm5120-2.6/patches-2.6.22/008-adm5120_hardware_swab.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: linux-2.6.22-rc6/include/asm-mips/byteorder.h
-===================================================================
---- linux-2.6.22-rc6.orig/include/asm-mips/byteorder.h
-+++ linux-2.6.22-rc6/include/asm-mips/byteorder.h
-@@ -58,6 +58,35 @@ static __inline__ __attribute_const__ __
- 
- #endif /* CONFIG_CPU_MIPSR2 */
- 
-+#ifdef CONFIG_ADM5120_HARDWARE_SWAB
-+
-+static __inline__ __attribute_const__ __u16 ___adm5120__swab16(__u16 x)
-+{
-+      __asm__ (
-+      "       sh      %2, 0xCA(%1)                    \n"
-+      "       lhu     %0, 0xCC(%1)                    \n"
-+      : "=r" (x)
-+      : "r" (0xB2000000), "r" (x));
-+
-+      return x;
-+}
-+
-+static __inline__ __attribute_const__ __u32 ___adm5120__swab32(__u32 x)
-+{
-+      __asm__ (
-+      "       sw      %2, 0xC8(%1)                    \n"
-+      "       lw      %0, 0xCC(%1)                    \n"
-+      : "=r" (x)
-+      : "r" (0xB2000000), "r" (x));
-+
-+      return x;
-+}
-+
-+#define __arch__swab16(x)     ___adm5120__swab16(x)
-+#define __arch__swab32(x)     ___adm5120__swab32(x)
-+
-+#endif /* CONFIG_ADM5120_HARDWARE_SWAB */
-+
- #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
- #  define __BYTEORDER_HAS_U64__
- #  define __SWAB_64_THRU_32__

diff --git a/target/linux/adm5120-2.6/patches/008-adm5120_hardware_swab.patch b/target/linux/adm5120-2.6/patches/008-adm5120_hardware_swab.patch
deleted file mode 100644 (file)
index 6b0fe55..0000000
--- a/target/linux/adm5120-2.6/patches/008-adm5120_hardware_swab.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- linux-2.6.19.2/include/asm-mips/byteorder.h        2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2.new/include/asm-mips/byteorder.h    2007-05-16 21:14:47.000000000 +0200
-@@ -58,6 +58,35 @@
- 
- #endif /* CONFIG_CPU_MIPSR2 */
- 
-+#ifdef CONFIG_ADM5120_HARDWARE_SWAB
-+
-+static __inline__ __attribute_const__ __u16 ___adm5120__swab16(__u16 x)
-+{
-+      __asm__ (
-+      "       sh      %2, 0xCA(%1)                    \n"
-+      "       lhu     %0, 0xCC(%1)                    \n"
-+      : "=r" (x)
-+      : "r" (0xB2000000), "r" (x));
-+
-+      return x;
-+}
-+
-+static __inline__ __attribute_const__ __u32 ___adm5120__swab32(__u32 x)
-+{
-+      __asm__ (
-+      "       sw      %2, 0xC8(%1)                    \n"
-+      "       lw      %0, 0xCC(%1)                    \n"
-+      : "=r" (x)
-+      : "r" (0xB2000000), "r" (x));
-+
-+      return x;
-+}
-+
-+#define __arch__swab16(x)     ___adm5120__swab16(x)
-+#define __arch__swab32(x)     ___adm5120__swab32(x)
-+
-+#endif /* CONFIG_ADM5120_HARDWARE_SWAB */
-+
- #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
- #  define __BYTEORDER_HAS_U64__
- #  define __SWAB_64_THRU_32__