ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x
BCM2835 (used on Raspberry Pi) and BCM2836 (used on Raspberry Pi 2) are similar enough. One of the biggest differences is the ARM processor. It is reasonable to collect the source files into a single place, arch/arm/mach-bcm283x/. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
This commit is contained in:
Masahiro Yamada
Tom Rini
parent
326a682358
commit
ddf6bd4876
|
|
@ -286,13 +286,8 @@ config TARGET_MX35PDK
|
|||
bool "Support mx35pdk"
|
||||
select CPU_ARM1136
|
||||
|
||||
config TARGET_RPI
|
||||
bool "Support rpi"
|
||||
select CPU_ARM1176
|
||||
|
||||
config TARGET_RPI_2
|
||||
bool "Support rpi_2"
|
||||
select CPU_V7
|
||||
config ARCH_BCM283X
|
||||
bool "Broadcom BCM283X family"
|
||||
|
||||
config TARGET_INTEGRATORAP_CM946ES
|
||||
bool "Support integratorap_cm946es"
|
||||
|
|
@ -723,9 +718,9 @@ endchoice
|
|||
|
||||
source "arch/arm/mach-at91/Kconfig"
|
||||
|
||||
source "arch/arm/mach-davinci/Kconfig"
|
||||
source "arch/arm/mach-bcm283x/Kconfig"
|
||||
|
||||
source "arch/arm/cpu/arm1176/bcm2835/Kconfig"
|
||||
source "arch/arm/mach-davinci/Kconfig"
|
||||
|
||||
source "arch/arm/cpu/armv7/exynos/Kconfig"
|
||||
|
||||
|
|
@ -834,8 +829,6 @@ source "board/palmtreo680/Kconfig"
|
|||
source "board/phytec/pcm051/Kconfig"
|
||||
source "board/ppcag/bg0900/Kconfig"
|
||||
source "board/pxa255_idp/Kconfig"
|
||||
source "board/raspberrypi/rpi/Kconfig"
|
||||
source "board/raspberrypi/rpi_2/Kconfig"
|
||||
source "board/samsung/smdk2410/Kconfig"
|
||||
source "board/sandisk/sansa_fuze_plus/Kconfig"
|
||||
source "board/scb9328/Kconfig"
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
# Machine directory name. This list is sorted alphanumerically
|
||||
# by CONFIG_* macro name.
|
||||
machine-$(CONFIG_ARCH_AT91) += at91
|
||||
machine-$(CONFIG_ARCH_BCM283X) += bcm283x
|
||||
machine-$(CONFIG_ARCH_DAVINCI) += davinci
|
||||
machine-$(CONFIG_ARCH_HIGHBANK) += highbank
|
||||
machine-$(CONFIG_ARCH_KEYSTONE) += keystone
|
||||
|
|
|
|||
|
|
@ -10,5 +10,3 @@
|
|||
|
||||
extra-y = start.o
|
||||
obj-y = cpu.o
|
||||
|
||||
obj-$(CONFIG_BCM2835) += bcm2835/
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
if TARGET_RPI || TARGET_RPI_2
|
||||
|
||||
config DM
|
||||
default y
|
||||
|
||||
config DM_SERIAL
|
||||
default y
|
||||
|
||||
config DM_GPIO
|
||||
default y
|
||||
|
||||
endif
|
||||
|
|
@ -39,7 +39,6 @@ endif
|
|||
|
||||
obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
|
||||
obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/
|
||||
obj-$(CONFIG_BCM2835) += bcm2835/
|
||||
obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
|
||||
obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
|
||||
obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
#
|
||||
# (C) Copyright 2012 Stephen Warren
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
src_dir := ../../arm1176/bcm2835/
|
||||
|
||||
obj-y :=
|
||||
obj-y += $(src_dir)/init.o
|
||||
obj-y += $(src_dir)/reset.o
|
||||
obj-y += $(src_dir)/timer.o
|
||||
obj-y += $(src_dir)/mbox.o
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
menu "Broadcom BCM283X family"
|
||||
depends on ARCH_BCM283X
|
||||
|
||||
choice
|
||||
prompt "Broadcom BCM283X board select"
|
||||
|
||||
config TARGET_RPI
|
||||
bool "Raspberry Pi"
|
||||
select CPU_ARM1176
|
||||
|
||||
config TARGET_RPI_2
|
||||
bool "Raspberry Pi 2"
|
||||
select CPU_V7
|
||||
|
||||
endchoice
|
||||
|
||||
config DM
|
||||
default y
|
||||
|
||||
config DM_SERIAL
|
||||
default y
|
||||
|
||||
config DM_GPIO
|
||||
default y
|
||||
|
||||
config SYS_BOARD
|
||||
default "rpi" if TARGET_RPI
|
||||
default "rpi_2" if TARGET_RPI_2
|
||||
|
||||
config SYS_VENDOR
|
||||
default "raspberrypi"
|
||||
|
||||
config SYS_SOC
|
||||
default "bcm2835"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
default "rpi" if TARGET_RPI
|
||||
default "rpi_2" if TARGET_RPI_2
|
||||
|
||||
endmenu
|
||||
|
|
@ -4,5 +4,5 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
|
||||
obj-y := lowlevel_init.o
|
||||
obj-$(CONFIG_TARGET_RPI) += lowlevel_init.o
|
||||
obj-y += init.o reset.o timer.o mbox.o
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
if TARGET_RPI
|
||||
|
||||
config SYS_BOARD
|
||||
default "rpi"
|
||||
|
||||
config SYS_VENDOR
|
||||
default "raspberrypi"
|
||||
|
||||
config SYS_SOC
|
||||
default "bcm2835"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
default "rpi"
|
||||
|
||||
endif
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
if TARGET_RPI_2
|
||||
|
||||
config SYS_BOARD
|
||||
default "rpi_2"
|
||||
|
||||
config SYS_VENDOR
|
||||
default "raspberrypi"
|
||||
|
||||
config SYS_SOC
|
||||
default "bcm2835"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
default "rpi_2"
|
||||
|
||||
endif
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
CONFIG_ARM=y
|
||||
CONFIG_ARCH_BCM283X=y
|
||||
CONFIG_TARGET_RPI_2=y
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
CONFIG_ARM=y
|
||||
CONFIG_ARCH_BCM283X=y
|
||||
CONFIG_TARGET_RPI=y
|
||||
|
|
|
|||
Loading…
Reference in New Issue