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

Commit badb9238 authored by Christian Daudt's avatar Christian Daudt
Browse files

rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm) 



Currently ARCH_BCM has been used for Broadcom
Mobile V7 based SoCs. In order to allow other Broadcom
SoCs to also use mach-bcm directory and files, this patch
renames the original ARCH_BCM to ARCH_BCM_MOBILE, and
uses ARCH_BCM to define any Broadcom chip residing
in mach-bcm directory.

Signed-off-by: default avatarChristian Daudt <bcm@fixthebug.org>
Acked-by: default avatarOlof Johansson <olof@lixom.net>

Changes from v2:
 - switch ARCH_MULTIPLATFORM from select to depends
 - remove 'default y' from BCM_MOBILE

Changes from v1:
 - fix alpha ordering in dts/Makefile
 - break into 4 patches for separate subsys
parent 616b931e

arch/arm/configs/bcm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_EFI_PARTITION=y

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM_MOBILE=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_ERRATA_743622=y

CONFIG_PREEMPT=y

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ CONFIG_ARCH_MVEBU=y 
CONFIG_MACH_ARMADA_370=y

CONFIG_MACH_ARMADA_XP=y

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM_MOBILE=y

CONFIG_GPIO_PCA953X=y

CONFIG_ARCH_HIGHBANK=y

CONFIG_ARCH_KEYSTONE=y

arch/arm/mach-bcm/Kconfig

+17 −2
Original line number Diff line number Diff line 
config ARCH_BCM

	bool "Broadcom SoC" if ARCH_MULTI_V7

	bool "Broadcom SoC Support"

	depends on ARCH_MULTIPLATFORM

	help

	  This enables support for Broadcom ARM based SoC

          chips



if ARCH_BCM



menu "Broadcom SoC Selection"



config ARCH_BCM_MOBILE

	bool "Broadcom Mobile SoC" if ARCH_MULTI_V7

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select ARM_ERRATA_754322
@@ -14,7 +25,11 @@ config ARCH_BCM 
	select TICK_ONESHOT

	select CACHE_L2X0

	help

	  This enables support for system based on Broadcom SoCs.

	  This enables support for systems based on Broadcom mobile SoCs.

	  It currently supports the 'BCM281XX' family, which includes

	  BCM11130, BCM11140, BCM11351, BCM28145 and

	  BCM28155 variants.



endmenu



endif

arch/arm/mach-bcm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,6 @@ 
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.



obj-$(CONFIG_ARCH_BCM)		:= board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o

obj-$(CONFIG_ARCH_BCM_MOBILE)	:= board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o

plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_bcm_kona_smc_asm.o	:=-Wa,-march=armv7-a$(plus_sec)