From 919a8a9fe004ffd9e9a2105185fa9021de0f3b6d Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 2 Dec 2008 21:54:53 +0000
Subject: [PATCH] make mips_machine stuff available for other MIPS targets

SVN-Revision: 13492
---
 target/linux/adm5120/router_be/config-2.6.26                  | 1 +
 target/linux/adm5120/router_be/config-2.6.27                  | 1 +
 target/linux/adm5120/router_le/config-2.6.26                  | 1 +
 target/linux/adm5120/router_le/config-2.6.27                  | 1 +
 target/linux/ar7/config-2.6.26                                | 1 +
 target/linux/ar71xx/Makefile                                  | 2 +-
 target/linux/atheros/config-2.6.26                            | 1 +
 target/linux/atheros/config-2.6.27                            | 1 +
 target/linux/au1000/config-2.6.27                             | 1 +
 target/linux/brcm63xx/config-2.6.27                           | 1 +
 .../patches-2.6.26/020-mips_multi_machine_support.patch}      | 0
 .../patches-2.6.27/020-mips_multi_machine_support.patch}      | 4 ++--
 target/linux/ifxmips/config-2.6.26                            | 1 +
 target/linux/rb532/config-2.6.27                              | 1 +
 target/linux/sibyte/config-default                            | 1 +
 15 files changed, 15 insertions(+), 3 deletions(-)
 rename target/linux/{ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch => generic-2.6/patches-2.6.26/020-mips_multi_machine_support.patch} (100%)
 rename target/linux/{ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch => generic-2.6/patches-2.6.27/020-mips_multi_machine_support.patch} (96%)

diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26
index c34f80e61c..35cbc9170c 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 6fb638a5a0..eae094f6e5 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 3b92242969..362f591d1d 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 ba2de8062f..5ef89cad6c 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 4450966cdb..93c6dd6c21 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 fe32e86e44..9459c3d17a 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 db942aa495..ecb9a991d1 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 7bee8c1739..435b1ca848 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 2a4b82f9b6..2a3e46caab 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 b54778bdd2..5c1fcdc12b 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 331ae4c271..59406c382c 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 bd73c03cba..f6f4b69b95 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 fe93da9312..954fd30ee8 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 48d00ec42f..ce5ed4ca0a 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
-- 
GitLab