The I2C EMAC code for reading the MAC address from EEPROM uses
deadbeEf in one place and deadbeAf in others as a magic string. As a
result, all DVEVMs actually get the same default MAC address. Here,
we correct them to the British English spelling of beef to fix the
issue and avoid further confusion (hopefully).
Signed-off-by: Bernard Blackham <[EMAIL PROTECTED]>
--
arch/arm/mach-davinci/i2c-emac.c | 2 +-
drivers/net/davinci_emac.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Index: linux-davinci-2.6.24.git/arch/arm/mach-davinci/i2c-emac.c
===================================================================
--- linux-davinci-2.6.24.git.orig/arch/arm/mach-davinci/i2c-emac.c
2008-04-16 17:01:42.000000000 +0800
+++ linux-davinci-2.6.24.git/arch/arm/mach-davinci/i2c-emac.c 2008-04-16
17:02:01.000000000 +0800
@@ -20,7 +20,7 @@
#include <asm/arch/i2c-client.h>
/* Get Ethernet address from kernel boot params */
-static unsigned char cpmac_eth_string[20] = "deadbeaf";
+static unsigned char cpmac_eth_string[20] = "deadbeef";
/* This function gets the Ethernet MAC address from EEPROM
* Input buffer to be of atlease 20 bytes in length
Index: linux-davinci-2.6.24.git/drivers/net/davinci_emac.c
===================================================================
--- linux-davinci-2.6.24.git.orig/drivers/net/davinci_emac.c 2008-02-14
20:30:07.000000000 +0900
+++ linux-davinci-2.6.24.git/drivers/net/davinci_emac.c 2008-04-16
17:02:01.000000000 +0800
@@ -1606,7 +1606,7 @@ static struct clk *emac_clk;
static unsigned long emac_bus_frequency;
/* MAC ethernet address string in 00:00:00:00:00:00 format */
-static unsigned char emac_eth_string[20] = "deadbeaf";
+static unsigned char emac_eth_string[20] = "deadbeef";
static const char emac_ddcversion_string[] = "EMAC DDC version 0.5";
@@ -3379,7 +3379,7 @@ static int emac_dev_init(struct net_devi
emac_eth_setup();
/* we are getting default MAC address from bootloader */
- if (strcmp(emac_eth_string, "deadbeaf") == 0) {
+ if (strcmp(emac_eth_string, "deadbeef") == 0) {
default_mac_string = "08.00.28.32.06.08";
} else {
default_mac_string = &emac_eth_string[0];
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
