Commit 889390f8 authored by William Zhang's avatar William Zhang Committed by Florian Fainelli
Browse files

arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA 



Remove ARCH_BCM_63XX Kconfig for BCM63138 and merge its selections to
ARCH_BCMBCA. Delete bcm63xx.c as it is no longer needed.

Signed-off-by: default avatarWilliam Zhang <william.zhang@broadcom.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent cb23389a

arch/arm/mach-bcm/Makefile

+5 −6
Original line number Original line Diff line number Diff line
@@ -57,14 +57,13 @@ ifeq ($(CONFIG_ARCH_BCM_5301X),y) 
obj-$(CONFIG_SMP)		+= platsmp.o

obj-$(CONFIG_SMP)		+= platsmp.o

endif

endif





# BCM63XXx

ifeq ($(CONFIG_ARCH_BCM_63XX),y)

obj-y				+= bcm63xx.o

obj-$(CONFIG_SMP)		+= bcm63xx_smp.o bcm63xx_pmb.o

endif



ifeq ($(CONFIG_ARCH_BRCMSTB),y)

ifeq ($(CONFIG_ARCH_BRCMSTB),y)

CFLAGS_platsmp-brcmstb.o	+= -march=armv7-a

CFLAGS_platsmp-brcmstb.o	+= -march=armv7-a

obj-y				+= brcmstb.o

obj-y				+= brcmstb.o

obj-$(CONFIG_SMP)		+= platsmp-brcmstb.o

obj-$(CONFIG_SMP)		+= platsmp-brcmstb.o

endif

endif



# BCMBCA

ifeq ($(CONFIG_ARCH_BCMBCA),y)

obj-$(CONFIG_SMP)		+= bcm63xx_smp.o bcm63xx_pmb.o

endif

arch/arm/mach-bcm/bcm63xx.c

deleted100644 → 0
+0 −27
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2014 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/of_platform.h>



#include <asm/mach/arch.h>



static const char * const bcm63xx_dt_compat[] = {

	"brcm,bcm63138",

	NULL

};



DT_MACHINE_START(BCM63XXX_DT, "BCM63xx DSL SoC")

	.dt_compat	= bcm63xx_dt_compat,

	.l2c_aux_val	= 0,

	.l2c_aux_mask	= ~0,

MACHINE_END