From: Rosen Penev Date: Wed, 2 Oct 2024 21:39:56 +0000 (-0700) Subject: apm821xx: nand: sort config-default X-Git-Tag: v24.10.0-rc1~298 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=684a4f7e94d82e2c37fcb6a1ab394584784b7060;p=openwrt%2Fopenwrt.git apm821xx: nand: sort config-default make kernel_oldconfig doesn't seem to work with this. Handle manually. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16580 Signed-off-by: Robert Marko --- diff --git a/target/linux/apm821xx/nand/config-default b/target/linux/apm821xx/nand/config-default index 485fface3a..b8cbe650b8 100644 --- a/target/linux/apm821xx/nand/config-default +++ b/target/linux/apm821xx/nand/config-default @@ -1,23 +1,12 @@ CONFIG_AT803X_PHY=y -# CONFIG_SATA_DWC_OLD_DMA is not set -CONFIG_IKAREM=y -# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set -CONFIG_GENERIC_PHY=y -CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y +CONFIG_CMDLINE="rootfstype=squashfs noinitrd" +CONFIG_GENERIC_PHY=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_LEDS_TRIGGER_DISK=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_M48T86=y -CONFIG_THERMAL=y -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_OF=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -CONFIG_THERMAL_HWMON=y CONFIG_HWMON=y -CONFIG_SENSORS_GPIO_FAN=y -CONFIG_CMDLINE="rootfstype=squashfs noinitrd" +CONFIG_IKAREM=y +CONFIG_LEDS_TRIGGER_DISK=y CONFIG_MTD_NAND_ECC_SW_BCH=y CONFIG_MTD_NAND_NDFC=y CONFIG_MTD_RAW_NAND=y @@ -31,13 +20,24 @@ CONFIG_NET_DSA_QCA8K=y CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_SWITCHDEV=y +# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set CONFIG_PHYLINK=y CONFIG_QCA83XX_PHY=y CONFIG_QCOM_NET_PHYLIB=y -CONFIG_UBIFS_FS=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_M48T86=y CONFIG_RTL8366_SMI=y CONFIG_RTL8367B_PHY=y +# CONFIG_SATA_DWC_OLD_DMA is not set +CONFIG_SCSI=y +CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_LM90=y CONFIG_SENSORS_TC654=y CONFIG_SWCONFIG=y CONFIG_SWCONFIG_LEDS=y +CONFIG_THERMAL=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_OF=y +CONFIG_UBIFS_FS=y