summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2017-10-05 08:26:36 -0400
committerTom Rini <[email protected]>2017-10-05 08:26:36 -0400
commit4f42a0d7210bd8d4d1f5e2fb73456679d74c44cd (patch)
tree9d86a09455140a0dc85bc7caa82c09a9eac82202 /scripts
parent6a3e65dea3e525b5337ca8014aa4be9f5fafeb92 (diff)
parente6ee85a6891eca187c9a9364c51690d3f6a36932 (diff)
Merge git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index db5d88b4b56..78bcf06878b 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1847,7 +1847,6 @@ CONFIG_RAMDISK_ADDR
CONFIG_RAMDISK_BOOT
CONFIG_RAM_BOOT
CONFIG_RAM_BOOT_PHYS
-CONFIG_RANDOM_UUID
CONFIG_RCAR_BOARD_STRING
CONFIG_RD_LVL
CONFIG_REALMODE_DEBUG
@@ -4973,8 +4972,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE
CONFIG_USBD_VENDORID
CONFIG_USBID_ADDR
CONFIG_USBNET_DEV_ADDR
-CONFIG_USBNET_HOST_ADDR
-CONFIG_USBNET_MANUFACTURER
CONFIG_USBTTY
CONFIG_USB_AM35X
CONFIG_USB_ATMEL
@@ -5004,10 +5001,7 @@ CONFIG_USB_EHCI_TEGRA
CONFIG_USB_EHCI_TXFIFO_THRESH
CONFIG_USB_EHCI_VCT
CONFIG_USB_EHCI_VF
-CONFIG_USB_ETHER
-CONFIG_USB_ETH_CDC
CONFIG_USB_ETH_QMULT
-CONFIG_USB_ETH_RNDIS
CONFIG_USB_ETH_SUBSET
CONFIG_USB_EXT2_BOOT
CONFIG_USB_FAT_BOOT