stm32mp1: move stboard command in board/st/common directory

Move the ST command in board/st/common, as this command is only used
by ST board. Prepare the support in U-Boot of boards with STM32MP15x
SOC but not STMicroelectronics.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>

diff --git a/board/st/common/Kconfig b/board/st/common/Kconfig
new file mode 100644 (file)
index 0000000..1824087
--- /dev/null
+++ b/board/st/common/Kconfig
@@ -0,0 +1,6 @@
+config CMD_STBOARD
+       bool "stboard - command for OTP board information"
+       default y
+       help
+         This compile the stboard command to
+         read and write the board in the OTP.

diff --git a/board/st/common/MAINTAINERS b/board/st/common/MAINTAINERS
new file mode 100644 (file)
index 0000000..3b02f4a
--- /dev/null
+++ b/board/st/common/MAINTAINERS
@@ -0,0 +1,6 @@
+ST BOARDS
+M:     Patrick Delaunay <patrick.delaunay@st.com>
+L:     uboot-stm32@st-md-mailman.stormreply.com (moderated for non-subscribers)
+T:     git https://gitlab.denx.de/u-boot/custodians/u-boot-stm.git
+S:     Maintained
+F:     board/st/common/

diff --git a/board/st/common/Makefile b/board/st/common/Makefile
new file mode 100644 (file)
index 0000000..8553606
--- /dev/null
+++ b/board/st/common/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
+#
+# Copyright (C) 2020, STMicroelectronics - All Rights Reserved
+#
+
+obj-$(CONFIG_CMD_STBOARD) += cmd_stboard.o

diff --git a/board/st/stm32mp1/cmd_stboard.c b/board/st/common/cmd_stboard.c
similarity index 98%
rename from board/st/stm32mp1/cmd_stboard.c
rename to board/st/common/cmd_stboard.c
index 04352ae8ed28b5b35e7cfb54e8ccab7d3e5a7dd1..e994a88e717cb379f1b818b09963868a672b5ef6 100644 (file)
--- a/board/st/stm32mp1/cmd_stboard.c
+++ b/board/st/common/cmd_stboard.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2019, STMicroelectronics - All Rights Reserved
  */
 
+#ifndef CONFIG_SPL_BUILD
 #include <common.h>
 #include <console.h>
 #include <misc.h>
@@ -143,3 +144,5 @@ U_BOOT_CMD(stboard, 6, 0, do_stboard,
           "  - Variant: 1 ... 15\n"
           "  - Revision: A...O\n"
           "  - BOM: 1...15\n");
+
+#endif

diff --git a/board/st/stm32mp1/Kconfig b/board/st/stm32mp1/Kconfig
index 4fa2360b4f925402a600fddc884e545b48d4e7d4..9f985e57752c7e39ec9bb7bcdfbe3d458768423f 100644 (file)
--- a/board/st/stm32mp1/Kconfig
+++ b/board/st/stm32mp1/Kconfig
@@ -15,15 +15,10 @@ config ENV_SECT_SIZE
 config ENV_OFFSET
        default 0x280000 if ENV_IS_IN_SPI_FLASH
 
-config CMD_STBOARD
-       bool "stboard - command for OTP board information"
-       default y
-       help
-         This compile the stboard command to
-         read and write the board in the OTP.
-
 config TARGET_STM32MP157C_DK2
        bool "support of STMicroelectronics STM32MP157C-DK2 Discovery Board"
        default y
 
+source "board/st/common/Kconfig"
+
 endif

diff --git a/board/st/stm32mp1/Makefile b/board/st/stm32mp1/Makefile
index 3c6c035b118a916b4565a115ef8f38dd66d29428..8188075b1a398d78aacacae9ccaba9a227aa4885 100644 (file)
--- a/board/st/stm32mp1/Makefile
+++ b/board/st/stm32mp1/Makefile
@@ -7,7 +7,6 @@ ifdef CONFIG_SPL_BUILD
 obj-y += spl.o
 else
 obj-y += stm32mp1.o
-obj-$(CONFIG_CMD_STBOARD) += cmd_stboard.o
 endif
 
 obj-y += board.o