mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-19 18:53:52 +08:00
ARM: versatile: move integrator/realview/vexpress to versatile
These are all fairly small platforms by now, and they are closely related. Just move them all into a single directory. Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Liviu Dudau <liviu.dudau@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Tested-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
parent
3123109284
commit
d7445676e8
@ -1525,10 +1525,7 @@ F: Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
|
||||
F: arch/arm/boot/dts/arm-realview-*
|
||||
F: arch/arm/boot/dts/integrator*
|
||||
F: arch/arm/boot/dts/versatile*
|
||||
F: arch/arm/mach-integrator/
|
||||
F: arch/arm/mach-realview/
|
||||
F: arch/arm/mach-versatile/
|
||||
F: arch/arm/plat-versatile/
|
||||
F: drivers/bus/arm-integrator-lm.c
|
||||
F: drivers/clk/versatile/
|
||||
F: drivers/i2c/busses/i2c-versatile.c
|
||||
|
||||
@ -622,8 +622,6 @@ source "arch/arm/mach-hisi/Kconfig"
|
||||
|
||||
source "arch/arm/mach-imx/Kconfig"
|
||||
|
||||
source "arch/arm/mach-integrator/Kconfig"
|
||||
|
||||
source "arch/arm/mach-iop32x/Kconfig"
|
||||
|
||||
source "arch/arm/mach-ixp4xx/Kconfig"
|
||||
@ -675,8 +673,6 @@ source "arch/arm/mach-rda/Kconfig"
|
||||
|
||||
source "arch/arm/mach-realtek/Kconfig"
|
||||
|
||||
source "arch/arm/mach-realview/Kconfig"
|
||||
|
||||
source "arch/arm/mach-rockchip/Kconfig"
|
||||
|
||||
source "arch/arm/mach-s3c/Kconfig"
|
||||
@ -705,8 +701,6 @@ source "arch/arm/mach-ux500/Kconfig"
|
||||
|
||||
source "arch/arm/mach-versatile/Kconfig"
|
||||
|
||||
source "arch/arm/mach-vexpress/Kconfig"
|
||||
|
||||
source "arch/arm/mach-vt8500/Kconfig"
|
||||
|
||||
source "arch/arm/mach-zynq/Kconfig"
|
||||
|
||||
@ -179,7 +179,6 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge
|
||||
machine-$(CONFIG_ARCH_GEMINI) += gemini
|
||||
machine-$(CONFIG_ARCH_HIGHBANK) += highbank
|
||||
machine-$(CONFIG_ARCH_HISI) += hisi
|
||||
machine-$(CONFIG_ARCH_INTEGRATOR) += integrator
|
||||
machine-$(CONFIG_ARCH_IOP32X) += iop32x
|
||||
machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx
|
||||
machine-$(CONFIG_ARCH_KEYSTONE) += keystone
|
||||
@ -187,7 +186,6 @@ machine-$(CONFIG_ARCH_LPC18XX) += lpc18xx
|
||||
machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx
|
||||
machine-$(CONFIG_ARCH_MESON) += meson
|
||||
machine-$(CONFIG_ARCH_MMP) += mmp
|
||||
machine-$(CONFIG_ARCH_MPS2) += vexpress
|
||||
machine-$(CONFIG_ARCH_MOXART) += moxart
|
||||
machine-$(CONFIG_ARCH_MV78XX0) += mv78xx0
|
||||
machine-$(CONFIG_ARCH_MVEBU) += mvebu
|
||||
@ -207,7 +205,6 @@ machine-$(CONFIG_ARCH_PXA) += pxa
|
||||
machine-$(CONFIG_ARCH_QCOM) += qcom
|
||||
machine-$(CONFIG_ARCH_RDA) += rda
|
||||
machine-$(CONFIG_ARCH_REALTEK) += realtek
|
||||
machine-$(CONFIG_ARCH_REALVIEW) += realview
|
||||
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
|
||||
machine-$(CONFIG_ARCH_RPC) += rpc
|
||||
machine-$(CONFIG_PLAT_SAMSUNG) += s3c
|
||||
@ -220,10 +217,9 @@ machine-$(CONFIG_ARCH_STM32) += stm32
|
||||
machine-$(CONFIG_ARCH_SUNXI) += sunxi
|
||||
machine-$(CONFIG_ARCH_TEGRA) += tegra
|
||||
machine-$(CONFIG_ARCH_U8500) += ux500
|
||||
machine-$(CONFIG_ARCH_VERSATILE) += versatile
|
||||
machine-$(CONFIG_ARCH_VEXPRESS) += vexpress
|
||||
machine-$(CONFIG_ARCH_VT8500) += vt8500
|
||||
machine-$(CONFIG_ARCH_ZYNQ) += zynq
|
||||
machine-$(CONFIG_PLAT_VERSATILE) += versatile
|
||||
machine-$(CONFIG_PLAT_SPEAR) += spear
|
||||
|
||||
# Platform directory name. This list is sorted alphanumerically
|
||||
@ -231,7 +227,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear
|
||||
plat-$(CONFIG_ARCH_OMAP) += omap
|
||||
plat-$(CONFIG_PLAT_ORION) += orion
|
||||
plat-$(CONFIG_PLAT_PXA) += pxa
|
||||
plat-$(CONFIG_PLAT_VERSATILE) += versatile
|
||||
|
||||
# The byte offset of the kernel image in RAM from the start of RAM.
|
||||
TEXT_OFFSET := $(textofs-y)
|
||||
|
||||
@ -1,125 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
menuconfig ARCH_INTEGRATOR
|
||||
bool "ARM Ltd. Integrator family"
|
||||
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6
|
||||
select ARM_AMBA
|
||||
select CMA
|
||||
select DMA_CMA
|
||||
select HAVE_TCM
|
||||
select CLK_ICST
|
||||
select MFD_SYSCON
|
||||
select PLAT_VERSATILE
|
||||
select POWER_RESET
|
||||
select POWER_RESET_VERSATILE
|
||||
select POWER_SUPPLY
|
||||
select SOC_INTEGRATOR_CM
|
||||
select VERSATILE_FPGA_IRQ
|
||||
help
|
||||
Support for ARM's Integrator platform.
|
||||
|
||||
if ARCH_INTEGRATOR
|
||||
|
||||
config ARCH_INTEGRATOR_AP
|
||||
bool "Support Integrator/AP and Integrator/PP2 platforms"
|
||||
select INTEGRATOR_AP_TIMER
|
||||
select SERIAL_AMBA_PL010 if TTY
|
||||
select SERIAL_AMBA_PL010_CONSOLE if TTY
|
||||
select SOC_BUS
|
||||
help
|
||||
Include support for the ARM(R) Integrator/AP and
|
||||
Integrator/PP2 platforms.
|
||||
|
||||
config INTEGRATOR_IMPD1
|
||||
bool "Include support for Integrator/IM-PD1"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
select ARM_VIC
|
||||
select GPIO_PL061
|
||||
select GPIOLIB
|
||||
select REGULATOR
|
||||
select REGULATOR_FIXED_VOLTAGE
|
||||
help
|
||||
The IM-PD1 is an add-on logic module for the Integrator which
|
||||
allows ARM(R) Ltd PrimeCells to be developed and evaluated.
|
||||
The IM-PD1 can be found on the Integrator/PP2 platform.
|
||||
|
||||
config INTEGRATOR_CM720T
|
||||
bool "Integrator/CM720T core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V4T
|
||||
select CPU_ARM720T
|
||||
|
||||
config INTEGRATOR_CM920T
|
||||
bool "Integrator/CM920T core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V4T
|
||||
select CPU_ARM920T
|
||||
|
||||
config INTEGRATOR_CM922T_XA10
|
||||
bool "Integrator/CM922T-XA10 core module"
|
||||
depends on ARCH_MULTI_V4T
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
select CPU_ARM922T
|
||||
|
||||
config INTEGRATOR_CM926EJS
|
||||
bool "Integrator/CM926EJ-S core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM926T
|
||||
|
||||
config INTEGRATOR_CM10200E_REV0
|
||||
bool "Integrator/CM10200E rev.0 core module"
|
||||
depends on ARCH_INTEGRATOR_AP && n
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM1020
|
||||
|
||||
config INTEGRATOR_CM10200E
|
||||
bool "Integrator/CM10200E core module"
|
||||
depends on ARCH_INTEGRATOR_AP && n
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM1020E
|
||||
|
||||
config INTEGRATOR_CM10220E
|
||||
bool "Integrator/CM10220E core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM1022
|
||||
|
||||
config INTEGRATOR_CM1026EJS
|
||||
bool "Integrator/CM1026EJ-S core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM1026
|
||||
|
||||
config INTEGRATOR_CM1136JFS
|
||||
bool "Integrator/CM1136JF-S core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V6
|
||||
select CPU_V6
|
||||
|
||||
config ARCH_INTEGRATOR_CP
|
||||
bool "Support Integrator/CP platform"
|
||||
depends on ARCH_MULTI_V5 || ARCH_MULTI_V6
|
||||
select ARM_TIMER_SP804
|
||||
select SERIAL_AMBA_PL011 if TTY
|
||||
select SERIAL_AMBA_PL011_CONSOLE if TTY
|
||||
select SOC_BUS
|
||||
help
|
||||
Include support for the ARM(R) Integrator CP platform.
|
||||
|
||||
config INTEGRATOR_CT926
|
||||
bool "Integrator/CT926 (ARM926EJ-S) core tile"
|
||||
depends on ARCH_INTEGRATOR_CP
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM926T
|
||||
|
||||
config INTEGRATOR_CTB36
|
||||
bool "Integrator/CTB36 (ARM1136JF-S) core tile"
|
||||
depends on ARCH_INTEGRATOR_CP
|
||||
depends on ARCH_MULTI_V6
|
||||
select CPU_V6
|
||||
|
||||
config ARCH_CINTEGRATOR
|
||||
depends on ARCH_INTEGRATOR_CP
|
||||
def_bool y
|
||||
|
||||
endif
|
||||
@ -1,10 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Makefile for the linux kernel.
|
||||
#
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y := core.o
|
||||
obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o
|
||||
obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o
|
||||
@ -1,103 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
menuconfig ARCH_REALVIEW
|
||||
bool "ARM Ltd. RealView family"
|
||||
depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7
|
||||
select ARM_AMBA
|
||||
select ARM_GIC
|
||||
select ARM_TIMER_SP804
|
||||
select CLK_SP810
|
||||
select GPIO_PL061 if GPIOLIB
|
||||
select HAVE_ARM_SCU if SMP
|
||||
select HAVE_ARM_TWD if SMP
|
||||
select HAVE_PATA_PLATFORM
|
||||
select HAVE_TCM
|
||||
select CLK_ICST
|
||||
select MACH_REALVIEW_EB if ARCH_MULTI_V5
|
||||
select MFD_SYSCON
|
||||
select PLAT_VERSATILE
|
||||
select POWER_RESET
|
||||
select POWER_RESET_VERSATILE
|
||||
select POWER_SUPPLY
|
||||
select SOC_REALVIEW
|
||||
help
|
||||
This enables support for ARM Ltd RealView boards.
|
||||
|
||||
if ARCH_REALVIEW
|
||||
|
||||
config MACH_REALVIEW_EB
|
||||
bool "Support RealView(R) Emulation Baseboard"
|
||||
select ARM_GIC
|
||||
select CPU_ARM926T if ARCH_MULTI_V5
|
||||
help
|
||||
Include support for the ARM(R) RealView(R) Emulation Baseboard
|
||||
platform. On an ARMv5 kernel, this will include support for
|
||||
the ARM926EJ-S core tile, while on an ARMv6/v7 kernel, at least
|
||||
one of the ARM1136, ARM1176, ARM11MPCore or Cortex-A9MPCore
|
||||
core tile options should be enabled.
|
||||
|
||||
config REALVIEW_EB_ARM1136
|
||||
bool "Support ARM1136J(F)-S Tile"
|
||||
depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
|
||||
select CPU_V6
|
||||
help
|
||||
Enable support for the ARM1136 tile fitted to the
|
||||
Realview(R) Emulation Baseboard platform.
|
||||
|
||||
config REALVIEW_EB_ARM1176
|
||||
bool "Support ARM1176JZ(F)-S Tile"
|
||||
depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
|
||||
help
|
||||
Enable support for the ARM1176 tile fitted to the
|
||||
Realview(R) Emulation Baseboard platform.
|
||||
|
||||
config REALVIEW_EB_A9MP
|
||||
bool "Support Multicore Cortex-A9 Tile"
|
||||
depends on MACH_REALVIEW_EB && ARCH_MULTI_V7
|
||||
help
|
||||
Enable support for the Cortex-A9MPCore tile fitted to the
|
||||
Realview(R) Emulation Baseboard platform.
|
||||
|
||||
config REALVIEW_EB_ARM11MP
|
||||
bool "Support ARM11MPCore Tile"
|
||||
depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
|
||||
select HAVE_SMP
|
||||
help
|
||||
Enable support for the ARM11MPCore tile fitted to the Realview(R)
|
||||
Emulation Baseboard platform.
|
||||
|
||||
config MACH_REALVIEW_PB11MP
|
||||
bool "Support RealView(R) Platform Baseboard for ARM11MPCore"
|
||||
depends on ARCH_MULTI_V6
|
||||
select HAVE_SMP
|
||||
help
|
||||
Include support for the ARM(R) RealView(R) Platform Baseboard for
|
||||
the ARM11MPCore. This platform has an on-board ARM11MPCore and has
|
||||
support for PCI-E and Compact Flash.
|
||||
|
||||
# ARMv6 CPU without K extensions, but does have the new exclusive ops
|
||||
config MACH_REALVIEW_PB1176
|
||||
bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S"
|
||||
depends on ARCH_MULTI_V6
|
||||
select CPU_V6
|
||||
select HAVE_TCM
|
||||
help
|
||||
Include support for the ARM(R) RealView(R) Platform Baseboard for
|
||||
ARM1176JZF-S.
|
||||
|
||||
config MACH_REALVIEW_PBA8
|
||||
bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform"
|
||||
depends on ARCH_MULTI_V7
|
||||
help
|
||||
Include support for the ARM(R) RealView Platform Baseboard for
|
||||
Cortex(tm)-A8. This platform has an on-board Cortex-A8 and has
|
||||
support for PCI-E and Compact Flash.
|
||||
|
||||
config MACH_REALVIEW_PBX
|
||||
bool "Support RealView(R) Platform Baseboard Explore for Cortex-A9"
|
||||
depends on ARCH_MULTI_V7
|
||||
select ZONE_DMA
|
||||
help
|
||||
Include support for the ARM(R) RealView(R) Platform Baseboard
|
||||
Explore.
|
||||
|
||||
endif
|
||||
@ -1,8 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
#
|
||||
# Makefile for the linux kernel.
|
||||
#
|
||||
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-versatile/include
|
||||
|
||||
obj-y += realview-dt.o
|
||||
obj-$(CONFIG_SMP) += platsmp-dt.o
|
||||
@ -16,3 +16,311 @@ config ARCH_VERSATILE
|
||||
help
|
||||
This enables support for ARM Ltd Versatile board.
|
||||
|
||||
menuconfig ARCH_INTEGRATOR
|
||||
bool "ARM Ltd. Integrator family"
|
||||
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6
|
||||
select ARM_AMBA
|
||||
select CMA
|
||||
select DMA_CMA
|
||||
select HAVE_TCM
|
||||
select CLK_ICST
|
||||
select MFD_SYSCON
|
||||
select PLAT_VERSATILE
|
||||
select POWER_RESET
|
||||
select POWER_RESET_VERSATILE
|
||||
select POWER_SUPPLY
|
||||
select SOC_INTEGRATOR_CM
|
||||
select VERSATILE_FPGA_IRQ
|
||||
help
|
||||
Support for ARM's Integrator platform.
|
||||
|
||||
if ARCH_INTEGRATOR
|
||||
|
||||
config ARCH_INTEGRATOR_AP
|
||||
bool "Support Integrator/AP and Integrator/PP2 platforms"
|
||||
select INTEGRATOR_AP_TIMER
|
||||
select SERIAL_AMBA_PL010 if TTY
|
||||
select SERIAL_AMBA_PL010_CONSOLE if TTY
|
||||
select SOC_BUS
|
||||
help
|
||||
Include support for the ARM(R) Integrator/AP and
|
||||
Integrator/PP2 platforms.
|
||||
|
||||
config INTEGRATOR_IMPD1
|
||||
bool "Include support for Integrator/IM-PD1"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
select ARM_VIC
|
||||
select GPIO_PL061
|
||||
select GPIOLIB
|
||||
select REGULATOR
|
||||
select REGULATOR_FIXED_VOLTAGE
|
||||
help
|
||||
The IM-PD1 is an add-on logic module for the Integrator which
|
||||
allows ARM(R) Ltd PrimeCells to be developed and evaluated.
|
||||
The IM-PD1 can be found on the Integrator/PP2 platform.
|
||||
|
||||
config INTEGRATOR_CM720T
|
||||
bool "Integrator/CM720T core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V4T
|
||||
select CPU_ARM720T
|
||||
|
||||
config INTEGRATOR_CM920T
|
||||
bool "Integrator/CM920T core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V4T
|
||||
select CPU_ARM920T
|
||||
|
||||
config INTEGRATOR_CM922T_XA10
|
||||
bool "Integrator/CM922T-XA10 core module"
|
||||
depends on ARCH_MULTI_V4T
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
select CPU_ARM922T
|
||||
|
||||
config INTEGRATOR_CM926EJS
|
||||
bool "Integrator/CM926EJ-S core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM926T
|
||||
|
||||
config INTEGRATOR_CM10200E_REV0
|
||||
bool "Integrator/CM10200E rev.0 core module"
|
||||
depends on ARCH_INTEGRATOR_AP && n
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM1020
|
||||
|
||||
config INTEGRATOR_CM10200E
|
||||
bool "Integrator/CM10200E core module"
|
||||
depends on ARCH_INTEGRATOR_AP && n
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM1020E
|
||||
|
||||
config INTEGRATOR_CM10220E
|
||||
bool "Integrator/CM10220E core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM1022
|
||||
|
||||
config INTEGRATOR_CM1026EJS
|
||||
bool "Integrator/CM1026EJ-S core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM1026
|
||||
|
||||
config INTEGRATOR_CM1136JFS
|
||||
bool "Integrator/CM1136JF-S core module"
|
||||
depends on ARCH_INTEGRATOR_AP
|
||||
depends on ARCH_MULTI_V6
|
||||
select CPU_V6
|
||||
|
||||
config ARCH_INTEGRATOR_CP
|
||||
bool "Support Integrator/CP platform"
|
||||
depends on ARCH_MULTI_V5 || ARCH_MULTI_V6
|
||||
select ARM_TIMER_SP804
|
||||
select SERIAL_AMBA_PL011 if TTY
|
||||
select SERIAL_AMBA_PL011_CONSOLE if TTY
|
||||
select SOC_BUS
|
||||
help
|
||||
Include support for the ARM(R) Integrator CP platform.
|
||||
|
||||
config INTEGRATOR_CT926
|
||||
bool "Integrator/CT926 (ARM926EJ-S) core tile"
|
||||
depends on ARCH_INTEGRATOR_CP
|
||||
depends on ARCH_MULTI_V5
|
||||
select CPU_ARM926T
|
||||
|
||||
config INTEGRATOR_CTB36
|
||||
bool "Integrator/CTB36 (ARM1136JF-S) core tile"
|
||||
depends on ARCH_INTEGRATOR_CP
|
||||
depends on ARCH_MULTI_V6
|
||||
select CPU_V6
|
||||
|
||||
config ARCH_CINTEGRATOR
|
||||
depends on ARCH_INTEGRATOR_CP
|
||||
def_bool y
|
||||
|
||||
endif
|
||||
|
||||
menuconfig ARCH_REALVIEW
|
||||
bool "ARM Ltd. RealView family"
|
||||
depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7
|
||||
select ARM_AMBA
|
||||
select ARM_GIC
|
||||
select ARM_TIMER_SP804
|
||||
select CLK_SP810
|
||||
select GPIO_PL061 if GPIOLIB
|
||||
select HAVE_ARM_SCU if SMP
|
||||
select HAVE_ARM_TWD if SMP
|
||||
select HAVE_PATA_PLATFORM
|
||||
select HAVE_TCM
|
||||
select CLK_ICST
|
||||
select MACH_REALVIEW_EB if ARCH_MULTI_V5
|
||||
select MFD_SYSCON
|
||||
select PLAT_VERSATILE
|
||||
select POWER_RESET
|
||||
select POWER_RESET_VERSATILE
|
||||
select POWER_SUPPLY
|
||||
select SOC_REALVIEW
|
||||
help
|
||||
This enables support for ARM Ltd RealView boards.
|
||||
|
||||
if ARCH_REALVIEW
|
||||
|
||||
config MACH_REALVIEW_EB
|
||||
bool "Support RealView(R) Emulation Baseboard"
|
||||
select ARM_GIC
|
||||
select CPU_ARM926T if ARCH_MULTI_V5
|
||||
help
|
||||
Include support for the ARM(R) RealView(R) Emulation Baseboard
|
||||
platform. On an ARMv5 kernel, this will include support for
|
||||
the ARM926EJ-S core tile, while on an ARMv6/v7 kernel, at least
|
||||
one of the ARM1136, ARM1176, ARM11MPCore or Cortex-A9MPCore
|
||||
core tile options should be enabled.
|
||||
|
||||
config REALVIEW_EB_ARM1136
|
||||
bool "Support ARM1136J(F)-S Tile"
|
||||
depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
|
||||
select CPU_V6
|
||||
help
|
||||
Enable support for the ARM1136 tile fitted to the
|
||||
Realview(R) Emulation Baseboard platform.
|
||||
|
||||
config REALVIEW_EB_ARM1176
|
||||
bool "Support ARM1176JZ(F)-S Tile"
|
||||
depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
|
||||
help
|
||||
Enable support for the ARM1176 tile fitted to the
|
||||
Realview(R) Emulation Baseboard platform.
|
||||
|
||||
config REALVIEW_EB_A9MP
|
||||
bool "Support Multicore Cortex-A9 Tile"
|
||||
depends on MACH_REALVIEW_EB && ARCH_MULTI_V7
|
||||
help
|
||||
Enable support for the Cortex-A9MPCore tile fitted to the
|
||||
Realview(R) Emulation Baseboard platform.
|
||||
|
||||
config REALVIEW_EB_ARM11MP
|
||||
bool "Support ARM11MPCore Tile"
|
||||
depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
|
||||
select HAVE_SMP
|
||||
help
|
||||
Enable support for the ARM11MPCore tile fitted to the Realview(R)
|
||||
Emulation Baseboard platform.
|
||||
|
||||
config MACH_REALVIEW_PB11MP
|
||||
bool "Support RealView(R) Platform Baseboard for ARM11MPCore"
|
||||
depends on ARCH_MULTI_V6
|
||||
select HAVE_SMP
|
||||
help
|
||||
Include support for the ARM(R) RealView(R) Platform Baseboard for
|
||||
the ARM11MPCore. This platform has an on-board ARM11MPCore and has
|
||||
support for PCI-E and Compact Flash.
|
||||
|
||||
# ARMv6 CPU without K extensions, but does have the new exclusive ops
|
||||
config MACH_REALVIEW_PB1176
|
||||
bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S"
|
||||
depends on ARCH_MULTI_V6
|
||||
select CPU_V6
|
||||
select HAVE_TCM
|
||||
help
|
||||
Include support for the ARM(R) RealView(R) Platform Baseboard for
|
||||
ARM1176JZF-S.
|
||||
|
||||
config MACH_REALVIEW_PBA8
|
||||
bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform"
|
||||
depends on ARCH_MULTI_V7
|
||||
help
|
||||
Include support for the ARM(R) RealView Platform Baseboard for
|
||||
Cortex(tm)-A8. This platform has an on-board Cortex-A8 and has
|
||||
support for PCI-E and Compact Flash.
|
||||
|
||||
config MACH_REALVIEW_PBX
|
||||
bool "Support RealView(R) Platform Baseboard Explore for Cortex-A9"
|
||||
depends on ARCH_MULTI_V7
|
||||
select ZONE_DMA
|
||||
help
|
||||
Include support for the ARM(R) RealView(R) Platform Baseboard
|
||||
Explore.
|
||||
|
||||
endif
|
||||
|
||||
menuconfig ARCH_VEXPRESS
|
||||
bool "ARM Ltd. Versatile Express family"
|
||||
depends on ARCH_MULTI_V7
|
||||
select ARCH_SUPPORTS_BIG_ENDIAN
|
||||
select ARM_AMBA
|
||||
select ARM_GIC
|
||||
select ARM_GLOBAL_TIMER
|
||||
select ARM_TIMER_SP804
|
||||
select GPIOLIB
|
||||
select HAVE_ARM_SCU if SMP
|
||||
select HAVE_ARM_TWD if SMP
|
||||
select HAVE_PATA_PLATFORM
|
||||
select CLK_ICST
|
||||
select NO_IOPORT_MAP
|
||||
select PLAT_VERSATILE
|
||||
select POWER_RESET
|
||||
select POWER_RESET_VEXPRESS
|
||||
select POWER_SUPPLY
|
||||
select REGULATOR if MMC_ARMMMCI
|
||||
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
||||
select VEXPRESS_CONFIG
|
||||
help
|
||||
This option enables support for systems using Cortex processor based
|
||||
ARM core and logic (FPGA) tiles on the Versatile Express motherboard,
|
||||
for example:
|
||||
|
||||
- CoreTile Express A5x2 (V2P-CA5s)
|
||||
- CoreTile Express A9x4 (V2P-CA9)
|
||||
- CoreTile Express A15x2 (V2P-CA15)
|
||||
- LogicTile Express 13MG (V2F-2XV6) with A5, A7, A9 or A15 SMMs
|
||||
(Soft Macrocell Models)
|
||||
- Versatile Express RTSMs (Models)
|
||||
|
||||
You must boot using a Flattened Device Tree in order to use these
|
||||
platforms. The traditional (ATAGs) boot method is not usable on
|
||||
these boards with this option.
|
||||
|
||||
if ARCH_VEXPRESS
|
||||
|
||||
config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
|
||||
bool "Enable A5 and A9 only errata work-arounds"
|
||||
default y
|
||||
select ARM_ERRATA_643719 if SMP
|
||||
select ARM_ERRATA_720789
|
||||
select PL310_ERRATA_753970 if CACHE_L2X0
|
||||
help
|
||||
Provides common dependencies for Versatile Express platforms
|
||||
based on Cortex-A5 and Cortex-A9 processors. In order to
|
||||
build a working kernel, you must also enable relevant core
|
||||
tile support or Flattened Device Tree based support options.
|
||||
|
||||
config ARCH_VEXPRESS_DCSCB
|
||||
bool "Dual Cluster System Control Block (DCSCB) support"
|
||||
depends on MCPM
|
||||
select ARM_CCI400_PORT_CTRL
|
||||
help
|
||||
Support for the Dual Cluster System Configuration Block (DCSCB).
|
||||
This is needed to provide CPU and cluster power management
|
||||
on RTSM implementing big.LITTLE.
|
||||
|
||||
config ARCH_VEXPRESS_SPC
|
||||
bool "Versatile Express Serial Power Controller (SPC)"
|
||||
select PM_OPP
|
||||
help
|
||||
The TC2 (A15x2 A7x3) versatile express core tile integrates a logic
|
||||
block called Serial Power Controller (SPC) that provides the interface
|
||||
between the dual cluster test-chip and the M3 microcontroller that
|
||||
carries out power management.
|
||||
|
||||
config ARCH_VEXPRESS_TC2_PM
|
||||
bool "Versatile Express TC2 power management"
|
||||
depends on MCPM
|
||||
select ARM_CCI400_PORT_CTRL
|
||||
select ARCH_VEXPRESS_SPC
|
||||
select ARM_CPU_SUSPEND
|
||||
help
|
||||
Support for CPU and cluster power management on Versatile Express
|
||||
with a TC2 (A15x2 A7x3) big.LITTLE core tile.
|
||||
|
||||
endif
|
||||
|
||||
@ -3,4 +3,34 @@
|
||||
# Makefile for the linux kernel.
|
||||
#
|
||||
|
||||
obj-y := versatile_dt.o
|
||||
# versatile
|
||||
obj-$(CONFIG_ARCH_VERSATILE) += versatile.o
|
||||
|
||||
# integrator
|
||||
obj-$(CONFIG_ARCH_INTEGRATOR) += integrator.o
|
||||
obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o
|
||||
obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o
|
||||
|
||||
# realview
|
||||
obj-$(CONFIG_ARCH_REALVIEW) += realview.o
|
||||
|
||||
# vexpress
|
||||
obj-$(CONFIG_ARCH_VEXPRESS) := v2m.o
|
||||
obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o
|
||||
CFLAGS_dcscb.o += -march=armv7-a
|
||||
CFLAGS_REMOVE_dcscb.o = -pg
|
||||
obj-$(CONFIG_ARCH_VEXPRESS_SPC) += spc.o
|
||||
CFLAGS_REMOVE_spc.o = -pg
|
||||
obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM) += tc2_pm.o
|
||||
CFLAGS_tc2_pm.o += -march=armv7-a
|
||||
CFLAGS_REMOVE_tc2_pm.o = -pg
|
||||
|
||||
# mps2
|
||||
obj-$(CONFIG_ARCH_MPS2) += v2m-mps2.o
|
||||
|
||||
ifdef CONFIG_SMP
|
||||
obj-y += headsmp.o platsmp.o
|
||||
obj-$(CONFIG_ARCH_REALVIEW) += platsmp-realview.o
|
||||
obj-$(CONFIG_ARCH_VEXPRESS) += platsmp-vexpress.o
|
||||
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
||||
endif
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* arch/arm/mach-vexpress/dcscb.c - Dual Cluster System Configuration Block
|
||||
* dcscb.c - Dual Cluster System Configuration Block
|
||||
*
|
||||
* Created by: Nicolas Pitre, May 2012
|
||||
* Copyright: (C) 2012-2013 Linaro Limited
|
||||
@ -20,7 +20,7 @@
|
||||
#include <asm/cputype.h>
|
||||
#include <asm/cp15.h>
|
||||
|
||||
#include "core.h"
|
||||
#include "vexpress.h"
|
||||
|
||||
#define RST_HOLD0 0x0
|
||||
#define RST_HOLD1 0x4
|
||||
@ -1,7 +1,5 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* arch/arm/include/asm/dcscb_setup.S
|
||||
*
|
||||
* Created by: Dave Martin, 2012-06-22
|
||||
* Copyright: (C) 2012-2013 Linaro Limited
|
||||
*/
|
||||
@ -1,7 +1,5 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* linux/arch/arm/plat-versatile/headsmp.S
|
||||
*
|
||||
* Copyright (c) 2003 ARM Limited
|
||||
* All Rights Reserved
|
||||
*/
|
||||
@ -15,7 +15,7 @@
|
||||
#include <asm/smp_plat.h>
|
||||
#include <asm/cp15.h>
|
||||
|
||||
#include <plat/platsmp.h>
|
||||
#include "platsmp.h"
|
||||
|
||||
static inline void versatile_immitation_enter_lowpower(unsigned int actrl_mask)
|
||||
{
|
||||
@ -1,7 +1,5 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* linux/arch/arm/mach-integrator/core.c
|
||||
*
|
||||
* Copyright (C) 2000-2003 Deep Blue Solutions Ltd
|
||||
*/
|
||||
#include <linux/types.h>
|
||||
@ -26,9 +24,9 @@
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
#include "hardware.h"
|
||||
#include "cm.h"
|
||||
#include "common.h"
|
||||
#include "integrator-hardware.h"
|
||||
#include "integrator-cm.h"
|
||||
#include "integrator.h"
|
||||
|
||||
static DEFINE_RAW_SPINLOCK(cm_lock);
|
||||
static void __iomem *cm_base;
|
||||
@ -1,7 +1,5 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/*
|
||||
* linux/arch/arm/mach-integrator/integrator_ap.c
|
||||
*
|
||||
* Copyright (C) 2000-2003 Deep Blue Solutions Ltd
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
@ -20,9 +18,9 @@
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
#include "hardware.h"
|
||||
#include "cm.h"
|
||||
#include "common.h"
|
||||
#include "integrator-hardware.h"
|
||||
#include "integrator-cm.h"
|
||||
#include "integrator.h"
|
||||
|
||||
/* Regmap to the AP system controller */
|
||||
static struct regmap *ap_syscon_map;
|
||||
@ -1,7 +1,5 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* linux/arch/arm/mach-integrator/integrator_cp.c
|
||||
*
|
||||
* Copyright (C) 2003 Deep Blue Solutions Ltd
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
@ -18,9 +16,9 @@
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
#include "hardware.h"
|
||||
#include "cm.h"
|
||||
#include "common.h"
|
||||
#include "integrator-hardware.h"
|
||||
#include "integrator-cm.h"
|
||||
#include "integrator.h"
|
||||
|
||||
/* Base address to the core module header */
|
||||
static struct regmap *cm_map;
|
||||
@ -13,7 +13,7 @@
|
||||
#include <asm/smp_plat.h>
|
||||
#include <asm/smp_scu.h>
|
||||
|
||||
#include <plat/platsmp.h>
|
||||
#include "platsmp.h"
|
||||
|
||||
#define REALVIEW_SYS_FLAGSSET_OFFSET 0x30
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* linux/arch/arm/mach-vexpress/platsmp.c
|
||||
*
|
||||
* Copyright (C) 2002 ARM Ltd.
|
||||
* All Rights Reserved
|
||||
*/
|
||||
@ -16,9 +14,8 @@
|
||||
#include <asm/smp_scu.h>
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
#include <plat/platsmp.h>
|
||||
|
||||
#include "core.h"
|
||||
#include "platsmp.h"
|
||||
#include "vexpress.h"
|
||||
|
||||
bool __init vexpress_smp_init_ops(void)
|
||||
{
|
||||
@ -1,7 +1,5 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* linux/arch/arm/plat-versatile/platsmp.c
|
||||
*
|
||||
* Copyright (C) 2002 ARM Ltd.
|
||||
* All Rights Reserved
|
||||
*
|
||||
@ -20,7 +18,7 @@
|
||||
#include <asm/cacheflush.h>
|
||||
#include <asm/smp_plat.h>
|
||||
|
||||
#include <plat/platsmp.h>
|
||||
#include "platsmp.h"
|
||||
|
||||
/*
|
||||
* versatile_cpu_release controls the release of CPUs from the holding
|
||||
@ -1,7 +1,5 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* linux/arch/arm/plat-versatile/include/plat/platsmp.h
|
||||
*
|
||||
* Copyright (C) 2011 ARM Ltd.
|
||||
* All Rights Reserved
|
||||
*/
|
||||
@ -1,7 +1,5 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* arch/arm/mach-vexpress/tc2_pm.c - TC2 power management support
|
||||
*
|
||||
* Created by: Nicolas Pitre, October 2012
|
||||
* Copyright: (C) 2012-2013 Linaro Limited
|
||||
*
|
||||
@ -3,7 +3,7 @@
|
||||
#include <linux/of_address.h>
|
||||
#include <asm/mach/arch.h>
|
||||
|
||||
#include "core.h"
|
||||
#include "vexpress.h"
|
||||
|
||||
#define SYS_FLAGSSET 0x030
|
||||
#define SYS_FLAGSCLR 0x034
|
||||
@ -1,81 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
menuconfig ARCH_VEXPRESS
|
||||
bool "ARM Ltd. Versatile Express family"
|
||||
depends on ARCH_MULTI_V7
|
||||
select ARCH_SUPPORTS_BIG_ENDIAN
|
||||
select ARM_AMBA
|
||||
select ARM_GIC
|
||||
select ARM_GLOBAL_TIMER
|
||||
select ARM_TIMER_SP804
|
||||
select GPIOLIB
|
||||
select HAVE_ARM_SCU if SMP
|
||||
select HAVE_ARM_TWD if SMP
|
||||
select HAVE_PATA_PLATFORM
|
||||
select CLK_ICST
|
||||
select NO_IOPORT_MAP
|
||||
select PLAT_VERSATILE
|
||||
select POWER_RESET
|
||||
select POWER_RESET_VEXPRESS
|
||||
select POWER_SUPPLY
|
||||
select REGULATOR if MMC_ARMMMCI
|
||||
select REGULATOR_FIXED_VOLTAGE if REGULATOR
|
||||
select VEXPRESS_CONFIG
|
||||
help
|
||||
This option enables support for systems using Cortex processor based
|
||||
ARM core and logic (FPGA) tiles on the Versatile Express motherboard,
|
||||
for example:
|
||||
|
||||
- CoreTile Express A5x2 (V2P-CA5s)
|
||||
- CoreTile Express A9x4 (V2P-CA9)
|
||||
- CoreTile Express A15x2 (V2P-CA15)
|
||||
- LogicTile Express 13MG (V2F-2XV6) with A5, A7, A9 or A15 SMMs
|
||||
(Soft Macrocell Models)
|
||||
- Versatile Express RTSMs (Models)
|
||||
|
||||
You must boot using a Flattened Device Tree in order to use these
|
||||
platforms. The traditional (ATAGs) boot method is not usable on
|
||||
these boards with this option.
|
||||
|
||||
if ARCH_VEXPRESS
|
||||
|
||||
config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
|
||||
bool "Enable A5 and A9 only errata work-arounds"
|
||||
default y
|
||||
select ARM_ERRATA_643719 if SMP
|
||||
select ARM_ERRATA_720789
|
||||
select PL310_ERRATA_753970 if CACHE_L2X0
|
||||
help
|
||||
Provides common dependencies for Versatile Express platforms
|
||||
based on Cortex-A5 and Cortex-A9 processors. In order to
|
||||
build a working kernel, you must also enable relevant core
|
||||
tile support or Flattened Device Tree based support options.
|
||||
|
||||
config ARCH_VEXPRESS_DCSCB
|
||||
bool "Dual Cluster System Control Block (DCSCB) support"
|
||||
depends on MCPM
|
||||
select ARM_CCI400_PORT_CTRL
|
||||
help
|
||||
Support for the Dual Cluster System Configuration Block (DCSCB).
|
||||
This is needed to provide CPU and cluster power management
|
||||
on RTSM implementing big.LITTLE.
|
||||
|
||||
config ARCH_VEXPRESS_SPC
|
||||
bool "Versatile Express Serial Power Controller (SPC)"
|
||||
select PM_OPP
|
||||
help
|
||||
The TC2 (A15x2 A7x3) versatile express core tile integrates a logic
|
||||
block called Serial Power Controller (SPC) that provides the interface
|
||||
between the dual cluster test-chip and the M3 microcontroller that
|
||||
carries out power management.
|
||||
|
||||
config ARCH_VEXPRESS_TC2_PM
|
||||
bool "Versatile Express TC2 power management"
|
||||
depends on MCPM
|
||||
select ARM_CCI400_PORT_CTRL
|
||||
select ARCH_VEXPRESS_SPC
|
||||
select ARM_CPU_SUSPEND
|
||||
help
|
||||
Support for CPU and cluster power management on Versatile Express
|
||||
with a TC2 (A15x2 A7x3) big.LITTLE core tile.
|
||||
|
||||
endif
|
||||
@ -1,19 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Makefile for the linux kernel.
|
||||
#
|
||||
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := \
|
||||
-I$(srctree)/arch/arm/plat-versatile/include
|
||||
|
||||
obj-$(CONFIG_ARCH_VEXPRESS) := v2m.o
|
||||
obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o
|
||||
CFLAGS_dcscb.o += -march=armv7-a
|
||||
CFLAGS_REMOVE_dcscb.o = -pg
|
||||
obj-$(CONFIG_ARCH_VEXPRESS_SPC) += spc.o
|
||||
CFLAGS_REMOVE_spc.o = -pg
|
||||
obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM) += tc2_pm.o
|
||||
CFLAGS_tc2_pm.o += -march=armv7-a
|
||||
CFLAGS_REMOVE_tc2_pm.o = -pg
|
||||
obj-$(CONFIG_SMP) += platsmp.o
|
||||
|
||||
obj-$(CONFIG_ARCH_MPS2) += v2m-mps2.o
|
||||
@ -1,5 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
|
||||
|
||||
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
|
||||
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
||||
Loading…
Reference in New Issue
Block a user