From 86c95a9481d444c7eef9dc9b24b144b996d8a1df Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 4 Jan 2012 17:30:58 +0000
Subject: ar71xx: allow to use the command line hack on compex devices
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29659 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
target/linux/ar71xx/files/arch/mips/ar71xx/prom.c | 60 ++++++++++++-----------
1 file changed, 31 insertions(+), 29 deletions(-)
(limited to 'target')
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
index 293f9b25e..b9b1e64fd 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -69,35 +69,6 @@ static const char * __init ar71xx_prom_find_env(char **envp, const char *name)
return ret;
}
-static int __init ar71xx_prom_init_myloader(void)
-{
- struct myloader_info *mylo;
- char mac_buf[32];
- char *mac;
-
- mylo = myloader_get_info();
- if (!mylo)
- return 0;
-
- switch (mylo->did) {
- case DEVID_COMPEX_WP543:
- ar71xx_prom_append_cmdline("board", "WP543");
- break;
- default:
- printk(KERN_WARNING "prom: unknown device id: %x\n",
- mylo->did);
- return 0;
- }
-
- mac = mylo->macs[0];
- snprintf(mac_buf, sizeof(mac_buf), "%02x:%02x:%02x:%02x:%02x:%02x",
- mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-
- ar71xx_prom_append_cmdline("ethaddr", mac_buf);
-
- return 1;
-}
-
#ifdef CONFIG_IMAGE_CMDLINE_HACK
extern char __image_cmdline[];
@@ -127,6 +98,37 @@ static int __init ar71xx_use__image_cmdline(void)
static inline int ar71xx_use__image_cmdline(void) { return 0; }
#endif
+static int __init ar71xx_prom_init_myloader(void)
+{
+ struct myloader_info *mylo;
+ char mac_buf[32];
+ unsigned char *mac;
+
+ mylo = myloader_get_info();
+ if (!mylo)
+ return 0;
+
+ switch (mylo->did) {
+ case DEVID_COMPEX_WP543:
+ ar71xx_prom_append_cmdline("board", "WP543");
+ break;
+ default:
+ printk(KERN_WARNING "prom: unknown device id: %x\n",
+ mylo->did);
+ return 0;
+ }
+
+ mac = mylo->macs[0];
+ snprintf(mac_buf, sizeof(mac_buf), "%02x:%02x:%02x:%02x:%02x:%02x",
+ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+
+ ar71xx_prom_append_cmdline("ethaddr", mac_buf);
+
+ ar71xx_use__image_cmdline();
+
+ return 1;
+}
+
static __init void ar71xx_prom_init_cmdline(int argc, char **argv)
{
int i;
--
cgit v1.2.3