Skip to contentSkip to conversation

bsh: imx6ulz_smm_m2: Add imx6ulz BSH SMM M2 boards

PATCH In review Michael Trimarchi 3 participants 4 messages Sep 18, 2022 – Sep 19, 2022

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

PATCH v5 1/1 bsh: imx6ulz_smm_m2: Add imx6ulz BSH SMM M2 boards

Introduce BSH SystemMaster (SMM) M2 board family, which consists of:
imx6ulz SMM M2 and imx6ulz SMM M2 PRO boards.

Add support for imx6ulz BSH SMM M2 board:

- 128 MiB DDR3 RAM
- 256MiB Nand
- USBOTG1 peripheral - fastboot.

---
Changes V4->V5:
- Add README
- Drop ramdisk_addr_r
- Fix fdt_addr_r
- Fix mtd parts from mtdparts=mdtparts= to mtdparts=
- Adjust partition loading name according to mtdparts
- Move CONFIG_SPL_BSS_START_ADDR=0x84100000 to half of 128Mb, this address was above 128Mb but module has only 128Mb
- Enable bbt table for nand
- Test bootloader with NXP and MAINLINE kernel up to 6.0-rc2

Changes V3->V4:
- really drop the define in include

Changes V2->V3:
- remove CONFIG_SYS_HZ default is 1000 from include
- make const uart4

Changes V1->V2:
- Adjust board due to the migrate CUSTOM_SYS_INIT_SP_ADDR to Kconfig using system-constants.h
- Drop reference to freescale board in imx6ulz_smm_m2 include file

---
 arch/arm/dts/Makefile                       |   1 +
 arch/arm/dts/imx6ulz-bsh-smm-m2-u-boot.dtsi |  35 +++++
 arch/arm/dts/imx6ulz-bsh-smm-m2.dts         | 146 ++++++++++++++++++++
 arch/arm/mach-imx/mx6/Kconfig               |  12 ++
 board/bsh/imx6ulz_smm_m2/Kconfig            |  12 ++
 board/bsh/imx6ulz_smm_m2/MAINTAINERS        |   6 +
 board/bsh/imx6ulz_smm_m2/Makefile           |   6 +
 board/bsh/imx6ulz_smm_m2/README             |  67 +++++++++
 board/bsh/imx6ulz_smm_m2/imx6ulz_smm_m2.c   |  53 +++++++
 board/bsh/imx6ulz_smm_m2/spl.c              | 130 +++++++++++++++++
 configs/imx6ulz_smm_m2_defconfig            |  80 +++++++++++
 include/configs/imx6ulz_smm_m2.h            |  78 +++++++++++
 12 files changed, 626 insertions(+)
 create mode 100644 arch/arm/dts/imx6ulz-bsh-smm-m2-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6ulz-bsh-smm-m2.dts
 create mode 100644 board/bsh/imx6ulz_smm_m2/Kconfig
 create mode 100644 board/bsh/imx6ulz_smm_m2/MAINTAINERS
 create mode 100644 board/bsh/imx6ulz_smm_m2/Makefile
 create mode 100644 board/bsh/imx6ulz_smm_m2/README
 create mode 100644 board/bsh/imx6ulz_smm_m2/imx6ulz_smm_m2.c
 create mode 100644 board/bsh/imx6ulz_smm_m2/spl.c
 create mode 100644 configs/imx6ulz_smm_m2_defconfig
 create mode 100644 include/configs/imx6ulz_smm_m2.h
arch/arm/dts/Makefile +1 -0
index 7330121dba..1cb100a1f1 100644
@@ -895,6 +895,7 @@ dtb-$(CONFIG_MX6ULL) += \
 	imx6ull-phytec-segin-ff-rdk-emmc.dtb \
 	imx6ull-dart-6ul.dtb \
 	imx6ull-somlabs-visionsom.dtb \
+	imx6ulz-bsh-smm-m2.dtb \
 	imx6ulz-14x14-evk.dtb
 
 dtb-$(CONFIG_ARCH_MX6) += \
arch/arm/dts/imx6ulz-bsh-smm-m2-u-boot.dtsi new file +35 -0
new file mode 100644
index 0000000000..75dbf6ed78
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2022 BSH Hausgeraete GmbH
+ *
+ * Author: Michael Trimarchi <[email protected]>
+ */
+
+&{/soc} {
+	u-boot,dm-pre-reloc;
+};
+
+&aips2 {
+	u-boot,dm-pre-reloc;
+};
+
+&iomuxc {
+	u-boot,dm-pre-reloc;
+};
+
+&iomuxc_snvs {
+	u-boot,dm-pre-reloc;
+};
+
+&uart4 {
+	u-boot,dm-pre-reloc;
+};
+
+&pinctrl_uart4 {
+	u-boot,dm-pre-reloc;
+};
+
+&gpmi {
+	u-boot,dm-spl;
+	u-boot,dm-pre-reloc;
+};
arch/arm/dts/imx6ulz-bsh-smm-m2.dts new file +146 -0

146 lines not on this page · raw message

arch/arm/mach-imx/mx6/Kconfig +12 -0
index ec560fe257..c7a03e5042 100644
@@ -466,6 +466,17 @@ config TARGET_MX6ULL_14X14_EVK
 	select DM_THERMAL
 	imply CMD_DM
 
+config TARGET_MX6ULZ_SMM_M2
+	bool "Support imx6ulz_smm_m2"
+	depends on MX6ULL
+	select DM
+	select DM_GPIO
+	select DM_I2C
+	select DM_SERIAL
+	select DM_MTD
+	select DM_THERMAL
+	select SUPPORT_SPL
+
 config TARGET_MYS_6ULX
 	bool "MYiR MYS-6ULX"
 	depends on MX6ULL
@@ -680,6 +691,7 @@ source "board/ge/b1x5v2/Kconfig"
 source "board/aristainetos/Kconfig"
 source "board/armadeus/opos6uldev/Kconfig"
 source "board/boundary/nitrogen6x/Kconfig"
+source "board/bsh/imx6ulz_smm_m2/Kconfig"
 source "board/bticino/mamoj/Kconfig"
 source "board/compulab/cm_fx6/Kconfig"
 source "board/dhelectronics/dh_imx6/Kconfig"
board/bsh/imx6ulz_smm_m2/Kconfig new file +12 -0
new file mode 100644
index 0000000000..e38df7ce5c
@@ -0,0 +1,12 @@
+if TARGET_MX6ULZ_SMM_M2
+
+config SYS_BOARD
+	default "imx6ulz_smm_m2"
+
+config SYS_VENDOR
+	default "bsh"
+
+config SYS_CONFIG_NAME
+	default "imx6ulz_smm_m2"
+
+endif
board/bsh/imx6ulz_smm_m2/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..8f3d79dbb8
@@ -0,0 +1,6 @@
+MX6ULZ_SMM_M2 BOARD
+M:	Michael Trimarchi <[email protected]>
+S:	Maintained
+F:	board/bsh/mx6ulz_smm_m2/
+F:	include/configs/imx6ulz_smm_m2.h
+F:	configs/imx6ulz_smm_m2_defconfig
board/bsh/imx6ulz_smm_m2/Makefile new file +6 -0
new file mode 100644
index 0000000000..b761bbb2f9
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
+# (C) Copyright 2021 Amarula Solutions B.V.
+
+obj-y  := imx6ulz_smm_m2.o
+obj-$(CONFIG_SPL_BUILD) += spl.o
+
board/bsh/imx6ulz_smm_m2/README new file +67 -0

67 lines not on this page · raw message

board/bsh/imx6ulz_smm_m2/imx6ulz_smm_m2.c new file +53 -0

53 lines not on this page · raw message

board/bsh/imx6ulz_smm_m2/spl.c new file +130 -0

130 lines not on this page · raw message

configs/imx6ulz_smm_m2_defconfig new file +80 -0

80 lines not on this page · raw message

include/configs/imx6ulz_smm_m2.h new file +78 -0

78 lines not on this page · raw message

Signature · 1 line
2.34.1
#2 lore raw
Quoted 8 lines · Fabio Estevam
Quoted 6 lines · Michael Trimarchi

Introduce BSH SystemMaster (SMM) M2 board family, which consists of:
imx6ulz SMM M2 and imx6ulz SMM M2 PRO boards.

Add support for imx6ulz BSH SMM M2 board:

Quoted 7 lines
Quoted 5 lines

- 128 MiB DDR3 RAM
- 256MiB Nand
- USBOTG1 peripheral - fastboot.

Ok, thanks - I drop the old one and merge this into u-boot.imx (ok, I had to rebase it, I hope this does not create many issues). I send a PR to Tom now.

Regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#3 lore raw

Hi Stefano

Quoted 14 lines · Stefano Babic
Quoted 12 lines · Fabio Estevam
Quoted 10 lines · Michael Trimarchi

Introduce BSH SystemMaster (SMM) M2 board family, which consists of:
imx6ulz SMM M2 and imx6ulz SMM M2 PRO boards.

Add support for imx6ulz BSH SMM M2 board:

- 128 MiB DDR3 RAM
- 256MiB Nand
- USBOTG1 peripheral - fastboot.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Ok, thanks - I drop the old one and merge this into u-boot.imx (ok, I had to rebase it, I hope this does not create many issues). I send a PR to Tom now.

Thank you

Michael

Quoted 11 lines

Regards,
Stefano

--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================

Signature · 11 lines
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
[email protected]
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
[email protected]
www.amarulasolutions.com