kernel: bump 3.18 to 3.18.123

[openwrt/openwrt.git] / target / Config.in

diff --git a/target/Config.in b/target/Config.in
index e0320fac4904e22d83c97d260d46faf6c141d7e0..3cf4231f2aad3e9bdcee9d715e5366d697b3b490 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -34,7 +34,8 @@ config USB_GADGET_SUPPORT
        bool
 
 config RTC_SUPPORT
-       bool
+       tristate
+       depends on m
 
 config BIG_ENDIAN
        bool
@@ -63,15 +64,19 @@ config USES_TARGZ
 config USES_CPIOGZ
        bool
 
-config USES_UBIFS
+config USES_MINOR
        bool
 
-config PROFILE_KCONFIG
+config USES_UBIFS
        bool
+       select NAND_SUPPORT
 
 config LOW_MEMORY_FOOTPRINT
        bool
 
+config SMALL_FLASH
+       bool
+
 config NOMMU
        bool
 
@@ -82,35 +87,50 @@ config HAS_MIPS16
 config RFKILL_SUPPORT
        bool
 
+config NAND_SUPPORT
+       bool
+
 config ARCH_64BIT
        bool
 
+config VIRTIO_SUPPORT
+       bool
+
+config USES_ROOTFS_PART
+       bool
+
+config USES_BOOT_PART
+       bool
+
 # Architecture selection
 
-config arm
+config aarch64
+       select ARCH_64BIT
        bool
 
-config armeb
+config aarch64_be
+       select ARCH_64BIT
        select BIG_ENDIAN
        bool
 
-config arm_v4
+config arc
        bool
 
-config arm_v5
+config arceb
+       select BIG_ENDIAN
        bool
 
-config arm_v6
+config arm
        bool
 
-config arm_v7
+config armeb
+       select BIG_ENDIAN
        bool
 
-config avr32
-       select BIG_ENDIAN
+config arm_v6
        bool
 
-config cris
+config arm_v7
        bool
 
 config i386
@@ -171,10 +191,12 @@ config x86_64
 
 config ARCH
        string
+       default "aarch64"   if aarch64
+       default "aarch64_be" if aarch64_be
+       default "arc"       if arc
+       default "arceb"     if arceb
        default "arm"       if arm
        default "armeb"     if armeb
-       default "avr32"     if avr32
-       default "cris"      if cris
        default "i386"      if i386
        default "i686"      if i686
        default "m68k"      if m68k
@@ -183,6 +205,7 @@ config ARCH
        default "mips64"    if mips64
        default "mips64el"  if mips64el
        default "powerpc"   if powerpc
+       default "powerpc64" if powerpc64
        default "sh3"       if sh3
        default "sh3eb"     if sh3eb
        default "sh4"       if sh4