121c89763a
- from https://gitlab.collabora.com/mediatek/aiot/boot/-/tree/main/patches/u-boot at 2db9a7b3f8c9c2141af6a01dd9372dbba809cf95 - I can see atleast one is a bit malformed so commit separately
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From 89f0ccb32ceaffa61f1cd67967734958e64320c6 Mon Sep 17 00:00:00 2001
|
|
From: Ignacio Zamora <nachopitt@gmail.com>
|
|
Date: Sat, 8 Oct 2022 09:50:56 -0500
|
|
Subject: [PATCH] Fix typo in CONFIG_USBNET_DEVADDR
|
|
|
|
Fix typo that was caused by the same feature being split in to 2 different
|
|
configuration options. Replace CONFIG_USBNET_DEVADDR with
|
|
CONFIG_USBNET_DEV_ADDR
|
|
|
|
Signed-off-by: Ignacio Zamora <nachopitt@gmail.com>
|
|
---
|
|
drivers/usb/gadget/Kconfig | 2 +-
|
|
drivers/usb/gadget/ether.c | 2 +-
|
|
include/configs/warp7.h | 2 --
|
|
3 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
|
|
index da9c9e3f10..e8da73c788 100644
|
|
--- a/drivers/usb/gadget/Kconfig
|
|
+++ b/drivers/usb/gadget/Kconfig
|
|
@@ -241,7 +241,7 @@ config USB_ETH_RNDIS
|
|
|
|
endchoice
|
|
|
|
-config USBNET_DEVADDR
|
|
+config USBNET_DEV_ADDR
|
|
string "USB Gadget Ethernet device mac address"
|
|
default "de:ad:be:ef:00:01"
|
|
help
|
|
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
|
|
index abb5332f13..6ce389de9f 100644
|
|
--- a/drivers/usb/gadget/ether.c
|
|
+++ b/drivers/usb/gadget/ether.c
|
|
@@ -2620,7 +2620,7 @@ static int usb_eth_probe(struct udevice *dev)
|
|
priv->netdev = dev;
|
|
l_priv = priv;
|
|
|
|
- get_ether_addr(CONFIG_USBNET_DEVADDR, pdata->enetaddr);
|
|
+ get_ether_addr(CONFIG_USBNET_DEV_ADDR, pdata->enetaddr);
|
|
eth_env_set_enetaddr("usbnet_devaddr", pdata->enetaddr);
|
|
|
|
return 0;
|
|
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
|
|
index 7e9b25b07b..a9cc859535 100644
|
|
--- a/include/configs/warp7.h
|
|
+++ b/include/configs/warp7.h
|
|
@@ -100,8 +100,6 @@
|
|
/* USB Device Firmware Update support */
|
|
#define DFU_DEFAULT_POLL_TIMEOUT 300
|
|
|
|
-#define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01"
|
|
-
|
|
/* Environment variable name to represent HAB enable state */
|
|
#define HAB_ENABLED_ENVNAME "hab_enabled"
|
|
|