summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/arch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-22 16:35:29 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-22 16:35:29 +0000
commit4ae7cc9ab528f52c7656ed71341826b660e9df50 (patch)
tree72b20fe8f441dfc8296daa2ccd6b22b2fc413d03 /target/linux/ar71xx/files/arch
parentb8eb82f5d313a3cedf348e33f475893107cd464f (diff)
[ar71xx] parse mac address on RouterBOARDs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11910 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/files/arch')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/platform.c20
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/prom.c65
2 files changed, 61 insertions, 24 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c b/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c
index 9c91fa3bb..07bec246b 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c
@@ -22,6 +22,8 @@
#include <asm/mach-ar71xx/ar71xx.h>
#include <asm/mach-ar71xx/platform.h>
+static u8 ar71xx_mac_base[ETH_ALEN] __initdata;
+
/*
* OHCI (USB full speed host controller)
*/
@@ -232,6 +234,7 @@ void __init ar71xx_add_device_eth(unsigned int id, phy_interface_t phy_if_mode,
default:
BUG();
}
+ memcpy(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, ETH_ALEN);
ar71xx_eth0_data.phy_if_mode = phy_if_mode;
ar71xx_eth0_data.phy_mask = phy_mask;
pdev = &ar71xx_eth0_device;
@@ -247,6 +250,8 @@ void __init ar71xx_add_device_eth(unsigned int id, phy_interface_t phy_if_mode,
default:
BUG();
}
+ memcpy(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, ETH_ALEN);
+ ar71xx_eth1_data.mac_addr[5] += id;
ar71xx_eth1_data.phy_if_mode = phy_if_mode;
ar71xx_eth1_data.phy_mask = phy_mask;
pdev = &ar71xx_eth1_device;
@@ -286,6 +291,21 @@ void __init ar71xx_add_device_spi(struct ar71xx_spi_platform_data *pdata,
platform_device_register(&ar71xx_spi_device);
}
+void __init ar71xx_set_mac_base(char *mac_str)
+{
+ u8 tmp[ETH_ALEN];
+ int t;
+
+ t = sscanf(mac_str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+ &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5]);
+
+ if (t == ETH_ALEN)
+ memcpy(ar71xx_mac_base, tmp, ETH_ALEN);
+ else
+ printk(KERN_DEBUG "AR71XX: failed to parse mac address "
+ "\"%s\"\n", mac_str);
+}
+
static int __init ar71xx_machine_setup(void)
{
ar71xx_print_cmdline();
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
index e21464fc1..69425d50c 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -18,15 +18,16 @@
#include <asm/addrspace.h>
#include <asm/mach-ar71xx/ar71xx.h>
+#include <asm/mach-ar71xx/platform.h>
struct board_rec {
char *name;
unsigned long mach_type;
};
-static int prom_argc __initdata;
-static char **prom_argv __initdata;
-static char **prom_envp __initdata;
+static int ar71xx_prom_argc __initdata;
+static char **ar71xx_prom_argv __initdata;
+static char **ar71xx_prom_envp __initdata;
static struct board_rec boards[] __initdata = {
{
@@ -41,30 +42,37 @@ static struct board_rec boards[] __initdata = {
}
};
-char *(*prom_getenv)(const char *envname) __initdata;
-
-static __init char *dummy_getenv(const char *envname)
+static __init void routerboot_printargs(void)
{
- return NULL;
+ int i;
+
+ for (i = 0; i < ar71xx_prom_argc; i++)
+ printk(KERN_DEBUG "prom: routerboot envp[%d]: %s\n",
+ i, ar71xx_prom_argv[i]);
}
-static void __init routerboot_printargs(void)
+static __init char *routerboot_getenv(const char *envname)
{
+ int len = strlen(envname);
int i;
- for (i = 0; i < prom_argc; i++)
- printk(KERN_DEBUG "prom: routerboot envp[%d]: %s\n",
- i, prom_envp[i]);
+ for (i = 0; i < ar71xx_prom_argc; i++) {
+ char *env = ar71xx_prom_argv[i];
+ if (strncmp(envname, env, len) == 0 && (env)[len] == '=')
+ return env + len + 1;
+ }
+
+ return NULL;
}
-static __init char *routerboot_getenv(const char *envname)
+static __init char *redboot_getenv(const char *envname)
{
+ int len = strlen(envname);
char **env;
- int i = strlen(envname);
- for (env = prom_envp; *env != NULL; env++)
- if (strncmp(envname, *env, i) == 0 && (*env)[i] == '=')
- return *env + i + 1;
+ for (env = ar71xx_prom_envp; *env != NULL; env++)
+ if (strncmp(envname, *env, len) == 0 && (*env)[len] == '=')
+ return *env + len + 1;
return NULL;
}
@@ -82,28 +90,37 @@ static __init unsigned long find_board_byname(char *name)
void __init prom_init(void)
{
- char *board;
+ char *board = NULL;
+ char *mac = NULL;
printk(KERN_DEBUG "prom: fw_arg0=%08x, fw_arg1=%08x, "
"fw_arg2=%08x, fw_arg3=%08x\n",
(unsigned int)fw_arg0, (unsigned int)fw_arg1,
(unsigned int)fw_arg2, (unsigned int)fw_arg3);
- prom_getenv = dummy_getenv;
-
- if ((fw_arg0 == 7) && (fw_arg2 == 0)) {
- prom_argc = fw_arg0;
- prom_envp = (char **)fw_arg1;
- prom_getenv = routerboot_getenv;
+ if ((fw_arg0 == 7) && (fw_arg2 == 0) && (fw_arg3 == 0)) {
+ /* assume RouterBOOT */
+ ar71xx_prom_argc = fw_arg0;
+ ar71xx_prom_argv = (char **)fw_arg1;
routerboot_printargs();
+ board = routerboot_getenv("board");
+ mac = routerboot_getenv("kmac");
+ } else {
+ /* assume Redboot */
+ ar71xx_prom_argc = fw_arg0;
+ ar71xx_prom_argv = (char **)fw_arg1;
+ ar71xx_prom_envp = (char **)fw_arg2;
+ mac = redboot_getenv("ethaddr");
}
- board = prom_getenv("board");
if (board)
mips_machtype = find_board_byname(board);
else
mips_machtype = MACH_AR71XX_GENERIC;
+ if (mac)
+ ar71xx_set_mac_base(mac);
+
ar71xx_print_cmdline();
}