Merge git://git.denx.de/u-boot-tegra

[oweals/u-boot.git] / board / theobroma-systems / puma_rk3399 / puma-rk3399.c

diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index fb4d31e01d546501a35f5aac9f8fe1b96609f431..c6f8eed0c98821ab10941cfecc02ae994986bdae 100644 (file)
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -5,10 +5,14 @@
  */
 #include <common.h>
 #include <dm.h>
+#include <misc.h>
+#include <ram.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <asm/setup.h>
 #include <asm/arch/periph.h>
 #include <power/regulator.h>
+#include <u-boot/sha256.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -55,17 +59,118 @@ out:
        return 0;
 }
 
-int dram_init(void)
+static void setup_macaddr(void)
 {
-       gd->ram_size = 0x80000000;
-       return 0;
+#if CONFIG_IS_ENABLED(CMD_NET)
+       int ret;
+       const char *cpuid = env_get("cpuid#");
+       u8 hash[SHA256_SUM_LEN];
+       int size = sizeof(hash);
+       u8 mac_addr[6];
+
+       /* Only generate a MAC address, if none is set in the environment */
+       if (env_get("ethaddr"))
+               return;
+
+       if (!cpuid) {
+               debug("%s: could not retrieve 'cpuid#'\n", __func__);
+               return;
+       }
+
+       ret = hash_block("sha256", (void *)cpuid, strlen(cpuid), hash, &size);
+       if (ret) {
+               debug("%s: failed to calculate SHA256\n", __func__);
+               return;
+       }
+
+       /* Copy 6 bytes of the hash to base the MAC address on */
+       memcpy(mac_addr, hash, 6);
+
+       /* Make this a valid MAC address and set it */
+       mac_addr[0] &= 0xfe;  /* clear multicast bit */
+       mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
+       eth_env_set_enetaddr("ethaddr", mac_addr);
+#endif
+
+       return;
+}
+
+static void setup_serial(void)
+{
+#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE)
+       const u32 cpuid_offset = 0x7;
+       const u32 cpuid_length = 0x10;
+
+       struct udevice *dev;
+       int ret, i;
+       u8 cpuid[cpuid_length];
+       u8 low[cpuid_length/2], high[cpuid_length/2];
+       char cpuid_str[cpuid_length * 2 + 1];
+       u64 serialno;
+       char serialno_str[16];
+
+       /* retrieve the device */
+       ret = uclass_get_device_by_driver(UCLASS_MISC,
+                                         DM_GET_DRIVER(rockchip_efuse), &dev);
+       if (ret) {
+               debug("%s: could not find efuse device\n", __func__);
+               return;
+       }
+
+       /* read the cpu_id range from the efuses */
+       ret = misc_read(dev, cpuid_offset, &cpuid, sizeof(cpuid));
+       if (ret) {
+               debug("%s: reading cpuid from the efuses failed\n",
+                     __func__);
+               return;
+       }
+
+       memset(cpuid_str, 0, sizeof(cpuid_str));
+       for (i = 0; i < 16; i++)
+               sprintf(&cpuid_str[i * 2], "%02x", cpuid[i]);
+
+       debug("cpuid: %s\n", cpuid_str);
+
+       /*
+        * Mix the cpuid bytes using the same rules as in
+        *   ${linux}/drivers/soc/rockchip/rockchip-cpuinfo.c
+        */
+       for (i = 0; i < 8; i++) {
+               low[i] = cpuid[1 + (i << 1)];
+               high[i] = cpuid[i << 1];
+       }
+
+       serialno = crc32_no_comp(0, low, 8);
+       serialno |= (u64)crc32_no_comp(serialno, high, 8) << 32;
+       snprintf(serialno_str, sizeof(serialno_str), "%llx", serialno);
+
+       env_set("cpuid#", cpuid_str);
+       env_set("serial#", serialno_str);
+#endif
+
+       return;
 }
 
-int dram_init_banksize(void)
+int misc_init_r(void)
 {
-       /* Reserve 0x200000 for ATF bl31 */
-       gd->bd->bi_dram[0].start = 0x200000;
-       gd->bd->bi_dram[0].size = 0x7e000000;
+       setup_serial();
+       setup_macaddr();
 
        return 0;
 }
+
+#ifdef CONFIG_SERIAL_TAG
+void get_board_serial(struct tag_serialnr *serialnr)
+{
+       char *serial_string;
+       u64 serial = 0;
+
+       serial_string = env_get("serial#");
+
+       if (serial_string)
+               serial = simple_strtoull(serial_string, NULL, 16);
+
+       serialnr->high = (u32)(serial >> 32);
+       serialnr->low = (u32)(serial & 0xffffffff);
+}
+#endif