Skip to contentSkip to conversation

imx: add imx8x capricorn giedi board

PATCH New Anatolij Gustschin 1 participant 4 messages Jan 7, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 imx: add imx8x capricorn giedi board

Add support for i.MX8X based Capricorn Giedi SoM.

Supported interfaces: GPIO, ENET, eMMC, I2C, UART.

Console output:

U-Boot SPL 2020.01-00003-gfd1c98f (Jan 07 2020 - 15:51:25 +0100) Trying to boot from MMC1
Load image from MMC/SD 0x3e400

U-Boot 2020.01-00003-gfd1c98f (Jan 07 2020 - 15:51:25 +0100) ##v01.07

CPU: NXP i.MX8QXP RevB A35 at 1200 MHz at 30C

Model: Siemens Giedi
Board: Capricorn

  Boot:  MMC0
  DRAM:  1022 MiB
  MMC:   FSL_SDHC: 0
  Loading Environment from MMC... OK
  In:    serial at 5a080000
  Out:   serial at 5a080000
  Err:   serial at 5a080000
  Net:   eth1: ethernet at 5b050000 [PRIME]

Autobooting in 1 seconds, press "<Esc><Esc>" to stop

---
 arch/arm/dts/Makefile                       |   3 +-
 arch/arm/dts/imx8-giedi.dts                 |  10 +
 arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi  | 133 ++++++
 arch/arm/dts/imx8qxp-capricorn.dtsi         | 285 +++++++++++++
 arch/arm/mach-imx/imx8/Kconfig              |   6 +
 board/siemens/capricorn/Kconfig             |  12 +
 board/siemens/capricorn/MAINTAINERS         |   9 +
 board/siemens/capricorn/Makefile            |  12 +
 board/siemens/capricorn/board.c             | 448 ++++++++++++++++++++
 board/siemens/capricorn/imximage.cfg        |  22 +
 board/siemens/capricorn/spl.c               |  47 ++
 board/siemens/capricorn/uboot-container.cfg |  13 +
 board/siemens/common/factoryset.c           |   2 +
 configs/giedi_defconfig                     | 103 +++++
 include/configs/capricorn-common.h          | 185 ++++++++
 include/configs/giedi.h                     |  19 +
 include/configs/siemens-ccp-common.h        |  19 +
 include/configs/siemens-env-common.h        | 201 +++++++++
 18 files changed, 1528 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/imx8-giedi.dts
 create mode 100644 arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx8qxp-capricorn.dtsi
 create mode 100644 board/siemens/capricorn/Kconfig
 create mode 100644 board/siemens/capricorn/MAINTAINERS
 create mode 100644 board/siemens/capricorn/Makefile
 create mode 100644 board/siemens/capricorn/board.c
 create mode 100644 board/siemens/capricorn/imximage.cfg
 create mode 100644 board/siemens/capricorn/spl.c
 create mode 100644 board/siemens/capricorn/uboot-container.cfg
 create mode 100644 configs/giedi_defconfig
 create mode 100644 include/configs/capricorn-common.h
 create mode 100644 include/configs/giedi.h
 create mode 100644 include/configs/siemens-ccp-common.h
 create mode 100644 include/configs/siemens-env-common.h
arch/arm/dts/Makefile +2 -1
index 0127a91a82..c0298e5462 100644
@@ -667,7 +667,8 @@ dtb-$(CONFIG_ARCH_IMX8) += \
 	imx8qm-rom7720-a1.dtb \
 	fsl-imx8qxp-ai_ml.dtb \
 	fsl-imx8qxp-colibri.dtb \
-	fsl-imx8qxp-mek.dtb
+	fsl-imx8qxp-mek.dtb \
+	imx8-giedi.dtb
 
 dtb-$(CONFIG_ARCH_IMX8M) += \
 	imx8mm-evk.dtb \
arch/arm/dts/imx8-giedi.dts new file +10 -0
new file mode 100644
index 0000000000..0dbfef2ee9
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2019 Siemens AG
+ */
+
+#include "imx8qxp-capricorn.dtsi"
+
+/ {
+	model = "Siemens Giedi";
+};
arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi new file +133 -0

133 lines not on this page · raw message

arch/arm/dts/imx8qxp-capricorn.dtsi new file +285 -0

285 lines not on this page · raw message

arch/arm/mach-imx/imx8/Kconfig +6 -0
index cdb78afacf..bb45c8e3e6 100644
@@ -55,6 +55,11 @@ config TARGET_COLIBRI_IMX8X
 	select BOARD_LATE_INIT
 	select IMX8QXP
 
+config TARGET_GIEDI
+	bool "Support i.MX8QXP Capricorn Giedi board"
+	select BOARD_LATE_INIT
+	select IMX8QXP
+
 config TARGET_IMX8QM_MEK
 	bool "Support i.MX8QM MEK board"
 	select BOARD_LATE_INIT
@@ -78,5 +83,6 @@ source "board/freescale/imx8qxp_mek/Kconfig"
 source "board/advantech/imx8qm_rom7720_a1/Kconfig"
 source "board/toradex/apalis-imx8/Kconfig"
 source "board/toradex/colibri-imx8x/Kconfig"
+source "board/siemens/capricorn/Kconfig"
 
 endif
board/siemens/capricorn/Kconfig new file +12 -0
new file mode 100644
index 0000000000..ed1f793e40
@@ -0,0 +1,12 @@
+if TARGET_GIEDI
+
+config SYS_BOARD
+	default "capricorn"
+
+config SYS_VENDOR
+	default "siemens"
+
+config SYS_CONFIG_NAME
+	default "giedi"
+
+endif
board/siemens/capricorn/MAINTAINERS new file +9 -0
new file mode 100644
index 0000000000..5d81aaf149
@@ -0,0 +1,9 @@
+CAPRICORN BOARD
+M:	Anatolij Gustschin <[email protected]>
+S:	Maintained
+F:	board/siemens/capricorn/
+F:	include/configs/capricorn-common.h
+F:	include/configs/giedi.h
+F:	include/configs/siemens-ccp-common.h
+F:	include/configs/siemens-env-common.h
+F:	configs/giedi_defconfig
board/siemens/capricorn/Makefile new file +12 -0
new file mode 100644
index 0000000000..d5846cc8e3
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright 2019 Siemens AG
+#
+
+obj-y += board.o
+
+ifdef CONFIG_SPL_BUILD
+obj-y += spl.o
+else
+obj-y += ../common/factoryset.o
+endif
board/siemens/capricorn/board.c new file +448 -0

448 lines not on this page · raw message

board/siemens/capricorn/imximage.cfg new file +22 -0
new file mode 100644
index 0000000000..8660e50cbd
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2018 NXP
+ *
+ * Refer doc/README.imx8image for more details about how-to configure
+ * and create imx8image boot image
+ */
+
+#define __ASSEMBLY__
+
+/* Boot from SD, sector size 0x400 */
+BOOT_FROM SD 0x400
+/* SoC type IMX8QX */
+SOC_TYPE IMX8QX
+/* Append seco container image */
+APPEND ahab-container.img
+/* Create the 2nd container */
+CONTAINER
+/* Add scfw image with exec attribute */
+IMAGE SCU capricorn-scfw-tcm.bin
+/* Add ATF image with exec attribute */
+IMAGE A35 spl/u-boot-spl.bin 0x00100000
board/siemens/capricorn/spl.c new file +47 -0

47 lines not on this page · raw message

board/siemens/capricorn/uboot-container.cfg new file +13 -0
new file mode 100644
index 0000000000..8165811818
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2019 NXP
+ */
+
+#define __ASSEMBLY__
+
+/* This file is to create a container image could be loaded by SPL */
+BOOT_FROM SD 0x400
+SOC_TYPE IMX8QX
+CONTAINER
+IMAGE A35 bl31.bin	0x80000000
+IMAGE A35 u-boot.bin	CONFIG_SYS_TEXT_BASE
board/siemens/common/factoryset.c +2 -0
index 7715ddf307..0d3701c03c 100644
@@ -13,7 +13,9 @@
 #include <env_internal.h>
 #include <i2c.h>
 #include <asm/io.h>
+#if !CONFIG_IS_ENABLED(TARGET_GIEDI) && !CONFIG_IS_ENABLED(TARGET_DENEB)
 #include <asm/arch/cpu.h>
+#endif
 #include <asm/arch/sys_proto.h>
 #include <asm/unaligned.h>
 #include <net.h>
configs/giedi_defconfig new file +103 -0

103 lines not on this page · raw message

include/configs/capricorn-common.h new file +185 -0

185 lines not on this page · raw message

include/configs/giedi.h new file +19 -0
new file mode 100644
index 0000000000..dabb1fb171
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2019 Siemens AG
+ *
+ */
+
+#ifndef __GIEDI_H
+#define __GIEDI_H
+
+#include "capricorn-common.h"
+
+#undef CONFIG_IDENT_STRING
+#define CONFIG_IDENT_STRING		GENERATE_CCP_VERSION("01", "07")
+
+/* DDR3 board total DDR is 1 GB */
+#undef PHYS_SDRAM_1_SIZE
+#define PHYS_SDRAM_1_SIZE		0x40000000	/* 1 GB */
+
+#endif /* __GIEDI_H */
include/configs/siemens-ccp-common.h new file +19 -0
new file mode 100644
index 0000000000..01051c8ad7
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/* Be very careful updating CONFIG_IDENT_STRING
+ * This string will control the update flow whether an U-Boot should be
+ * updated or not. If the version of installed U-Boot (in flash) is smaller
+ * than the version to be installed (from update file), an update will
+ * be performed.
+ *
+ * General rules:
+ * 1. First 4 characters ' ##v' or  IDENT_MAGIC represent kind of a magic number
+ *    to identify the following strings after easily. Don't change them!
+ *
+ * 2. First 2 digits after 'v' or CCP_MAJOR are updated with U-Boot version
+ *    change, e.g. from 2015.04 to 2018.03
+ *
+ * 3. Second 2 digits after '.' or CCP_MINOR are updated if we want to upgrade
+ *    U-Boot within an U-Boot version.
+ */
+#define CCP_IDENT_MAGIC			" ##v"
+#define GENERATE_CCP_VERSION(MAJOR, MINOR)	CCP_IDENT_MAGIC MAJOR "." MINOR
include/configs/siemens-env-common.h new file +201 -0

201 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 imx: add imx8x capricorn giedi board

Hi Stefano,

Quoted 5 lines · On Tue, 7 Jan 2020 16:37:42 +0100 Anatolij Gustschin agust at denx.de wrote:

Add support for i.MX8X based Capricorn Giedi SoM.

Supported interfaces: GPIO, ENET, eMMC, I2C, UART.
...
---

Actually, this is v2 series, I forgot to tag it before resending, sorry. Here is the changelog:

Changes in v2:
- rebased on master branch, v2020.01 release
- moved environment related config macros to defconfig
- fixed 'empty last line' warnings seen when committing the patch
- dropped obsolete CONFIG_MV88E61XX_88E6020_FAMILY from defconfig
- commented out build_info() call in checkboard() because with currently available SCFW blob the board hangs when running build_info()

--
Anatolij

#2 lore raw

PATCH 2/2 imx: add imx8x based deneb board

In reply to Anatolij Gustschin

Add support for Capricorn Deneb SoM variant.

---
 arch/arm/dts/Makefile               |   1 +
 arch/arm/dts/imx8-deneb.dts         |  10 +++
 arch/arm/mach-imx/imx8/Kconfig      |   5 ++
 board/siemens/capricorn/Kconfig     |  13 ++++
 board/siemens/capricorn/MAINTAINERS |   2 +
 configs/deneb_defconfig             | 103 ++++++++++++++++++++++++++++
 include/configs/deneb.h             |  19 +++++
 7 files changed, 153 insertions(+)
 create mode 100644 arch/arm/dts/imx8-deneb.dts
 create mode 100644 configs/deneb_defconfig
 create mode 100644 include/configs/deneb.h
arch/arm/dts/Makefile +1 -0
index c0298e5462..8540291771 100644
@@ -668,6 +668,7 @@ dtb-$(CONFIG_ARCH_IMX8) += \
 	fsl-imx8qxp-ai_ml.dtb \
 	fsl-imx8qxp-colibri.dtb \
 	fsl-imx8qxp-mek.dtb \
+	imx8-deneb.dtb \
 	imx8-giedi.dtb
 
 dtb-$(CONFIG_ARCH_IMX8M) += \
arch/arm/dts/imx8-deneb.dts new file +10 -0
new file mode 100644
index 0000000000..04c764aa94
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2019 Siemens AG
+ */
+
+#include "imx8qxp-capricorn.dtsi"
+
+/ {
+	model = "Siemens Deneb";
+};
arch/arm/mach-imx/imx8/Kconfig +5 -0
index bb45c8e3e6..5827ab334f 100644
@@ -55,6 +55,11 @@ config TARGET_COLIBRI_IMX8X
 	select BOARD_LATE_INIT
 	select IMX8QXP
 
+config TARGET_DENEB
+	bool "Support i.MX8QXP Capricorn Deneb board"
+	select BOARD_LATE_INIT
+	select IMX8QXP
+
 config TARGET_GIEDI
 	bool "Support i.MX8QXP Capricorn Giedi board"
 	select BOARD_LATE_INIT
board/siemens/capricorn/Kconfig +13 -0
index ed1f793e40..21c3ef9094 100644
@@ -10,3 +10,16 @@ config SYS_CONFIG_NAME
 	default "giedi"
 
 endif
+
+if TARGET_DENEB
+
+config SYS_BOARD
+	default "capricorn"
+
+config SYS_VENDOR
+	default "siemens"
+
+config SYS_CONFIG_NAME
+	default "deneb"
+
+endif
board/siemens/capricorn/MAINTAINERS +2 -0
index 5d81aaf149..bc7d163e17 100644
@@ -3,7 +3,9 @@ M:	Anatolij Gustschin <[email protected]>
 S:	Maintained
 F:	board/siemens/capricorn/
 F:	include/configs/capricorn-common.h
+F:	include/configs/deneb.h
 F:	include/configs/giedi.h
 F:	include/configs/siemens-ccp-common.h
 F:	include/configs/siemens-env-common.h
+F:	configs/deneb_defconfig
 F:	configs/giedi_defconfig
configs/deneb_defconfig new file +103 -0

103 lines not on this page · raw message

include/configs/deneb.h new file +19 -0
new file mode 100644
index 0000000000..a33165c1ca
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2019 Siemens AG
+ *
+ */
+
+#ifndef __DENEB_H
+#define __DENEB_H
+
+#include "capricorn-common.h"
+
+#undef CONFIG_IDENT_STRING
+#define CONFIG_IDENT_STRING		GENERATE_CCP_VERSION("01", "06")
+
+/* DDR3 board total DDR is 2 GB */
+#undef PHYS_SDRAM_1_SIZE
+#define PHYS_SDRAM_1_SIZE		0x80000000	/* 2 GB */
+
+#endif /* __DENEB_H */
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/2 imx: add imx8x based deneb board

Hi Stefano,

Quoted 1 line · On Tue, 7 Jan 2020 16:37:43 +0100 Anatolij Gustschin agust at denx.de wrote:

Add support for Capricorn Deneb SoM variant.

This is also v2 patch, here is the changelog.

Changes in v2:
- rebased on master branch, v2020.01 release
- moved environment related config macros to defconfig
- dropped obsolete CONFIG_MV88E61XX_88E6020_FAMILY from defconfig

--
Anatolij