diff --git a/target/linux/mpc85xx/config-4.9 b/target/linux/mpc85xx/config-4.9
index 46950e70c8..f8114215fb 100644
--- a/target/linux/mpc85xx/config-4.9
+++ b/target/linux/mpc85xx/config-4.9
@@ -25,7 +25,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ASN1=y
-CONFIG_AT803X_PHY=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BOOKE=y
@@ -38,7 +37,7 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_CLZ_TAB=y
 CONFIG_CMDLINE="console=ttyS0,115200"
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE_OVERRIDE=y
+# CONFIG_CMDLINE_OVERRIDE is not set
 # CONFIG_CORENET_GENERIC is not set
 # CONFIG_CPM2 is not set
 CONFIG_CPU_BIG_ENDIAN=y
@@ -74,7 +73,7 @@ CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_SHA256_PPC_SPE is not set
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DNOTIFY=y
 CONFIG_DTC=y
 # CONFIG_E200 is not set
@@ -82,7 +81,6 @@ CONFIG_E500=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
-CONFIG_EEPROM_LEGACY=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_EPAPR_BOOT is not set
 CONFIG_ETHERNET_PACKET_MANGLE=y
@@ -98,7 +96,7 @@ CONFIG_FSL_PCI=y
 CONFIG_FSL_PQ_MDIO=y
 CONFIG_FSL_SOC=y
 CONFIG_FSL_SOC_BOOKE=y
-CONFIG_FSL_ULI1575=y
+# CONFIG_FSL_ULI1575 is not set
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
@@ -128,7 +126,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_RAPIDIO=y
+# CONFIG_HAS_RAPIDIO is not set
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 # CONFIG_HAVE_ARCH_BITREVERSE is not set
@@ -163,7 +161,7 @@ CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
-CONFIG_HIVEAP_330=y
+# CONFIG_HIVEAP_330 is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
@@ -171,7 +169,6 @@ CONFIG_HZ_250=y
 CONFIG_HZ_PERIODIC=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MPC=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IOMMU_HELPER=y
@@ -184,8 +181,6 @@ CONFIG_ISA_DMA_API=y
 CONFIG_KERNEL_GZIP=y
 CONFIG_KERNEL_START=0xc0000000
 # CONFIG_KSI8560 is not set
-CONFIG_LEDS_LP5521=y
-CONFIG_LEDS_LP55XX_COMMON=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LIBFDT=y
@@ -200,18 +195,18 @@ CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_MPC8536_DS is not set
 # CONFIG_MPC8540_ADS is not set
 # CONFIG_MPC8560_ADS is not set
-CONFIG_MPC85xx_CDS=y
+# CONFIG_MPC85xx_CDS is not set
 # CONFIG_MPC85xx_DS is not set
-CONFIG_MPC85xx_MDS=y
-CONFIG_MPC85xx_RDB=y
+# CONFIG_MPC85xx_MDS is not set
+# CONFIG_MPC85xx_RDB is not set
 CONFIG_MPIC=y
 # CONFIG_MPIC_MSGR is not set
 CONFIG_MPIC_TIMER=y
 # CONFIG_MPIC_U3_HT_IRQS is not set
 # CONFIG_MPIC_WEIRD is not set
 CONFIG_MPILIB=y
+# CONFIG_MTD_CFI is not set
 CONFIG_MTD_M25P80=y
-CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_MVME2500 is not set
 # CONFIG_NEED_DMA_MAP_STATE is not set
@@ -236,7 +231,7 @@ CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND=y
-CONFIG_P1010_RDB=y
+# CONFIG_P1010_RDB is not set
 # CONFIG_P1022_DS is not set
 # CONFIG_P1022_RDK is not set
 # CONFIG_P1023_RDB is not set
@@ -278,7 +273,7 @@ CONFIG_PPC_DOORBELL=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 # CONFIG_PPC_EPAPR_HV_PIC is not set
 CONFIG_PPC_FSL_BOOK3E=y
-CONFIG_PPC_I8259=y
+# CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_ICP_HV is not set
 # CONFIG_PPC_ICP_NATIVE is not set
 # CONFIG_PPC_ICS_RTAS is not set
@@ -336,7 +331,7 @@ CONFIG_SWPHY=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_TASK_SIZE=0xc0000000
 CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_TL_WDR4900_V1=y
+# CONFIG_TL_WDR4900_V1 is not set
 # CONFIG_TQM8540 is not set
 # CONFIG_TQM8541 is not set
 # CONFIG_TQM8548 is not set
diff --git a/target/linux/mpc85xx/generic/config-default b/target/linux/mpc85xx/generic/config-default
index e69de29bb2..81bf934b33 100644
--- a/target/linux/mpc85xx/generic/config-default
+++ b/target/linux/mpc85xx/generic/config-default
@@ -0,0 +1 @@
+CONFIG_TL_WDR4900_V1=y
diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default
index 8fd795730e..fd9433b59a 100644
--- a/target/linux/mpc85xx/p1020/config-default
+++ b/target/linux/mpc85xx/p1020/config-default
@@ -1,15 +1,31 @@
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_AT803X_PHY=y
+CONFIG_CMDLINE_OVERRIDE=y
 CONFIG_CPU_RMAP=y
+CONFIG_EEPROM_LEGACY=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_TBSYNC=y
+# CONFIG_GPIO_MAX77620 is not set
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HIVEAP_330=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_LEDS_LP5521=y
+CONFIG_LEDS_LP55XX_COMMON=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
+# CONFIG_MAX77620_WATCHDOG is not set
+CONFIG_MFD_CORE=y
+CONFIG_MFD_MAX77620=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_PHYSMAP=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NR_CPUS=2
+CONFIG_PADATA=y
 CONFIG_RCU_STALL_COMMON=y
+CONFIG_REGMAP_IRQ=y
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
+# CONFIG_RTC_DRV_MAX77686 is not set
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_SMP=y
 CONFIG_TREE_RCU=y