arm: actions: Add common framework for Actions Owl Semi SoCs

This commit adds common arch support for Actions Semi Owl
series SoCs and removes the Bubblegum96 board files.

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com>
This commit is contained in:
Amit Singh Tomar 2020-04-19 19:28:25 +05:30 committed by Tom Rini
parent c11f0d88ba
commit b1a6bb3b59
10 changed files with 22 additions and 52 deletions

View File

@ -272,9 +272,10 @@ M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
S: Maintained S: Maintained
F: arch/arm/include/asm/arch-owl/ F: arch/arm/include/asm/arch-owl/
F: arch/arm/mach-owl/ F: arch/arm/mach-owl/
F: board/ucRobotics/
F: drivers/clk/owl/ F: drivers/clk/owl/
F: drivers/serial/serial_owl.c F: drivers/serial/serial_owl.c
F: include/configs/owl-common.h
F: configs/bubblegum_96_defconfig
ARM RENESAS RMOBILE/R-CAR ARM RENESAS RMOBILE/R-CAR
M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

View File

@ -874,9 +874,9 @@ config ARCH_MX5
config ARCH_OWL config ARCH_OWL
bool "Actions Semi OWL SoCs" bool "Actions Semi OWL SoCs"
select ARM64
select DM select DM
select DM_SERIAL select DM_SERIAL
select OWL_SERIAL
select OF_CONTROL select OF_CONTROL
imply CMD_DM imply CMD_DM
@ -1870,7 +1870,6 @@ source "board/spear/spear600/Kconfig"
source "board/spear/x600/Kconfig" source "board/spear/x600/Kconfig"
source "board/st/stv0991/Kconfig" source "board/st/stv0991/Kconfig"
source "board/tcl/sl50/Kconfig" source "board/tcl/sl50/Kconfig"
source "board/ucRobotics/bubblegum_96/Kconfig"
source "board/birdland/bav335x/Kconfig" source "board/birdland/bav335x/Kconfig"
source "board/toradex/colibri_pxa270/Kconfig" source "board/toradex/colibri_pxa270/Kconfig"
source "board/variscite/dart_6ul/Kconfig" source "board/variscite/dart_6ul/Kconfig"

View File

@ -1,27 +1,22 @@
if ARCH_OWL if ARCH_OWL
config SYS_SOC
default "owl"
choice choice
prompt "Actions Semi OWL SoCs board select" prompt "Actions Semi Owl SoC Variant"
optional optional
config TARGET_BUBBLEGUM_96 config MACH_S900
bool "96Boards Bubblegum-96" bool "Actions Semi S900 SoC"
help select ARM64
Support for 96Boards Bubblegum-96. This board complies with
96Board Consumer Edition Specification. Features:
- Actions Semi S900 SoC (4xCortex A53, Power VR G6230 GPU)
- 2GiB RAM
- 8GiB eMMC, uSD slot
- WiFi, Bluetooth and GPS module
- 2x Host, 1x Device USB port
- HDMI
- 20-pin low speed and 40-pin high speed expanders, 6 LED, 3 buttons
endchoice endchoice
source "board/ucRobotics/bubblegum_96/Kconfig" config SYS_TEXT_BASE
default 0x11000000
config SYS_CONFIG_NAME
default "owl-common"
config SYS_SOC
default "s900" if MACH_S900
endif endif

View File

@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
obj-y += soc.o
obj-y += sysmap-s900.o obj-y += sysmap-s900.o

View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* /*
* Bubblegum-96 Boards Support * Actions Semi Owl SoCs platform support.
* *
* Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
*/ */
@ -40,7 +40,7 @@ static void show_psci_version(void)
arm_smccc_smc(ARM_PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &res); arm_smccc_smc(ARM_PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &res);
printf("PSCI: v%ld.%ld\n", printf("PSCI: v%ld.%ld\n",
PSCI_VERSION_MAJOR(res.a0), PSCI_VERSION_MAJOR(res.a0),
PSCI_VERSION_MINOR(res.a0)); PSCI_VERSION_MINOR(res.a0));
} }

View File

@ -1,15 +0,0 @@
if TARGET_BUBBLEGUM_96
config SYS_BOARD
default "bubblegum_96"
config SYS_VENDOR
default "ucRobotics"
config SYS_SOC
default "s900"
config SYS_CONFIG_NAME
default "bubblegum_96"
endif

View File

@ -1,6 +0,0 @@
BUBBLEGUM_96 BOARD
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
S: Maintained
F: board/ucRobotics/bubblegum_96/
F: include/configs/bubblegum_96.h
F: configs/bubblegum_96_defconfig

View File

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y := bubblegum_96.o

View File

@ -1,9 +1,8 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_OWL=y CONFIG_ARCH_OWL=y
CONFIG_SYS_TEXT_BASE=0x11000000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_TARGET_BUBBLEGUM_96=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_MACH_S900=y
CONFIG_IDENT_STRING="\nBubblegum-96" CONFIG_IDENT_STRING="\nBubblegum-96"
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_BOOTDELAY=5 CONFIG_BOOTDELAY=5
@ -21,4 +20,3 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_CLK=y CONFIG_CLK=y
CONFIG_CLK_OWL=y CONFIG_CLK_OWL=y
CONFIG_CLK_S900=y CONFIG_CLK_S900=y
CONFIG_OWL_SERIAL=y

View File

@ -1,14 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0+ */ /* SPDX-License-Identifier: GPL-2.0+ */
/* /*
* Board configuration file for Bubblegum-96 * Board configuration file for Actions Semi Owl SoCs.
* *
* Copyright (C) 2015 Actions Semi Co., Ltd. * Copyright (C) 2015 Actions Semi Co., Ltd.
* Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
* *
*/ */
#ifndef _BUBBLEGUM_96_H_ #ifndef _OWL_COMMON_CONFIG_H_
#define _BUGGLEGUM_96_H_ #define _OWL_COMMON_CONFIG_H_
/* SDRAM Definitions */ /* SDRAM Definitions */
#define CONFIG_SYS_SDRAM_BASE 0x0 #define CONFIG_SYS_SDRAM_BASE 0x0