3 files changed, 9 insertions, 10 deletions
diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9
index 930cf7676c..b73e0adba3 100644
--- a/target/linux/generic/config-4.9
+++ b/target/linux/generic/config-4.9
@@ -310,6 +310,7 @@ CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_PSCI is not set
 # CONFIG_ARM_PTDUMP is not set
+# CONFIG_ARM_SBSA_WATCHDOG is not set
 # CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_ARM_UNWIND is not set
 # CONFIG_ARM_VIRT_EXT is not set
@@ -2186,6 +2187,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LIQUIDIO is not set
 # CONFIG_LIRC_STAGING is not set
 # CONFIG_LIS3L02DQ is not set
 # CONFIG_LKDTM is not set
@@ -3208,6 +3210,8 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCI_HOST_THUNDER_ECAM is not set
+# CONFIG_PCI_HOST_THUNDER_PEM is not set
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_LAYERSCAPE is not set
 # CONFIG_PCI_MSI is not set
@@ -3931,6 +3935,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_AMBA_PL010 is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
@@ -4540,6 +4545,10 @@ CONFIG_TEXTSEARCH=y
 # CONFIG_THERMAL_WRITABLE_TRIPS is not set
 # CONFIG_THINKPAD_ACPI is not set
 # CONFIG_THRUSTMASTER_FF is not set
+# CONFIG_THUNDER_NIC_BGX is not set
+# CONFIG_THUNDER_NIC_PF is not set
+# CONFIG_THUNDER_NIC_RGX is not set
+# CONFIG_THUNDER_NIC_VF is not set
 # CONFIG_THUNDERBOLT is not set
 # CONFIG_TICK_CPU_ACCOUNTING is not set
 CONFIG_TICK_ONESHOT=y
diff --git a/target/linux/layerscape/armv8_32b/config-4.9 b/target/linux/layerscape/armv8_32b/config-4.9
index c3ee531a9c..f0687f3804 100644
--- a/target/linux/layerscape/armv8_32b/config-4.9
+++ b/target/linux/layerscape/armv8_32b/config-4.9
@@ -1199,7 +1199,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
 # CONFIG_SERIAL_8250_OMAP is not set
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_BCM63XX=y
diff --git a/target/linux/layerscape/armv8_64b/config-4.9 b/target/linux/layerscape/armv8_64b/config-4.9
index 22c4913014..91a89a25b9 100644
--- a/target/linux/layerscape/armv8_64b/config-4.9
+++ b/target/linux/layerscape/armv8_64b/config-4.9
@@ -101,7 +101,6 @@ CONFIG_ARM_GIC_V3_ITS=y
 # CONFIG_ARM_PL172_MPMC is not set
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_SBSA_WATCHDOG is not set
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_ARM_SP805_WATCHDOG=y
@@ -740,7 +739,6 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=16
 CONFIG_LIBCRC32C=y
 CONFIG_LIBFDT=y
-# CONFIG_LIQUIDIO is not set
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
@@ -974,8 +972,6 @@ CONFIG_PCI_ECAM=y
 CONFIG_PCI_HISI=y
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
-# CONFIG_PCI_HOST_THUNDER_ECAM is not set
-# CONFIG_PCI_HOST_THUNDER_PEM is not set
 CONFIG_PCI_IOV=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_LAYERSCAPE=y
@@ -1123,7 +1119,6 @@ CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_FSL_LPUART=y
@@ -1209,10 +1204,6 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-# CONFIG_THUNDER_NIC_VF is not set
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TRANSPARENT_HUGEPAGE=y