aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.26
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-12-02 21:17:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-12-02 21:17:31 +0000
commit962170b7485f69bf9a3b62c8b5d2ac0a29da667e (patch)
treee2a2952cc34d68d484f55314a2903e57dfd88849 /target/linux/ar71xx/patches-2.6.26
parent33c19a498a8f9f79b4a3c5519e442d313963de5c (diff)
downloadupstream-962170b7485f69bf9a3b62c8b5d2ac0a29da667e.tar.gz
upstream-962170b7485f69bf9a3b62c8b5d2ac0a29da667e.tar.bz2
upstream-962170b7485f69bf9a3b62c8b5d2ac0a29da667e.zip
update mips_machine stuff
SVN-Revision: 13488
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.26')
-rw-r--r--target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch21
-rw-r--r--target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch12
2 files changed, 5 insertions, 28 deletions
diff --git a/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
index c5871c8c57..0ead6d29bc 100644
--- a/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
+++ b/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
@@ -14,27 +14,6 @@
# temporary until string.h is fixed
cflags-y += -ffreestanding
---- a/include/asm-mips/bootinfo.h
-+++ b/include/asm-mips/bootinfo.h
-@@ -79,6 +79,18 @@
- #define MACH_LASAT_200 1 /* Masquerade PRO/SP200 */
-
- /*
-+ * Valid machtype for Atheros AR71xx based boards
-+ */
-+#define MACH_AR71XX_GENERIC 0
-+#define MACH_AR71XX_WP543 1 /* Compex WP543 */
-+#define MACH_AR71XX_RB_411 2 /* MikroTik RouterBOARD 411/411A/411AH */
-+#define MACH_AR71XX_RB_433 3 /* MikroTik RouterBOARD 433/433AH */
-+#define MACH_AR71XX_RB_450 4 /* MikroTik RouterBOARD 450 */
-+#define MACH_AR71XX_RB_493 5 /* Mikrotik RouterBOARD 493/493AH */
-+#define MACH_AR71XX_AW_NR580 6 /* AzureWave AW-NR580 */
-+#define MACH_AR71XX_AP83 7 /* Atheros AP83 */
-+
-+/*
- * Valid machtype for group NEC EMMA2RH
- */
- #define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -21,6 +21,24 @@ choice
diff --git a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
index abcdfb5817..331ae4c271 100644
--- a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
+++ b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/include/asm-mips/mips_machine.h
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *
@@ -16,8 +16,6 @@
+#include <linux/init.h>
+#include <linux/list.h>
+
-+#include <asm/bootinfo.h>
-+
+#define MIPS_MACHINE_NAME_LEN 64
+
+struct mips_machine {
@@ -28,7 +26,7 @@
+};
+
+void mips_machine_register(struct mips_machine *) __init;
-+void mips_machine_setup(void) __init;
++void mips_machine_setup(unsigned long machtype) __init;
+
+extern unsigned char mips_machine_name[MIPS_MACHINE_NAME_LEN];
+
@@ -90,14 +88,14 @@
+ list_add_tail(&mach->list, &mips_machines);
+}
+
-+void __init mips_machine_setup(void)
++void __init mips_machine_setup(unsigned long machtype)
+{
+ struct mips_machine *mach;
+
-+ mach = mips_machine_find(mips_machtype);
++ mach = mips_machine_find(machtype);
+ if (!mach) {
+ printk(KERN_ALERT "MIPS: no machine registered for "
-+ "machtype %lu\n", mips_machtype);
++ "machtype %lu\n", machtype);
+ return;
+ }
+