Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-16 14:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

omap-common: Common serial and usbethaddr functions based on die id

Browse source 
Now that we have a common prototype to grab the omap die id, functions to figure
out a serial number and usb ethernet address can use it directly.
Those also get an omap_die_id prefix for better consistency.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Paul Kocialkowski 2015-08-27 19:37:12 +02:00 • committed by Tom Rini
parent 9fd5401659
commit 07815eb9f3
7 changed files with 38 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
arch/arm/cpu/armv7/omap-common/utils.c
View file

@ -46,35 +46,40 @@ __weak void omap_die_id(unsigned int *die_id)
die_id[0] = die_id[1] = die_id[2] = die_id[3] = 0;
}
void __weak usb_fake_mac_from_die_id(u32 *id)
void omap_die_id_serial(void)
{
uint8_t device_mac[6];
unsigned int die_id[4] = { 0 };
char serial_string[17] = { 0 };
omap_die_id((unsigned int *)&die_id);
if (!getenv("serial#")) {
snprintf(serial_string, sizeof(serial_string),
"%08x%08x", die_id[0], die_id[3]);
setenv("serial#", serial_string);
}
}
void omap_die_id_usbethaddr(void)
{
unsigned int die_id[4] = { 0 };
unsigned char mac[6] = { 0 };
omap_die_id((unsigned int *)&die_id);
if (!getenv("usbethaddr")) {
/*
* create a fake MAC address from the processor ID code.
* first byte is 0x02 to signify locally administered.
* Create a fake MAC address from the processor ID code.
* First byte is 0x02 to signify locally administered.
*/
device_mac[0] = 0x02;
device_mac[1] = id[3] & 0xff;
device_mac[2] = id[2] & 0xff;
device_mac[3] = id[1] & 0xff;
device_mac[4] = id[0] & 0xff;
device_mac[5] = (id[0] >> 8) & 0xff;
mac[0] = 0x02;
mac[1] = die_id[3] & 0xff;
mac[2] = die_id[2] & 0xff;
mac[3] = die_id[1] & 0xff;
mac[4] = die_id[0] & 0xff;
mac[5] = (die_id[0] >> 8) & 0xff;
eth_setenv_enetaddr("usbethaddr", device_mac);
}
}
void __weak usb_set_serial_num_from_die_id(u32 *id)
{
char serialno[72];
uint32_t serialno_lo, serialno_hi;
if (!getenv("serial#")) {
serialno_hi = id[0];
serialno_lo = id[1];
sprintf(serialno, "%08x%08x", serialno_hi, serialno_lo);
setenv("serial#", serialno);
eth_setenv_enetaddr("usbethaddr", mac);
}
}

5
arch/arm/include/asm/omap_common.h
View file

@ -603,8 +603,9 @@ void abb_setup(u32 fuse, u32 ldovbb, u32 setup, u32 control,
u32 txdone, u32 txdone_mask, u32 opp);
s8 abb_setup_ldovbb(u32 fuse, u32 ldovbb);
void usb_fake_mac_from_die_id(u32 *id);
void usb_set_serial_num_from_die_id(u32 *id);
void omap_die_id_serial(void);
void omap_die_id_usbethaddr(void);
void recalibrate_iodelay(void);
void omap_smc1(u32 service, u32 val);

11
board/lge/sniper/sniper.c
View file

@ -92,8 +92,6 @@ int board_init(void)
int misc_init_r(void)
{
unsigned char keypad_matrix[64] = { 0 };
unsigned int die_id[4] = { 0 };
char serial_string[17] = { 0 };
char reboot_mode[2] = { 0 };
unsigned char keys[3];
unsigned char data = 0;
@ -140,14 +138,7 @@ int misc_init_r(void)
/* Serial number */
omap_die_id(die_id);
if (!getenv("serial#")) {
snprintf(serial_string, sizeof(serial_string),
"%08x%08x", die_id[0], die_id[3]);
setenv("serial#", serial_string);
}
omap_die_id_serial();
/* MUSB */

8
board/ti/beagle/beagle.c
View file

@ -506,12 +506,8 @@ int misc_init_r(void)
musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE);
#endif
if (generate_fake_mac) {
unsigned int die_id[4] = { 0 };
omap_die_id(die_id);
usb_fake_mac_from_die_id(die_id);
}
if (generate_fake_mac)
omap_die_id_usbethaddr();
return 0;
}

5
board/ti/dra7xx/evm.c
View file

@ -57,15 +57,12 @@ int board_init(void)
int board_late_init(void)
{
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
unsigned int die_id[4] = { 0 };
if (omap_revision() == DRA722_ES1_0)
setenv("board_name", "dra72x");
else
setenv("board_name", "dra7xx");
omap_die_id(die_id);
usb_set_serial_num_from_die_id(die_id);
omap_die_id_serial();
#endif
return 0;
}

5
board/ti/omap5_uevm/evm.c
View file

@ -189,14 +189,11 @@ static void enable_host_clocks(void)
*/
int misc_init_r(void)
{
unsigned int die_id[4] = { 0 };
#ifdef CONFIG_PALMAS_POWER
palmas_init_settings();
#endif
omap_die_id(die_id);
usb_fake_mac_from_die_id(die_id);
omap_die_id_usbethaddr();
return 0;
}

4
board/ti/panda/panda.c
View file

@ -209,7 +209,6 @@ int misc_init_r(void)
{
int phy_type;
u32 auxclk, altclksrc;
unsigned int die_id[4] = { 0 };
/* EHCI is not supported on ES1.0 */
if (omap_revision() == OMAP4430_ES1_0)
@ -263,8 +262,7 @@ int misc_init_r(void)
writel(altclksrc, &scrm->altclksrc);
omap_die_id(die_id);
usb_fake_mac_from_die_id(die_id);
omap_die_id_usbethaddr();
return 0;
}