diff --git a/baseconfig/arm/CONFIG_PATA_OF_PLATFORM b/baseconfig/arm/CONFIG_PATA_OF_PLATFORM
deleted file mode 100644
index 5354705f9..000000000
--- a/baseconfig/arm/CONFIG_PATA_OF_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_OF_PLATFORM=m
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA b/baseconfig/arm/CONFIG_USB_CHIPIDEA
similarity index 100%
rename from baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA
rename to baseconfig/arm/CONFIG_USB_CHIPIDEA
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_HOST b/baseconfig/arm/CONFIG_USB_CHIPIDEA_HOST
similarity index 100%
rename from baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_HOST
rename to baseconfig/arm/CONFIG_USB_CHIPIDEA_HOST
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_UDC b/baseconfig/arm/CONFIG_USB_CHIPIDEA_UDC
similarity index 100%
rename from baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_UDC
rename to baseconfig/arm/CONFIG_USB_CHIPIDEA_UDC
diff --git a/baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI b/baseconfig/arm/CONFIG_USB_CHIPIDEA_ULPI
similarity index 100%
rename from baseconfig/arm/arm64/CONFIG_USB_CHIPIDEA_ULPI
rename to baseconfig/arm/CONFIG_USB_CHIPIDEA_ULPI
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA
deleted file mode 100644
index 0b76e3525..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_CHIPIDEA=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_HOST b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_HOST
deleted file mode 100644
index 1c14a4a6c..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_HOST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_CHIPIDEA_HOST=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_UDC b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_UDC
deleted file mode 100644
index 320052607..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_UDC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_CHIPIDEA_UDC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI b/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI
deleted file mode 100644
index d1a5cf9eb..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_USB_CHIPIDEA_ULPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_CHIPIDEA_ULPI=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index db89fd2dd..4fd0c0882 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3944,7 +3944,6 @@ CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NINJA32=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
-CONFIG_PATA_OF_PLATFORM=m
 CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 92ca930a2..5f05345de 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3923,7 +3923,6 @@ CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NINJA32=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
-CONFIG_PATA_OF_PLATFORM=m
 CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 4f07e53e7..577a4657b 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4234,7 +4234,6 @@ CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NINJA32=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
-CONFIG_PATA_OF_PLATFORM=m
 CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index bb0c4f2c9..081dc2f22 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4015,7 +4015,6 @@ CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NINJA32=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
-CONFIG_PATA_OF_PLATFORM=m
 CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m
@@ -5955,8 +5954,10 @@ CONFIG_USB_BELKIN=y
 CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_ULPI=y
 CONFIG_USB_CONFIGFS_ACM=y
 CONFIG_USB_CONFIGFS_ECM_SUBSET=y
 CONFIG_USB_CONFIGFS_ECM=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6fc6fa22b..74df8b400 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3994,7 +3994,6 @@ CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NINJA32=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
-CONFIG_PATA_OF_PLATFORM=m
 CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m
@@ -5932,8 +5931,10 @@ CONFIG_USB_BELKIN=y
 CONFIG_USB_CATC=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_CHAOSKEY=m
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_CHIPIDEA_ULPI is not set
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_ULPI=y
 CONFIG_USB_CONFIGFS_ACM=y
 CONFIG_USB_CONFIGFS_ECM_SUBSET=y
 CONFIG_USB_CONFIGFS_ECM=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index b2671c8f5..6ffdc21fa 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4213,7 +4213,6 @@ CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NINJA32=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_NS87415=m
-CONFIG_PATA_OF_PLATFORM=m
 CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_OPTI=m