GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-01 03:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: gadget: Move USBNET_HOST_ADDR to Kconfig

Browse source 
While the USB Ethernet device address is already defined in Kconfig, the
host address isn't. Convert it.

Reviewed-by: Łukasz Majewski <lukma@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Maxime Ripard 2017-09-06 22:53:43 +02:00
parent 74e7997c70
commit c163668a4a
14 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configs/am335x_baltos_defconfig
View file

@ -61,5 +61,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0403 CONFIG_G_DNL_VENDOR_NUM=0x0403
CONFIG_G_DNL_PRODUCT_NUM=0xbd00 CONFIG_G_DNL_PRODUCT_NUM=0xbd00
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_FAT_WRITE=y CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/am335x_boneblack_defconfig
View file

@ -40,6 +40,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y CONFIG_LZO=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OF_LIBFDT_OVERLAY=y

1
configs/am335x_evm_norboot_defconfig
View file

@ -35,6 +35,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_VENDOR_NUM=0x0451
CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_G_DNL_PRODUCT_NUM=0xd022
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_LZO=y CONFIG_LZO=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OF_LIBFDT_OVERLAY=y

1
configs/pxm2_defconfig
View file

@ -74,6 +74,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG" CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908 CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_SYS_CONSOLE_BG_COL=0xff CONFIG_SYS_CONSOLE_BG_COL=0xff
CONFIG_SYS_CONSOLE_FG_COL=0x00 CONFIG_SYS_CONSOLE_FG_COL=0x00

1
configs/rastaban_defconfig
View file

@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Siemens AG" CONFIG_G_DNL_MANUFACTURER="Siemens AG"
CONFIG_G_DNL_VENDOR_NUM=0x0908 CONFIG_G_DNL_VENDOR_NUM=0x0908
CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"

1
configs/warp7_defconfig
View file

@ -38,4 +38,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="FSL" CONFIG_G_DNL_MANUFACTURER="FSL"
CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/warp7_secure_defconfig
View file

@ -36,4 +36,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="FSL" CONFIG_G_DNL_MANUFACTURER="FSL"
CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_VENDOR_NUM=0x0525
CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

7
drivers/usb/gadget/Kconfig
View file

@ -128,4 +128,11 @@ config USBNET_DEVADDR
Ethernet MAC address of the device-side (ie. local board's) MAC Ethernet MAC address of the device-side (ie. local board's) MAC
address of the usb_ether interface address of the usb_ether interface
config USBNET_HOST_ADDR
string "USB Gadget Ethernet host mac address"
default "de:ad:be:ef:00:00"
help
Ethernet MAC address of the host-side (ie. remote device's) MAC
address of the usb_ether interface
endif # USB_GADGET endif # USB_GADGET

1
include/configs/am335x_evm.h
View file

@ -266,7 +266,6 @@
#ifdef CONFIG_USB_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#endif /* CONFIG_USB_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
/* /*

1
include/configs/baltos.h
View file

@ -286,7 +286,6 @@
#ifdef CONFIG_USB_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#endif /* CONFIG_USB_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)

1
include/configs/h2200.h
View file

@ -127,7 +127,6 @@
#define CONFIG_USB_ETH_SUBSET #define CONFIG_USB_ETH_SUBSET
#define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01" #define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01"
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:ef:00:02"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"stdin=serial\0" \ "stdin=serial\0" \
"stdout=serial\0" \ "stdout=serial\0" \

1
include/configs/siemens-am33x-common.h
View file

@ -181,7 +181,6 @@
#ifdef CONFIG_USB_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#endif /* CONFIG_USB_MUSB_GADGET */ #endif /* CONFIG_USB_MUSB_GADGET */
/* USB DRACO ID as default */ /* USB DRACO ID as default */

1
include/configs/warp7.h
View file

@ -139,7 +139,6 @@
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_CDC #define CONFIG_USB_ETH_CDC
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01" #define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01"
#endif #endif

1
scripts/config_whitelist.txt
View file

@ -4973,7 +4973,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE
CONFIG_USBD_VENDORID CONFIG_USBD_VENDORID
CONFIG_USBID_ADDR CONFIG_USBID_ADDR
CONFIG_USBNET_DEV_ADDR CONFIG_USBNET_DEV_ADDR
CONFIG_USBNET_HOST_ADDR
CONFIG_USBNET_MANUFACTURER CONFIG_USBNET_MANUFACTURER
CONFIG_USBTTY CONFIG_USBTTY
CONFIG_USB_AM35X CONFIG_USB_AM35X