4 files changed, 3 insertions, 13 deletions
diff --git a/target/linux/brcm2708/bcm2708/config-4.19 b/target/linux/brcm2708/bcm2708/config-4.19
index 86d6b11b1e..16728fc839 100644
--- a/target/linux/brcm2708/bcm2708/config-4.19
+++ b/target/linux/brcm2708/bcm2708/config-4.19
@@ -304,7 +304,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NLS=y
 CONFIG_NLS_ASCII=y
-CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NO_BOOTMEM=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
diff --git a/target/linux/brcm2708/bcm2709/config-4.19 b/target/linux/brcm2708/bcm2709/config-4.19
index 46fd680024..1fac80f815 100644
--- a/target/linux/brcm2708/bcm2709/config-4.19
+++ b/target/linux/brcm2708/bcm2709/config-4.19
@@ -358,7 +358,6 @@ CONFIG_NEON=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NLS=y
 CONFIG_NLS_ASCII=y
-CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NO_BOOTMEM=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
diff --git a/target/linux/brcm2708/bcm2710/config-4.19 b/target/linux/brcm2708/bcm2710/config-4.19
index 6e77a73ac0..d5f137a267 100644
--- a/target/linux/brcm2708/bcm2710/config-4.19
+++ b/target/linux/brcm2708/bcm2710/config-4.19
@@ -125,7 +125,7 @@ CONFIG_BCM2835_THERMAL=y
 CONFIG_BCM2835_VCHIQ=y
 # CONFIG_BCM2835_VCHIQ_MMAL is not set
 CONFIG_BCM2835_WDT=y
-# CONFIG_BCM_VCIO is not set
+CONFIG_BCM_VCIO=y
 # CONFIG_BCM_VC_SM is not set
 # CONFIG_BCM_VC_SM_CMA is not set
 CONFIG_BCM_VIDEOCORE=y
@@ -206,7 +206,6 @@ CONFIG_DMA_CMA=y
 CONFIG_DMA_DIRECT_OPS=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
-CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DNOTIFY=y
 CONFIG_DTC=y
@@ -416,7 +415,6 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NLS=y
 CONFIG_NLS_ASCII=y
-CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NO_BOOTMEM=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
diff --git a/target/linux/brcm2708/bcm2711/config-4.19 b/target/linux/brcm2708/bcm2711/config-4.19
index ab227adb43..acb595ed1d 100644
--- a/target/linux/brcm2708/bcm2711/config-4.19
+++ b/target/linux/brcm2708/bcm2711/config-4.19
@@ -121,14 +121,14 @@ CONFIG_BCM2835_DEVGPIOMEM=y
 CONFIG_BCM2835_MBOX=y
 CONFIG_BCM2835_POWER=y
 # CONFIG_BCM2835_SMI is not set
-CONFIG_BCM2835_THERMAL=y
+# CONFIG_BCM2835_THERMAL is not set
 CONFIG_BCM2835_VCHIQ=y
 # CONFIG_BCM2835_VCHIQ_MMAL is not set
 CONFIG_BCM2835_WDT=y
 CONFIG_BCM7XXX_PHY=y
 CONFIG_BCMGENET=y
 CONFIG_BCM_NET_PHYLIB=y
-# CONFIG_BCM_VCIO is not set
+CONFIG_BCM_VCIO=y
 # CONFIG_BCM_VC_SM is not set
 # CONFIG_BCM_VC_SM_CMA is not set
 CONFIG_BCM_VIDEOCORE=y
@@ -397,7 +397,6 @@ CONFIG_MEMORY_ISOLATION=y
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_RPISENSE_CORE is not set
 CONFIG_MFD_SYSCON=y
-CONFIG_MICROCHIP_PHY=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
 CONFIG_MMC_BCM2835=y
@@ -421,7 +420,6 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NLS=y
 CONFIG_NLS_ASCII=y
-CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NO_BOOTMEM=y
 CONFIG_NO_HZ=y
 CONFIG_NO_HZ_COMMON=y
@@ -543,15 +541,11 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_DWCOTG=y
 # CONFIG_USB_EHCI_HCD is not set
-CONFIG_USB_LAN78XX=y
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_NET_SMSC95XX=y
 CONFIG_USB_PCI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UAS=y
 # CONFIG_USB_UHCI_HCD is not set
-CONFIG_USB_USBNET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y