diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2015-08-27 19:37:12 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-22 14:17:22 -0400 |
| commit | 07815eb9f3f742237085e3eda947e095926212b0 (patch) | |
| tree | eee6f6372237c7c288f7b59944a38e2ffc2c7756 /board | |
| parent | 9fd5401659c34b9b07f5d729ad35611b002830ff (diff) | |
| download | u-boot-imx-07815eb9f3f742237085e3eda947e095926212b0.zip u-boot-imx-07815eb9f3f742237085e3eda947e095926212b0.tar.gz u-boot-imx-07815eb9f3f742237085e3eda947e095926212b0.tar.bz2 | |
omap-common: Common serial and usbethaddr functions based on die id
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>
Diffstat (limited to 'board')
| -rw-r--r-- | board/lge/sniper/sniper.c | 11 | ||||
| -rw-r--r-- | board/ti/beagle/beagle.c | 8 | ||||
| -rw-r--r-- | board/ti/dra7xx/evm.c | 5 | ||||
| -rw-r--r-- | board/ti/omap5_uevm/evm.c | 5 | ||||
| -rw-r--r-- | board/ti/panda/panda.c | 4 |
5 files changed, 6 insertions, 27 deletions
diff --git a/board/lge/sniper/sniper.c b/board/lge/sniper/sniper.c index ae9fe69..cdda76b 100644 --- a/board/lge/sniper/sniper.c +++ b/board/lge/sniper/sniper.c @@ -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 */ diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index b0d06a5..149b5db 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -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; } diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index d4f5078..eebec88 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -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; } diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 0484087..853f196 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -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; } diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 4de7ea1..eb9ce63 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -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; } |