[armel] Fold config-reduced into config.marvell

This commit is contained in:
Ben Hutchings 2016-01-27 17:00:41 +00:00
parent 8ff6a7a38a
commit fac721e301
3 changed files with 71 additions and 78 deletions

View File

@ -1,75 +0,0 @@
##
## file: arch/Kconfig
##
# CONFIG_KPROBES is not set
## choice: Stack Protector buffer overflow detection
CONFIG_CC_STACKPROTECTOR_REGULAR=y
# CONFIG_CC_STACKPROTECTOR_STRONG is not set
## end choice
##
## file: block/Kconfig.iosched
##
CONFIG_IOSCHED_DEADLINE=m
##
## file: crypto/Kconfig
##
# CONFIG_CRYPTO_FIPS is not set
##
## file: drivers/gpu/vga/Kconfig
##
# CONFIG_VGA_ARB is not set
##
## file: init/Kconfig
##
#. Saves about 7K
# CONFIG_MEMCG is not set
# CONFIG_CFS_BANDWIDTH is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_PROFILING is not set
##
## file: kernel/power/Kconfig
##
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM is not set
##
## file: mm/Kconfig
##
#. Saves about 7K
# CONFIG_COMPACTION is not set
# CONFIG_KSM is not set
##
## file: net/Kconfig
##
#. Saves about 3K
# CONFIG_BPF_JIT is not set
##
## file: net/ipv6/Kconfig
##
CONFIG_IPV6=m
##
## file: net/mpls/Kconfig
##
# CONFIG_NET_MPLS_GSO is not set
##
## file: net/netlink/Kconfig
##
# CONFIG_NETLINK_MMAP is not set
##
## file: usr/Kconfig
##
# CONFIG_RD_LZO is not set
# CONFIG_RD_LZ4 is not set

View File

@ -1,3 +1,12 @@
##
## file: arch/Kconfig
##
# CONFIG_KPROBES is not set
## choice: Stack Protector buffer overflow detection
CONFIG_CC_STACKPROTECTOR_REGULAR=y
# CONFIG_CC_STACKPROTECTOR_STRONG is not set
## end choice
##
## file: arch/arm/Kconfig
##
@ -77,6 +86,11 @@ CONFIG_ARM_THUMB=y
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
##
## file: block/Kconfig.iosched
##
CONFIG_IOSCHED_DEADLINE=m
##
## file: block/partitions/Kconfig
##
@ -101,6 +115,11 @@ CONFIG_SGI_PARTITION=y
CONFIG_ULTRIX_PARTITION=y
CONFIG_SUN_PARTITION=y
##
## file: crypto/Kconfig
##
# CONFIG_CRYPTO_FIPS is not set
##
## file: drivers/ata/Kconfig
##
@ -196,6 +215,11 @@ CONFIG_MV_XOR=y
##
# CONFIG_DRM is not set
##
## file: drivers/gpu/vga/Kconfig
##
# CONFIG_VGA_ARB is not set
##
## file: drivers/hwmon/Kconfig
##
@ -638,6 +662,23 @@ CONFIG_FB=m
##
CONFIG_ORION_WATCHDOG=m
##
## file: init/Kconfig
##
#. Saves about 7K
# CONFIG_MEMCG is not set
# CONFIG_CFS_BANDWIDTH is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_PROFILING is not set
##
## file: kernel/power/Kconfig
##
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM is not set
##
## file: kernel/trace/Kconfig
##
@ -653,6 +694,15 @@ CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_SPARSEMEM_MANUAL is not set
## end choice
#. Saves about 7K
# CONFIG_COMPACTION is not set
# CONFIG_KSM is not set
##
## file: net/Kconfig
##
#. Saves about 3K
# CONFIG_BPF_JIT is not set
##
## file: net/atm/Kconfig
@ -668,6 +718,21 @@ CONFIG_AX25=m
CONFIG_NETROM=m
CONFIG_ROSE=m
##
## file: net/ipv6/Kconfig
##
CONFIG_IPV6=m
##
## file: net/mpls/Kconfig
##
# CONFIG_NET_MPLS_GSO is not set
##
## file: net/netlink/Kconfig
##
# CONFIG_NETLINK_MMAP is not set
##
## file: sound/soc/Kconfig
##
@ -690,3 +755,9 @@ CONFIG_SND_SIMPLE_CARD=m
##
CONFIG_SND_KIRKWOOD_SOC=m
##
## file: usr/Kconfig
##
# CONFIG_RD_LZO is not set
# CONFIG_RD_LZ4 is not set

View File

@ -33,9 +33,6 @@ recommends: u-boot-tools
check-size: 2097080
check-size-with-dtb: true
breaks: flash-kernel (<< 3.37~)
configs:
armel/config-reduced
armel/config.marvell
[versatile_description]
hardware: Versatile