summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-01-08 22:05:42 -0800
committerOlof Johansson <olof@lixom.net>2014-01-08 23:02:25 -0800
commitced015aaa430e559ab2a44e858d25d6fdcca0a79 (patch)
tree6fb4f0b32b946648d65097fe28fc7e741ae2be07 /arch/arm/configs
parentd0f2a5ba07ac8dc671c0acb89d0114352b41e936 (diff)
parent047ef2fa4e687b6c0d4e7d47b8a184147151482c (diff)
downloadlinux-ced015aaa430e559ab2a44e858d25d6fdcca0a79.tar.bz2
Merge tag 'bcm-for-3.14-soc' of git://github.com/broadcom/bcm11351 into next/soc
From Christian Daudt, various defconfig udpates to bcm mobile. * tag 'bcm-for-3.14-soc' of git://github.com/broadcom/bcm11351: rename ARCH_BCM to ARCH_BCM_MOBILE (clocksource) ARM: bcm_defconfig: Unset CONFIG_CRYPTO_ANSI_CPRNG ARM: bcm_defconfig: Do not expect appended DTB ARM: bcm_defconfig: CONFIG_OABI_COMPAT default off Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/bcm_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 287ac1d7aac7..7a8564e0303f 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -29,11 +29,9 @@ CONFIG_ARCH_BCM_MOBILE=y
CONFIG_ARM_THUMBEE=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
# CONFIG_COMPACTION is not set
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ARM_APPENDED_DTB=y
CONFIG_CMDLINE="console=ttyS0,115200n8 mem=128M"
CONFIG_CPU_IDLE=y
CONFIG_VFP=y
@@ -120,6 +118,7 @@ CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
# CONFIG_FTRACE is not set
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRC_CCITT=y
CONFIG_CRC_T10DIF=y
CONFIG_CRC_ITU_T=y