Commit 180ab84f authored by Bernard Blackham's avatar Bernard Blackham Committed by Kevin Hilman

ARM: DaVinci: Standardise deceased cows to fix MAC address

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: default avatarBernard Blackham <bernard@largestprime.net>
Signed-off-by: default avatarKevin Hilman <khilman@mvista.com>
parent 758eda6a
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <asm/arch/i2c-client.h> #include <asm/arch/i2c-client.h>
/* Get Ethernet address from kernel boot params */ /* 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 /* This function gets the Ethernet MAC address from EEPROM
* Input buffer to be of atlease 20 bytes in length * Input buffer to be of atlease 20 bytes in length
......
...@@ -1606,7 +1606,7 @@ static struct clk *emac_clk; ...@@ -1606,7 +1606,7 @@ static struct clk *emac_clk;
static unsigned long emac_bus_frequency; static unsigned long emac_bus_frequency;
/* MAC ethernet address string in 00:00:00:00:00:00 format */ /* 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"; static const char emac_ddcversion_string[] = "EMAC DDC version 0.5";
...@@ -3379,7 +3379,7 @@ static int emac_dev_init(struct net_device *netdev) ...@@ -3379,7 +3379,7 @@ static int emac_dev_init(struct net_device *netdev)
emac_eth_setup(); emac_eth_setup();
/* we are getting default MAC address from bootloader */ /* 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"; default_mac_string = "08.00.28.32.06.08";
} else { } else {
default_mac_string = &emac_eth_string[0]; default_mac_string = &emac_eth_string[0];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment