Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ced015aa authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents d0f2a5ba 047ef2fa

arch/arm/configs/bcm_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/clocksource/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o 
obj-$(CONFIG_ARCH_TEGRA)	+= tegra20_timer.o

obj-$(CONFIG_VT8500_TIMER)	+= vt8500_timer.o

obj-$(CONFIG_ARCH_NSPIRE)	+= zevio-timer.o

obj-$(CONFIG_ARCH_BCM)		+= bcm_kona_timer.o

obj-$(CONFIG_ARCH_BCM_MOBILE)	+= bcm_kona_timer.o

obj-$(CONFIG_CADENCE_TTC_TIMER)	+= cadence_ttc_timer.o

obj-$(CONFIG_CLKSRC_EFM32)	+= time-efm32.o

obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o