mirror of
https://github.com/paolosabatino/multitool.git
synced 2024-11-25 06:26:17 +00:00
173 lines
4.2 KiB
Diff
173 lines
4.2 KiB
Diff
From 400e9e6b21878e8570ce1cb0242d93baa6c21c99 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Mon, 20 Aug 2018 23:01:10 +0200
|
|
Subject: [PATCH] rk3399-evb: use common get serial and ethaddr from efuse
|
|
|
|
---
|
|
board/rockchip/evb_rk3399/evb-rk3399.c | 119 -------------------------
|
|
include/configs/evb_rk3399.h | 3 -
|
|
2 files changed, 122 deletions(-)
|
|
|
|
diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c
|
|
index b6f730852a..3a6b802a3f 100644
|
|
--- a/board/rockchip/evb_rk3399/evb-rk3399.c
|
|
+++ b/board/rockchip/evb_rk3399/evb-rk3399.c
|
|
@@ -6,23 +6,17 @@
|
|
|
|
#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>
|
|
#include <usb.h>
|
|
#include <dwc3-uboot.h>
|
|
#include <spl.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
-#define RK3399_CPUID_OFF 0x7
|
|
-#define RK3399_CPUID_LEN 0x10
|
|
-
|
|
int rk_board_init(void)
|
|
{
|
|
struct udevice *pinctrl, *regulator;
|
|
@@ -74,119 +68,6 @@ out:
|
|
return 0;
|
|
}
|
|
|
|
-static void setup_macaddr(void)
|
|
-{
|
|
-#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)
|
|
- struct udevice *dev;
|
|
- int ret, i;
|
|
- u8 cpuid[RK3399_CPUID_LEN];
|
|
- u8 low[RK3399_CPUID_LEN/2], high[RK3399_CPUID_LEN/2];
|
|
- char cpuid_str[RK3399_CPUID_LEN * 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, RK3399_CPUID_OFF, &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 misc_init_r(void)
|
|
-{
|
|
- 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
|
|
-
|
|
#ifdef CONFIG_USB_DWC3
|
|
static struct dwc3_device dwc3_device_data = {
|
|
.maximum_speed = USB_SPEED_HIGH,
|
|
diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
|
|
index 5565c7ce53..840d63ff6d 100644
|
|
--- a/include/configs/evb_rk3399.h
|
|
+++ b/include/configs/evb_rk3399.h
|
|
@@ -18,9 +18,6 @@
|
|
#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
|
|
#define SDRAM_BANK_SIZE (2UL << 30)
|
|
-#define CONFIG_MISC_INIT_R
|
|
-#define CONFIG_SERIAL_TAG
|
|
-#define CONFIG_ENV_OVERWRITE
|
|
|
|
#define CONFIG_BMP_16BPP
|
|
#define CONFIG_BMP_24BPP
|