| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Sun, 9 Mar 2014 12:14:39 +0000
From: Mark Brown <broonie@...nel.org>
To: Stephen Warren <swarren@...dotorg.org>,
Rob Herring <robh@...nel.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Hi Stephen/Rob,
Today's linux-next merge of the bcm2835 tree got a conflict in between commit ddb902cc34593ecb ("ARM: centralize common multi-platform kconfig options") from the arm-soc tree and commit d30fe6272183f3cc8b ("ARM: bcm2835: Move to mach-bcm directory") from the bcm2835 tree. Commit 0676b21fffd17baeff589 ("ARM: bcm2835: enable V6K instead of plain V6") also collided.
I've fixed up as below and can carry:
diff --cc arch/arm/mach-bcm/Kconfig
index af4f2dfda40c,4e466e9eef44..7de3282a8613
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@@ -27,6 -32,22 +27,18 @@@ config ARCH_BCM_MOBIL
BCM11130, BCM11140, BCM11351, BCM28145 and
BCM28155 variants.
+ config ARCH_BCM2835
+ bool "Broadcom BCM2835 family" if ARCH_MULTI_V6
+ select ARCH_REQUIRE_GPIOLIB
+ select ARM_AMBA
+ select ARM_ERRATA_411920
+ select ARM_TIMER_SP804
- select CLKDEV_LOOKUP
- select CLKSRC_OF
- select CPU_V6
- select GENERIC_CLOCKEVENTS
+ select PINCTRL
+ select PINCTRL_BCM2835
+ help
+ This enables support for the Broadcom BCM2835 SoC. This SoC is
+ used in the Raspberry Pi and Roku 2 devices.
+
endmenu
endif
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists