[generic] partly revert r30708, it breaks various arches

[openwrt.git] / target / linux / cns3xxx / config-default

diff --git a/target/linux/cns3xxx/config-default b/target/linux/cns3xxx/config-default
index 02a88ce..36667be 100644 (file)
--- a/target/linux/cns3xxx/config-default
+++ b/target/linux/cns3xxx/config-default
@@ -40,6 +40,7 @@ CONFIG_CPU_V6=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_GZIP=y

+CONFIG_DMA_CACHE_RWFO=y

 # CONFIG_DWC_DEBUG is not set
 # CONFIG_DWC_DEVICE_ONLY is not set
 # CONFIG_DWC_HOST_ONLY is not set
 # CONFIG_DWC_DEBUG is not set
 # CONFIG_DWC_DEVICE_ONLY is not set
 # CONFIG_DWC_HOST_ONLY is not set


@@ -73,9 +74,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IRQ_WORK=y

-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y

 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_OPROFILE=y


@@ -90,13 +88,11 @@ CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_CNS3XXX=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_CNS3XXX=y

-# CONFIG_I2C_PXA_PCI is not set

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INITRAMFS_SOURCE=""

-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_LZMA is not set

 CONFIG_KTIME_SCALAR=y
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_KTIME_SCALAR=y
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set

+CONFIG_LOCAL_TIMERS=y

 CONFIG_M25PXX_USE_FAST_READ=y
 CONFIG_MACH_CNS3420VB=y
 CONFIG_MACH_GW2388=y
 CONFIG_M25PXX_USE_FAST_READ=y
 CONFIG_MACH_CNS3420VB=y
 CONFIG_MACH_GW2388=y


@@ -114,6 +110,7 @@ CONFIG_MTD_PHYSMAP=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NLS=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NLS=y

+CONFIG_NR_CPUS=2

 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_PAGEFLAGS_EXTENDED=y


@@ -124,11 +121,10 @@ CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHYLIB=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_PL310_ERRATA_727915=y
 CONFIG_PHYLIB=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_PL310_ERRATA_727915=y

+CONFIG_PL310_ERRATA_769419=y

 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_RAID_ATTRS=y
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_QUOTACTL is not set
 CONFIG_RAID_ATTRS=y

-CONFIG_RD_GZIP=y
-# CONFIG_RD_LZMA is not set

 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_SATA_AHCI=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_SATA_AHCI=y


@@ -141,6 +137,8 @@ CONFIG_SENSORS_AD7418=y
 CONFIG_SENSORS_GSP=y
 CONFIG_SERIAL_8250_NR_UARTS=3
 CONFIG_SERIAL_8250_RUNTIME_UARTS=3
 CONFIG_SENSORS_GSP=y
 CONFIG_SERIAL_8250_NR_UARTS=3
 CONFIG_SERIAL_8250_RUNTIME_UARTS=3

+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y

 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
 CONFIG_SPI_CNS3XXX=y
 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
 CONFIG_SPI_CNS3XXX=y


@@ -154,7 +152,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 # CONFIG_USB_CDC_COMPOSITE is not set
 CONFIG_USB_CNS3XXX_EHCI=y
 CONFIG_USB_CNS3XXX_OHCI=y
 # CONFIG_USB_CDC_COMPOSITE is not set
 CONFIG_USB_CNS3XXX_EHCI=y
 CONFIG_USB_CNS3XXX_OHCI=y

-CONFIG_USB_DEBUG=y

 CONFIG_USB_DWC_OTG=y
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_ETH is not set
 CONFIG_USB_DWC_OTG=y
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_ETH is not set


@@ -181,7 +178,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VFP=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VFP=y
 CONFIG_WATCHDOG_NOWAYOUT=y

-CONFIG_XZ_DEC=y

 CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZONE_DMA_FLAG=0