diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26 index c34f80e61c3a476b790efc75f32a4f06aad23e87..35cbc9170c19865c615a55f3fdfc785e2fcd07ad 100644 --- a/target/linux/adm5120/router_be/config-2.6.26 +++ b/target/linux/adm5120/router_be/config-2.6.26 @@ -138,6 +138,7 @@ CONFIG_MIPS=y # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/adm5120/router_be/config-2.6.27 b/target/linux/adm5120/router_be/config-2.6.27 index 6fb638a5a01bd759c20b5d2444f8b501a07c7ae4..eae094f6e5752558a23c792a1055e1db6ac2d889 100644 --- a/target/linux/adm5120/router_be/config-2.6.27 +++ b/target/linux/adm5120/router_be/config-2.6.27 @@ -144,6 +144,7 @@ CONFIG_MII=m CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/adm5120/router_le/config-2.6.26 b/target/linux/adm5120/router_le/config-2.6.26 index 3b92242969c7567d235c5487a984b2aadfe8bf4a..362f591d1d756b4261c35587a595e4e436e71eca 100644 --- a/target/linux/adm5120/router_le/config-2.6.26 +++ b/target/linux/adm5120/router_le/config-2.6.26 @@ -161,6 +161,7 @@ CONFIG_MIPS=y # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/adm5120/router_le/config-2.6.27 b/target/linux/adm5120/router_le/config-2.6.27 index ba2de8062f8402d3f26d6c4ccc427879500c621c..5ef89cad6c0c73dc465c18b1d53e076ab86e8c95 100644 --- a/target/linux/adm5120/router_le/config-2.6.27 +++ b/target/linux/adm5120/router_le/config-2.6.27 @@ -167,6 +167,7 @@ CONFIG_MII=m CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/ar7/config-2.6.26 b/target/linux/ar7/config-2.6.26 index 4450966cdb6a495bb4674b4e599ad84928ba58bc..93c6dd6c2132cb244a3658f6baea76c97639cf53 100644 --- a/target/linux/ar7/config-2.6.26 +++ b/target/linux/ar7/config-2.6.26 @@ -98,6 +98,7 @@ CONFIG_MIPS=y # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index fe32e86e4453cd3489a7bf3e18cbf1709f499fbb..9459c3d17a79b1e5c4a0d20992015a593bfec1d7 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -11,7 +11,7 @@ BOARD:=ar71xx BOARDNAME:=Atheros AR71xx FEATURES:=squashfs tgz -LINUX_VERSION:=2.6.26.8 +LINUX_VERSION:=2.6.27.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/config-2.6.26 b/target/linux/atheros/config-2.6.26 index db942aa4953cbaef2940c47519584986850acc76..ecb9a991d1c624a58a6ae55427c6ee8d98f41e6d 100644 --- a/target/linux/atheros/config-2.6.26 +++ b/target/linux/atheros/config-2.6.26 @@ -104,6 +104,7 @@ CONFIG_MIPS=y # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/atheros/config-2.6.27 b/target/linux/atheros/config-2.6.27 index 7bee8c1739aa9f8cee159e5bd77f64552b1f27af..435b1ca8482b51e0a05b318c2c0d92dfdc5a1418 100644 --- a/target/linux/atheros/config-2.6.27 +++ b/target/linux/atheros/config-2.6.27 @@ -108,6 +108,7 @@ CONFIG_LEDS_GPIO=y CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/au1000/config-2.6.27 b/target/linux/au1000/config-2.6.27 index 2a4b82f9b603fae9e7f3209606ea467a422296f3..2a3e46caabf1f309a980aca81fd6297ea905afcc 100644 --- a/target/linux/au1000/config-2.6.27 +++ b/target/linux/au1000/config-2.6.27 @@ -138,6 +138,7 @@ CONFIG_MIPS_AU1X00_ENET=y # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set # CONFIG_MIPS_MIRAGE is not set CONFIG_MIPS_MTX1=y diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27 index b54778bdd27ca5b6f5034496435a181bc53f7e8f..5c1fcdc12bc0055fb007fb5f5c177f1732e5c9c5 100644 --- a/target/linux/brcm63xx/config-2.6.27 +++ b/target/linux/brcm63xx/config-2.6.27 @@ -158,6 +158,7 @@ CONFIG_MARVELL_PHY=m CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.26/020-mips_multi_machine_support.patch similarity index 100% rename from target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch rename to target/linux/generic-2.6/patches-2.6.26/020-mips_multi_machine_support.patch diff --git a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.27/020-mips_multi_machine_support.patch similarity index 96% rename from target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch rename to target/linux/generic-2.6/patches-2.6.27/020-mips_multi_machine_support.patch index 331ae4c27139400c09d18d462ed3655ce5f8128c..59406c382c1daf422e1185dfda3a1f121ad7f760 100644 --- a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch +++ b/target/linux/generic-2.6/patches-2.6.27/020-mips_multi_machine_support.patch @@ -111,7 +111,7 @@ + --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile -@@ -86,6 +86,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o +@@ -83,6 +83,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o @@ -121,7 +121,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -880,6 +880,9 @@ config MYLOADER +@@ -768,6 +768,9 @@ config MIPS_DISABLE_OBSOLETE_IDE config SYNC_R4K bool diff --git a/target/linux/ifxmips/config-2.6.26 b/target/linux/ifxmips/config-2.6.26 index bd73c03cba3b4bd90e9981607bd05e7b64d0497b..f6f4b69b95e8d1070e31a8cd5b7e43b0d7308512 100644 --- a/target/linux/ifxmips/config-2.6.26 +++ b/target/linux/ifxmips/config-2.6.26 @@ -106,6 +106,7 @@ CONFIG_MIPS=y # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/rb532/config-2.6.27 b/target/linux/rb532/config-2.6.27 index fe93da93129b8097b398504bafb91607a7b37708..954fd30ee852aac2004bdd0c61603db034d061f4 100644 --- a/target/linux/rb532/config-2.6.27 +++ b/target/linux/rb532/config-2.6.27 @@ -112,6 +112,7 @@ CONFIG_MINI_FO=y CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=4 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set diff --git a/target/linux/sibyte/config-default b/target/linux/sibyte/config-default index 48d00ec42ff8672c25026b0dfc310cf95b287b14..ce5ed4ca0accc952919df2d17ecfe42861ce71fc 100644 --- a/target/linux/sibyte/config-default +++ b/target/linux/sibyte/config-default @@ -133,6 +133,7 @@ CONFIG_MIPS32_O32=y # CONFIG_MIPS_ATLAS is not set # CONFIG_MIPS_COBALT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_MALTA is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set