sunxi: Serial number support, obtained from SID bits

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 0c9d3b802968908f46c848cbd1366046723ae7b8..7633d65e6c988e6f1a00c766500c2db370dbe930 100644 (file)
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -372,20 +372,31 @@ int g_dnl_board_usb_cable_connected(void)
 #ifdef CONFIG_MISC_INIT_R
 int misc_init_r(void)
 {
+       char serial_string[17] = { 0 };
        unsigned int sid[4];
+       uint8_t mac_addr[6];
+       int ret;
+
+       ret = sunxi_get_sid(sid);
+       if (ret == 0 && sid[0] != 0 && sid[3] != 0) {
+               if (!getenv("ethaddr")) {
+                       /* Non OUI / registered MAC address */
+                       mac_addr[0] = 0x02;
+                       mac_addr[1] = (sid[0] >>  0) & 0xff;
+                       mac_addr[2] = (sid[3] >> 24) & 0xff;
+                       mac_addr[3] = (sid[3] >> 16) & 0xff;
+                       mac_addr[4] = (sid[3] >>  8) & 0xff;
+                       mac_addr[5] = (sid[3] >>  0) & 0xff;
+
+                       eth_setenv_enetaddr("ethaddr", mac_addr);
+               }
 
-       if (!getenv("ethaddr") && sunxi_get_sid(sid) == 0 &&
-                       sid[0] != 0 && sid[3] != 0) {
-               uint8_t mac_addr[6];
-
-               mac_addr[0] = 0x02; /* Non OUI / registered MAC address */
-               mac_addr[1] = (sid[0] >>  0) & 0xff;
-               mac_addr[2] = (sid[3] >> 24) & 0xff;
-               mac_addr[3] = (sid[3] >> 16) & 0xff;
-               mac_addr[4] = (sid[3] >>  8) & 0xff;
-               mac_addr[5] = (sid[3] >>  0) & 0xff;
+               if (!getenv("serial#")) {
+                       snprintf(serial_string, sizeof(serial_string),
+                               "%08x%08x", sid[0], sid[3]);
 
-               eth_setenv_enetaddr("ethaddr", mac_addr);
+                       setenv("serial#", serial_string);
+               }
        }
 
 #if defined(CONFIG_MUSB_HOST) || defined(CONFIG_MUSB_GADGET)