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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 0ee358bac6bd455aa35d49ee9f5ae5090d760f3f..4504afc892c65f2c98c14be36c6bbf67bb0e7273 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -272,9 +272,10 @@ M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 S:     Maintained
 F:     arch/arm/include/asm/arch-owl/
 F:     arch/arm/mach-owl/
-F:     board/ucRobotics/
 F:     drivers/clk/owl/
 F:     drivers/serial/serial_owl.c
+F:     include/configs/owl-common.h
+F:     configs/bubblegum_96_defconfig
 
 ARM RENESAS RMOBILE/R-CAR
 M:     Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 33b484753c43d058cb3f38857188383b1134d6fb..e85506a51a6c16a48fbb037acc8ed5a0c2e4b186 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -874,9 +874,9 @@ config ARCH_MX5
 
 config ARCH_OWL
        bool "Actions Semi OWL SoCs"
-       select ARM64
        select DM
        select DM_SERIAL
+       select OWL_SERIAL
        select OF_CONTROL
        imply CMD_DM
 
@@ -1870,7 +1870,6 @@ source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/tcl/sl50/Kconfig"
-source "board/ucRobotics/bubblegum_96/Kconfig"
 source "board/birdland/bav335x/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/variscite/dart_6ul/Kconfig"

diff --git a/arch/arm/mach-owl/Kconfig b/arch/arm/mach-owl/Kconfig
index 199e772988241cf99e9c88d467803c825e546c49..28984c1b084d29aa0bfa6ac2eccbb883758b0001 100644 (file)
--- a/arch/arm/mach-owl/Kconfig
+++ b/arch/arm/mach-owl/Kconfig
@@ -1,27 +1,22 @@
 if ARCH_OWL
 
-config SYS_SOC
-       default "owl"
-
 choice
-        prompt "Actions Semi OWL SoCs board select"
+        prompt "Actions Semi Owl SoC Variant"
         optional
 
-config TARGET_BUBBLEGUM_96
-       bool "96Boards Bubblegum-96"
-       help
-         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
+config MACH_S900
+        bool "Actions Semi S900 SoC"
+        select ARM64
 
 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

diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile
index 1b43dc2921d980c33986ecc28709dd61e58f9217..0b181c62d6c8b640b3bac4e5de84ff06f8c54b0e 100644 (file)
--- a/arch/arm/mach-owl/Makefile
+++ b/arch/arm/mach-owl/Makefile
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 
+obj-y += soc.o
 obj-y += sysmap-s900.o

diff --git a/board/ucRobotics/bubblegum_96/bubblegum_96.c b/arch/arm/mach-owl/soc.c
similarity index 92%
rename from board/ucRobotics/bubblegum_96/bubblegum_96.c
rename to arch/arm/mach-owl/soc.c
index c16f117bf8aed9358737c49ac655de07316a7605..409cbd319f2002eba52f6992c74b0a3b5bb3b692 100644 (file)
--- a/board/ucRobotics/bubblegum_96/bubblegum_96.c
+++ b/arch/arm/mach-owl/soc.c
@@ -1,6 +1,6 @@
 // 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>
  */
@@ -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);
 
        printf("PSCI:  v%ld.%ld\n",
-              PSCI_VERSION_MAJOR(res.a0),
+               PSCI_VERSION_MAJOR(res.a0),
                PSCI_VERSION_MINOR(res.a0));
 }
 

diff --git a/board/ucRobotics/bubblegum_96/Kconfig b/board/ucRobotics/bubblegum_96/Kconfig
deleted file mode 100644 (file)
index 2dd40d9..0000000
--- a/board/ucRobotics/bubblegum_96/Kconfig
+++ /dev/null
@@ -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

diff --git a/board/ucRobotics/bubblegum_96/MAINTAINERS b/board/ucRobotics/bubblegum_96/MAINTAINERS
deleted file mode 100644 (file)
index d0cb727..0000000
--- a/board/ucRobotics/bubblegum_96/MAINTAINERS
+++ /dev/null
@@ -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

diff --git a/board/ucRobotics/bubblegum_96/Makefile b/board/ucRobotics/bubblegum_96/Makefile
deleted file mode 100644 (file)
index c4b524d..0000000
--- a/board/ucRobotics/bubblegum_96/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier:     GPL-2.0+
-
-obj-y   := bubblegum_96.o

diff --git a/configs/bubblegum_96_defconfig b/configs/bubblegum_96_defconfig
index ae44ce1e94082aaa84bec2601fca4067b46a562f..8c94def75e1f562730ea220f6de660661a75c59c 100644 (file)
--- a/configs/bubblegum_96_defconfig
+++ b/configs/bubblegum_96_defconfig
@@ -1,9 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_OWL=y
-CONFIG_SYS_TEXT_BASE=0x11000000
 CONFIG_ENV_SIZE=0x2000
-CONFIG_TARGET_BUBBLEGUM_96=y
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_MACH_S900=y
 CONFIG_IDENT_STRING="\nBubblegum-96"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTDELAY=5
@@ -21,4 +20,3 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_CLK=y
 CONFIG_CLK_OWL=y
 CONFIG_CLK_S900=y
-CONFIG_OWL_SERIAL=y

diff --git a/include/configs/bubblegum_96.h b/include/configs/owl-common.h
similarity index 89%
rename from include/configs/bubblegum_96.h
rename to include/configs/owl-common.h
index c739d665f66264680dc47cdd6eff7211bf7e7365..f77a5fa4c114e7466dad358ef8d175c274af74ac 100644 (file)
--- a/include/configs/bubblegum_96.h
+++ b/include/configs/owl-common.h
@@ -1,14 +1,14 @@
 /* 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) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  *
  */
 
-#ifndef _BUBBLEGUM_96_H_
-#define _BUGGLEGUM_96_H_
+#ifndef _OWL_COMMON_CONFIG_H_
+#define _OWL_COMMON_CONFIG_H_
 
 /* SDRAM Definitions */
 #define CONFIG_SYS_SDRAM_BASE          0x0