55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From 5973fc7ef66d09f15d3e7dbd2194509c2ee07def Mon Sep 17 00:00:00 2001
|
|
From: Viacheslav Bocharov <adeep@lexina.in>
|
|
Date: Thu, 22 Dec 2022 15:10:29 +0300
|
|
Subject: [PATCH] ARM: amlogic: revert JetHub D1 eth mac generation with
|
|
manufacturer OUI
|
|
|
|
Partially revert add JetHub D1 eth mac generation with manufacturer OUI
|
|
commit 4f4f974a46244270c1c6723017711c0aa8250206
|
|
|
|
Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
|
|
---
|
|
board/amlogic/jethub-j100/jethub-j100.c | 19 +------------------
|
|
1 file changed, 1 insertion(+), 18 deletions(-)
|
|
|
|
diff --git a/board/amlogic/jethub-j100/jethub-j100.c b/board/amlogic/jethub-j100/jethub-j100.c
|
|
index 41ef5db493..0d1cb6b21d 100644
|
|
--- a/board/amlogic/jethub-j100/jethub-j100.c
|
|
+++ b/board/amlogic/jethub-j100/jethub-j100.c
|
|
@@ -19,8 +19,6 @@
|
|
int misc_init_r(void)
|
|
{
|
|
u8 mac_addr[ARP_HLEN];
|
|
- char serial[SM_SERIAL_SIZE];
|
|
- u32 sid;
|
|
int ret;
|
|
|
|
char _cmdbuf[96];
|
|
@@ -78,22 +76,7 @@ int misc_init_r(void)
|
|
}
|
|
}
|
|
|
|
- if (mac_addr[0]==0)
|
|
- if (!meson_sm_get_serial(serial, SM_SERIAL_SIZE)) {
|
|
- sid = crc32(0, (unsigned char *)serial, SM_SERIAL_SIZE);
|
|
- /* Ensure the NIC specific bytes of the mac are not all 0 */
|
|
- if ((sid & 0xffff) == 0)
|
|
- sid |= 0x800000;
|
|
-
|
|
- /* OUI registered MAC address */
|
|
- mac_addr[0] = 0x10;
|
|
- mac_addr[1] = 0x27;
|
|
- mac_addr[2] = 0xBE;
|
|
- mac_addr[3] = (sid >> 16) & 0xff;
|
|
- mac_addr[4] = (sid >> 8) & 0xff;
|
|
- mac_addr[5] = (sid >> 0) & 0xff;
|
|
- eth_env_set_enetaddr("ethaddr", mac_addr);
|
|
- }
|
|
+ meson_generate_serial_ethaddr();
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
2.34.1
|
|
|