summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2015-08-27 19:37:09 +0200
committerTom Rini <trini@konsulko.com>2015-10-22 14:17:18 -0400
commitb50a7685283b66623a6acb60329c57caa78795f5 (patch)
tree05bdfc9d331e7c727df827fb0d8c34c38e4edb87 /board
parent72931b15e7a49840a3c439096e4966400e60c65e (diff)
downloadtalos-obmc-uboot-b50a7685283b66623a6acb60329c57caa78795f5.tar.gz
talos-obmc-uboot-b50a7685283b66623a6acb60329c57caa78795f5.zip
omap3: omap_die_id support
This replaces the previous get_dieid definition with omap_die_id, that matches the common omap_die_id definition. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board')
-rw-r--r--board/lge/sniper/sniper.c6
-rw-r--r--board/ti/beagle/beagle.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/board/lge/sniper/sniper.c b/board/lge/sniper/sniper.c
index a43f640ecf..ae9fe69346 100644
--- a/board/lge/sniper/sniper.c
+++ b/board/lge/sniper/sniper.c
@@ -92,9 +92,9 @@ 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 };
- u32 dieid[4] = { 0 };
unsigned char keys[3];
unsigned char data = 0;
@@ -140,11 +140,11 @@ int misc_init_r(void)
/* Serial number */
- get_dieid((u32 *)&dieid);
+ omap_die_id(die_id);
if (!getenv("serial#")) {
snprintf(serial_string, sizeof(serial_string),
- "%08x%08x", dieid[0], dieid[3]);
+ "%08x%08x", die_id[0], die_id[3]);
setenv("serial#", serial_string);
}
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 3b0a9e7141..b0d06a5f5b 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -507,10 +507,10 @@ int misc_init_r(void)
#endif
if (generate_fake_mac) {
- u32 id[4];
+ unsigned int die_id[4] = { 0 };
- get_dieid(id);
- usb_fake_mac_from_die_id(id);
+ omap_die_id(die_id);
+ usb_fake_mac_from_die_id(die_id);
}
return 0;
OpenPOWER on IntegriCloud