Correct 2.6..26 and .28 versions of USR8200 patches

SVN-Revision: 13996

diff --git a/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch b/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
index ef818c7ca0498659a5f900d019c4d3ad47188095..365eb6a404bb29ff75e9c85f1bc05494a8e10a52 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
@@ -17,18 +17,18 @@
        select PCI
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -25,6 +25,7 @@ obj-pci-$(CONFIG_MACH_WRT300NV2)             += wrt
+@@ -24,6 +24,7 @@ obj-pci-$(CONFIG_MACH_COMPEX)                += ixdp42
+ obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_TW5334)         += tw5334-pci.o
- obj-pci-$(CONFIG_MACH_MI424WR)                += mi424wr-pci.o
 +obj-pci-$(CONFIG_MACH_USR8200)                += usr8200-pci.o
  
  obj-y += common.o
  
-@@ -48,6 +49,7 @@ obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv
+@@ -46,6 +47,7 @@ obj-$(CONFIG_MACH_COMPEX)    += compex-setu
+ obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
  obj-$(CONFIG_MACH_TW5334)     += tw5334-setup.o
- obj-$(CONFIG_MACH_MI424WR)    += mi424wr-setup.o
 +obj-$(CONFIG_MACH_USR8200)    += usr8200-setup.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
@@ -328,8 +328,8 @@
 +      .boot_params    = 0x0100,
 +      .init_machine   = usr8200_init,
 +MACHINE_END
---- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+--- a/include/asm-arm/arch-ixp4xx/uncompress.h
++++ b/include/asm-arm/arch-ixp4xx/uncompress.h
 @@ -43,7 +43,7 @@ static __inline__ void __arch_decomp_set
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||

diff --git a/target/linux/ixp4xx/patches-2.6.26/501-cachetypes.patch b/target/linux/ixp4xx/patches-2.6.26/501-cachetypes.patch
index cc9c89e3e155ba9d7e56b2c11143503409d39770..5f5c44359677b7ee4da9186848b530405fced4dc 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/501-cachetypes.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/501-cachetypes.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c
-@@ -184,7 +184,7 @@ static const char *cache_types[16] = {
+@@ -181,7 +181,7 @@ static const char *cache_types[16] = {
        "write-back",
        "undefined 3",
        "undefined 4",
@@ -9,7 +9,7 @@
        "write-back",
        "write-back",
        "undefined 8",
-@@ -203,7 +203,7 @@ static const char *cache_clean[16] = {
+@@ -200,7 +200,7 @@ static const char *cache_clean[16] = {
        "cp15 c7 ops",
        "undefined 3",
        "undefined 4",

diff --git a/target/linux/ixp4xx/patches-2.6.28/501-cachetypes.patch b/target/linux/ixp4xx/patches-2.6.28/501-cachetypes.patch
deleted file mode 100644 (file)
index cc9c89e..0000000
--- a/target/linux/ixp4xx/patches-2.6.28/501-cachetypes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/arm/kernel/setup.c
-+++ b/arch/arm/kernel/setup.c
-@@ -184,7 +184,7 @@ static const char *cache_types[16] = {
-       "write-back",
-       "undefined 3",
-       "undefined 4",
--      "undefined 5",
-+      "write-back",
-       "write-back",
-       "write-back",
-       "undefined 8",
-@@ -203,7 +203,7 @@ static const char *cache_clean[16] = {
-       "cp15 c7 ops",
-       "undefined 3",
-       "undefined 4",
--      "undefined 5",
-+      "cp15 c7 ops",
-       "cp15 c7 ops",
-       "cp15 c7 ops",
-       "undefined 8",