imx: imx6ul: Add support for Kontron Electronics SL/BL i.MX6UL/ULL boards (N63xx/N64xx)
Subsystems (3)
PATCH v4 1/2 imx: imx6ul: Add support for Kontron Electronics SL/BL i.MX6UL/ULL boards (N63xx/N64xx)
From: Frieder Schrempf <[email protected]>
This adds support for i.MX6UL/ULL-based evaluation kits with SoMs by Kontron Electronics GmbH.
Currently there are the following SoM flavors (SoM-Line):
* N6310: SOM with i.MX6UL-2, 256MB RAM, 256MB SPI NAND
* N6311: SOM with i.MX6UL-2, 512MB RAM, 512MB SPI NAND
* N6411: SOM with i.MX6ULL, 512MB RAM, 512MB SPI NAND
And the according evaluation boards (Board-Line):
* N6310-S: Baseboard with SOM N6310, eMMC, display (optional), ...
* N6311-S: Baseboard with SOM N6311, eMMC, display (optional), ...
* N6411-S: Baseboard with SOM N6411, eMMC, display (optional), ...
Currently U-Boot describes i.MX6UL and i.MX6ULL through separate config options at compile-time. Though the differences are so minor, that for the scope of these SoMs we just use a single defconfig that is compatible with both SoCs.
---
Fixes in v4:
* Fix checkpatch errors/warnings
* Stop disabling initrd/fdt relocation
Fixes in v3:
* Guard binman nodes to fix build of other UL boards
Fixes in v2:
* Add MAINTAINERS file
* Rename board directory
* Use binman to generate FIT
* Support legacy images
* Add Stefano's R-b tag
--- arch/arm/dts/Makefile | 4 +- .../dts/imx6ul-kontron-n631x-s-u-boot.dtsi | 7 + arch/arm/dts/imx6ul-kontron-n631x-s.dts | 17 + arch/arm/dts/imx6ul-kontron-n631x-som.dtsi | 14 + .../dts/imx6ul-kontron-n6x1x-s-u-boot.dtsi | 98 ++++ arch/arm/dts/imx6ul-kontron-n6x1x-s.dts | 423 ++++++++++++++++++ arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi | 420 +++++++++++++++++ .../dts/imx6ul-kontron-n6x1x-som-common.dtsi | 124 +++++ .../dts/imx6ull-kontron-n641x-s-u-boot.dtsi | 7 + arch/arm/dts/imx6ull-kontron-n641x-s.dts | 16 + arch/arm/dts/imx6ull-kontron-n641x-som.dtsi | 13 + arch/arm/mach-imx/mx6/Kconfig | 9 + board/kontron/sl-mx6ul/Kconfig | 15 + board/kontron/sl-mx6ul/MAINTAINERS | 9 + board/kontron/sl-mx6ul/Makefile | 8 + board/kontron/sl-mx6ul/kontron_mx6ul.c | 85 ++++ board/kontron/sl-mx6ul/spl.c | 377 ++++++++++++++++ configs/kontron_mx6ul_defconfig | 109 +++++ include/configs/kontron_common.h | 84 ++++ include/configs/kontron_mx6ul.h | 52 +++ 20 files changed, 1890 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n631x-s.dts create mode 100644 arch/arm/dts/imx6ul-kontron-n631x-som.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s.dts create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi create mode 100644 arch/arm/dts/imx6ull-kontron-n641x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ull-kontron-n641x-s.dts create mode 100644 arch/arm/dts/imx6ull-kontron-n641x-som.dtsi create mode 100644 board/kontron/sl-mx6ul/Kconfig create mode 100644 board/kontron/sl-mx6ul/MAINTAINERS create mode 100644 board/kontron/sl-mx6ul/Makefile create mode 100644 board/kontron/sl-mx6ul/kontron_mx6ul.c create mode 100644 board/kontron/sl-mx6ul/spl.c create mode 100644 configs/kontron_mx6ul_defconfig create mode 100644 include/configs/kontron_common.h create mode 100644 include/configs/kontron_mx6ul.h
arch/arm/dts/Makefile +3 -1
@@ -811,7 +811,9 @@ dtb-$(CONFIG_MX6UL) += \ imx6ul-liteboard.dtb \ imx6ul-phytec-segin-ff-rdk-nand.dtb \ imx6ul-pico-hobbit.dtb \ - imx6ul-pico-pi.dtb + imx6ul-pico-pi.dtb \ + imx6ul-kontron-n631x-s.dtb \ + imx6ull-kontron-n641x-s.dtb dtb-$(CONFIG_MX6ULL) += \ imx6ull-14x14-evk.dtb \
arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi new file +7 -0
@@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2017 exceet electronics GmbH + * Copyright (C) 2018 Kontron Electronics GmbH + */ + +#include "imx6ul-kontron-n6x1x-s-u-boot.dtsi"
arch/arm/dts/imx6ul-kontron-n631x-s.dts new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2017 exceet electronics GmbH + * Copyright (C) 2018 Kontron Electronics GmbH + * Copyright (c) 2019 Krzysztof Kozlowski <[email protected]> + */ + +/dts-v1/; + +#include "imx6ul-kontron-n631x-som.dtsi" +#include "imx6ul-kontron-n6x1x-s.dtsi" + +/ { + model = "Kontron N631X S"; + compatible = "kontron,imx6ul-n631x-s", "kontron,imx6ul-n631x-som", + "fsl,imx6ul"; +};
arch/arm/dts/imx6ul-kontron-n631x-som.dtsi new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2017 exceet electronics GmbH + * Copyright (C) 2018 Kontron Electronics GmbH + * Copyright (c) 2019 Krzysztof Kozlowski <[email protected]> + */ + +#include "imx6ul.dtsi" +#include "imx6ul-kontron-n6x1x-som-common.dtsi" + +/ { + model = "Kontron N631X SOM"; + compatible = "kontron,imx6ul-n631x-som", "fsl,imx6ul"; +};
arch/arm/dts/imx6ul-kontron-n6x1x-s-u-boot.dtsi new file +98 -0
98 lines not on this page · raw message
arch/arm/dts/imx6ul-kontron-n6x1x-s.dts new file +423 -0
423 lines not on this page · raw message
arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi new file +420 -0
420 lines not on this page · raw message
arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi new file +124 -0
124 lines not on this page · raw message
arch/arm/dts/imx6ull-kontron-n641x-s-u-boot.dtsi new file +7 -0
@@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2017 exceet electronics GmbH + * Copyright (C) 2018 Kontron Electronics GmbH + */ + +#include "imx6ul-kontron-n6x1x-s-u-boot.dtsi"
arch/arm/dts/imx6ull-kontron-n641x-s.dts new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2017 exceet electronics GmbH + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +/dts-v1/; + +#include "imx6ull-kontron-n641x-som.dtsi" +#include "imx6ul-kontron-n6x1x-s.dtsi" + +/ { + model = "Kontron N641X S"; + compatible = "kontron,imx6ull-n641x-s", "kontron,imx6ull-n641x-som", + "fsl,imx6ull"; +};
arch/arm/dts/imx6ull-kontron-n641x-som.dtsi new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2017 exceet electronics GmbH + * Copyright (C) 2018 Kontron Electronics GmbH + */ + +#include "imx6ull.dtsi" +#include "imx6ul-kontron-n6x1x-som-common.dtsi" + +/ { + model = "Kontron N641X SOM"; + compatible = "kontron,imx6ull-n641x-som", "fsl,imx6ull"; +};
arch/arm/mach-imx/mx6/Kconfig +9 -0
@@ -231,6 +231,14 @@ config TARGET_GW_VENTANA imply CMD_SATA imply CMD_SPL +config TARGET_KONTRON_MX6UL + bool "Kontron Electronics SL/BL i.MX6UL/ULL (N63xx/N64xx)" + depends on MX6UL + select DM + select DM_THERMAL + select SUPPORT_SPL + imply CMD_DM + config TARGET_KOSAGI_NOVENA bool "Kosagi Novena" select BOARD_LATE_INIT
@@ -671,6 +679,7 @@ source "board/grinn/liteboard/Kconfig" source "board/phytec/pcm058/Kconfig" source "board/phytec/pcl063/Kconfig" source "board/gateworks/gw_ventana/Kconfig" +source "board/kontron/sl-mx6ul/Kconfig" source "board/kosagi/novena/Kconfig" source "board/softing/vining_2000/Kconfig" source "board/liebherr/display5/Kconfig"
board/kontron/sl-mx6ul/Kconfig new file +15 -0
@@ -0,0 +1,15 @@ +if TARGET_KONTRON_MX6UL + +config SYS_BOARD + string + default "sl-mx6ul" + +config SYS_VENDOR + string + default "kontron" + +config SYS_CONFIG_NAME + string + default "kontron_mx6ul" + +endif
board/kontron/sl-mx6ul/MAINTAINERS new file +9 -0
@@ -0,0 +1,9 @@ +Kontron SL/BL i.MX6UL/ULL Boards (N63xx/N64xx) +M: Frieder Schrempf <[email protected]> +S: Maintained +F: arch/arm/dts/imx6ul-kontron-n631x- +F: arch/arm/dts/imx6ul-kontron-n6x1x- +F: arch/arm/dts/imx6ull-kontron-n641x- +F: board/kontron/sl-mx6ul +F: configs/kontron_mx6ul_defconfig +F: include/configs/kontron_mx6ul.h
board/kontron/sl-mx6ul/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2018 Kontron Electronics GmbH + +ifdef CONFIG_SPL_BUILD +obj-y := spl.o +else +obj-y := kontron_mx6ul.o +endif
board/kontron/sl-mx6ul/kontron_mx6ul.c new file +85 -0
85 lines not on this page · raw message
board/kontron/sl-mx6ul/spl.c new file +377 -0
377 lines not on this page · raw message
configs/kontron_mx6ul_defconfig new file +109 -0
109 lines not on this page · raw message
include/configs/kontron_common.h new file +84 -0
84 lines not on this page · raw message
include/configs/kontron_mx6ul.h new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v4 2/2 imx: imx8mm: Add support for Kontron Electronics SL/BL i.MX8M-Mini boards (N801x)
From: Frieder Schrempf <[email protected]>
The Kontron SoM-Line i.MX8MM (N801x) by Kontron Electronics GmbH is a SoM module with an i.MX8M-Mini SoC, 1/2/4 GB LPDDR4 RAM, SPI NOR, eMMC and PMIC.
The matching evaluation boards (Board-Line) have 2 Ethernets, USB 2.0, HDMI/LVDS, SD card, CAN, RS485 and much more.
---
Fixes in v4:
* Fix checkpatch errors/warnings
Fixes in v3:
* None
Fixes in v2:
* Fix header includes in spl.c
* Add MAINTAINERS file
* Rename board directory
* Add Stefano's R-b tag
--- arch/arm/dts/Makefile | 2 + arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts | 116 ++ .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 236 +++ arch/arm/dts/imx8mm-kontron-n801x-s.dts | 388 ++++ arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 298 +++ arch/arm/mach-imx/imx8m/Kconfig | 8 + board/kontron/sl-mx8mm/Kconfig | 15 + board/kontron/sl-mx8mm/MAINTAINERS | 7 + board/kontron/sl-mx8mm/Makefile | 9 + board/kontron/sl-mx8mm/imximage.cfg | 9 + board/kontron/sl-mx8mm/kontron_mx8mm.c | 99 + board/kontron/sl-mx8mm/lpddr4_timing.c | 1844 +++++++++++++++++ board/kontron/sl-mx8mm/spl.c | 321 +++ configs/kontron_mx8mm_defconfig | 124 ++ include/configs/kontron_mx8mm.h | 67 + 15 files changed, 3543 insertions(+) create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s.dts create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-som.dtsi create mode 100644 board/kontron/sl-mx8mm/Kconfig create mode 100644 board/kontron/sl-mx8mm/MAINTAINERS create mode 100644 board/kontron/sl-mx8mm/Makefile create mode 100644 board/kontron/sl-mx8mm/imximage.cfg create mode 100644 board/kontron/sl-mx8mm/kontron_mx8mm.c create mode 100644 board/kontron/sl-mx8mm/lpddr4_timing.c create mode 100644 board/kontron/sl-mx8mm/spl.c create mode 100644 configs/kontron_mx8mm_defconfig create mode 100644 include/configs/kontron_mx8mm.h
arch/arm/dts/Makefile +2 -0
@@ -868,6 +868,8 @@ dtb-$(CONFIG_ARCH_IMX8M) += \ imx8mm-evk.dtb \ imx8mm-icore-mx8mm-ctouch2.dtb \ imx8mm-icore-mx8mm-edimm2.2.dtb \ + imx8mm-kontron-n801x-s.dtb \ + imx8mm-kontron-n801x-s-lvds.dtb \ imx8mm-venice.dtb \ imx8mm-venice-gw71xx-0x.dtb \ imx8mm-venice-gw72xx-0x.dtb \
arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts new file +116 -0
116 lines not on this page · raw message
arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi new file +236 -0
236 lines not on this page · raw message
arch/arm/dts/imx8mm-kontron-n801x-s.dts new file +388 -0
388 lines not on this page · raw message
arch/arm/dts/imx8mm-kontron-n801x-som.dtsi new file +298 -0
298 lines not on this page · raw message
arch/arm/mach-imx/imx8m/Kconfig +8 -0
@@ -75,6 +75,13 @@ config TARGET_IMX8MM_VENICE select SUPPORT_SPL select IMX8M_LPDDR4 +config TARGET_KONTRON_MX8MM + bool "Kontron Electronics N80xx" + select BINMAN + select IMX8MM + select SUPPORT_SPL + select IMX8M_LPDDR4 + config TARGET_IMX8MN_EVK bool "imx8mn LPDDR4 EVK board" select BINMAN
@@ -150,6 +157,7 @@ source "board/freescale/imx8mn_evk/Kconfig" source "board/freescale/imx8mp_evk/Kconfig" source "board/gateworks/venice/Kconfig" source "board/google/imx8mq_phanbell/Kconfig" +source "board/kontron/sl-mx8mm/Kconfig" source "board/phytec/phycore_imx8mm/Kconfig" source "board/phytec/phycore_imx8mp/Kconfig" source "board/ronetix/imx8mq-cm/Kconfig"
board/kontron/sl-mx8mm/Kconfig new file +15 -0
@@ -0,0 +1,15 @@ +if TARGET_KONTRON_MX8MM + +config SYS_BOARD + string + default "sl-mx8mm" + +config SYS_VENDOR + string + default "kontron" + +config SYS_CONFIG_NAME + string + default "kontron_mx8mm" + +endif
board/kontron/sl-mx8mm/MAINTAINERS new file +7 -0
@@ -0,0 +1,7 @@ +Kontron SL/BL i.MX8M Mini Boards (N801x) +M: Frieder Schrempf <[email protected]> +S: Maintained +F: arch/arm/dts/imx8mm-kontron-n801x-* +F: board/kontron/sl-mx8mm +F: configs/kontron_mx8mm_defconfig +F: include/configs/kontron_mx8mm.h
board/kontron/sl-mx8mm/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2019 Kontron Electronics GmbH + +obj-y := kontron_mx8mm.o + +ifdef CONFIG_SPL_BUILD +obj-y += spl.o +obj-$(CONFIG_IMX8M_LPDDR4) += lpddr4_timing.o +endif
board/kontron/sl-mx8mm/imximage.cfg new file +9 -0
@@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Kontron Electronics GmbH + */ + +#define __ASSEMBLY__ + +BOOT_FROM sd +LOADER mkimage.flash.mkimage 0x7E1000
board/kontron/sl-mx8mm/kontron_mx8mm.c new file +99 -0
99 lines not on this page · raw message
board/kontron/sl-mx8mm/lpddr4_timing.c new file +1844 -0
1,795 lines not on this page · raw message
board/kontron/sl-mx8mm/spl.c new file +321 -0
321 lines not on this page · raw message
configs/kontron_mx8mm_defconfig new file +124 -0
124 lines not on this page · raw message
include/configs/kontron_mx8mm.h new file +67 -0
67 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
Re: [PATCH v4 2/2] imx: imx8mm: Add support for Kontron Electronics SL/BL i.MX8M-Mini boards (N801x)
Hi Frieder,
Am 2021-07-21 10:03, schrieb Frieder Schrempf:
Quoted 23 lines
From: Frieder Schrempf <[email protected]>
The Kontron SoM-Line i.MX8MM (N801x) by Kontron Electronics GmbH is a SoM module with an i.MX8M-Mini SoC, 1/2/4 GB LPDDR4 RAM, SPI NOR, eMMC and PMIC.
The matching evaluation boards (Board-Line) have 2 Ethernets, USB 2.0, HDMI/LVDS,
SD card, CAN, RS485 and much more.Signed-off-by Frieder Schrempf <[email protected]>Reviewed-by Stefano Babic <[email protected]>---
Fixes in v4:
* Fix checkpatch errors/warningsFixes in v3:
* NoneFixes in v2:
* Fix header includes inspl.c
* AddMAINTAINERSfile
* Rename board directory
* Add Stefano's R-b tag
Quoted 12 lines
--- arch/arm/dts/Makefile | 2 + arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts | 116 ++ .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 236 +++ arch/arm/dts/imx8mm-kontron-n801x-s.dts | 388 ++++ arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 298 +++ arch/arm/mach-imx/imx8m/Kconfig | 8 + board/kontron/sl-mx8mm/Kconfig | 15 + board/kontron/sl-mx8mm/MAINTAINERS | 7 + board/kontron/sl-mx8mm/Makefile | 9 + board/kontron/sl-mx8mm/imximage.cfg | 9 + board/kontron/sl-mx8mm/kontron_mx8mm.c | 99 +
mx8mm.c please
Quoted 4 lines
board/kontron/sl-mx8mm/lpddr4_timing.c | 1844 +++++++++++++++++ board/kontron/sl-mx8mm/spl.c | 321 +++ configs/kontron_mx8mm_defconfig | 124 ++ include/configs/kontron_mx8mm.h | 67 +
no doc/board/kontron/mx8mm.rst?
-michael
Re: [PATCH v4 2/2] imx: imx8mm: Add support for Kontron Electronics SL/BL i.MX8M-Mini boards (N801x)
Hi Michael,
Quoted 39 lines · Michael Walle
Hi Frieder,
Am 2021-07-21 10:03, schrieb Frieder Schrempf:
Quoted 27 lines
From: Frieder Schrempf <[email protected]>
The Kontron SoM-Line i.MX8MM (N801x) by Kontron Electronics GmbH is a SoM module with an i.MX8M-Mini SoC, 1/2/4 GB LPDDR4 RAM, SPI NOR, eMMC and PMIC.
The matching evaluation boards (Board-Line) have 2 Ethernets, USB 2.0, HDMI/LVDS,
SD card, CAN, RS485 and much more.Signed-off-by Frieder Schrempf <[email protected]>Reviewed-by Stefano Babic <[email protected]>---
Fixes in v4:
* Fix checkpatch errors/warningsFixes in v3:
* NoneFixes in v2:
* Fix header includes inspl.c
* AddMAINTAINERSfile
* Rename board directory
* Add Stefano's R-b tag
---
arch/arm/dts/Makefile | 2 + arch/arm/dts/imx8mm-kontron-n801x-s-lvds.dts | 116 ++ .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 236 +++Quoted 8 lines
arch/arm/dts/imx8mm-kontron-n801x-s.dts | 388 ++++ arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 298 +++ arch/arm/mach-imx/imx8m/Kconfig | 8 + board/kontron/sl-mx8mm/Kconfig | 15 + board/kontron/sl-mx8mm/MAINTAINERS | 7 + board/kontron/sl-mx8mm/Makefile | 9 + board/kontron/sl-mx8mm/imximage.cfg | 9 + board/kontron/sl-mx8mm/kontron_mx8mm.c | 99 +
Quoted 1 line
mx8mm.cplease
See comment on patch 1. Will change it to sl-mx8mm.c.
Quoted 7 lines
Quoted 5 lines
board/kontron/sl-mx8mm/lpddr4_timing.c | 1844 +++++++++++++++++ board/kontron/sl-mx8mm/spl.c | 321 +++ configs/kontron_mx8mm_defconfig | 124 ++ include/configs/kontron_mx8mm.h | 67 +
no
doc/board/kontron/mx8mm.rst?
I will add it.
Thanks
Frieder
Quoted 22 lines · Frieder Schrempf
From: Frieder Schrempf <[email protected]>
This adds support for i.MX6UL/ULL-based evaluation kits with SoMs by Kontron Electronics GmbH.
Currently there are the following SoM flavors (SoM-Line):
* N6310: SOM with i.MX6UL-2, 256MB RAM, 256MB SPI NAND
* N6311: SOM with i.MX6UL-2, 512MB RAM, 512MB SPI NAND
* N6411: SOM with i.MX6ULL, 512MB RAM, 512MB SPI NANDAnd the according evaluation boards (Board-Line):
* N6310-S: Baseboard with SOM N6310, eMMC, display (optional), ...
* N6311-S: Baseboard with SOM N6311, eMMC, display (optional), ...
* N6411-S: Baseboard with SOM N6411, eMMC, display (optional), ...Currently U-Boot describes i.MX6UL and i.MX6ULL through separate config options at compile-time. Though the differences are so minor, that for the scope of these SoMs we just use a single defconfig that is compatible with both SoCs.
Signed-off-by Frieder Schrempf <[email protected]>Reviewed-by Stefano Babic <[email protected]>
[snip]
include/configs/kontron_common.h line 71
Quoted 13 lines
include/configs/kontron_common.h new file +13
-0+/* +* ####################################### +* ### ENVIRONMENT ### +* ####################################### +*/ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "bootargs_base=" KONTRON_ENV_KERNEL_MTDPARTS "\0" \ + "script=boot.scr\0" \ + "kernel_addr_r=" KONTRON_ENV_KERNEL_ADDR "\0" \ + "fdt_addr_r=" KONTRON_ENV_FDT_ADDR "\0" \ + "ramdisk_addr_r=" KONTRON_ENV_RAMDISK_ADDR "\0" \ + "pxefile_addr_r=" KONTRON_ENV_PXE_ADDR "\0" \ + "scriptaddr=" KONTRON_ENV_PXE_ADDR "\0" \
I assume there's more platforms coming in, and thus the common and mx6 split. But I still see some problems.
include/configs/kontron_common.h line 77
Quoted 6 lines
include/configs/kontron_common.h new file +6
-0+"bootdir=\0" \ +"bootdelay=3\0" \ +"ipaddr=192.168.1.11\0" \ +"serverip=192.168.1.10\0" \ +"gatewayip=192.168.1.10\0" \ +"netmask=255.255.255.0\0" \
It's really really frowned upon to put the ipaddr/etc in to the hard-coded default environment. Is this absolutely necessary?
[snip]
Quoted 1 line
+#define
KONTRON_ENV_KERNEL_MTDPARTS"mtdparts=spi1.0:128k(spl),832k(u-boot),64k(env);spi4.0:192m(rootfs),-(user)"
This should just be in the device tree (for Linux!) and we should be parsing that.
include/configs/kontron_mx6ul.h line 24
Quoted 2 lines
include/configs/kontron_mx6ul.h new file +2
-0+#define KONTRON_ENV_KERNEL_ADDR "0x82000000" +#define KONTRON_ENV_FDT_ADDR "0x83000000"
16MB for kernel + BSS is very very small. You're likely to hit overlaps.
include/configs/kontron_mx6ul.h line 26
Quoted 2 lines
include/configs/kontron_mx6ul.h new file +2
-0+#define KONTRON_ENV_PXE_ADDR "0x83100000" +#define KONTRON_ENV_RAMDISK_ADDR "0x83200000"
What is the smallest amount of memory you need to work with on these platforms? The header I referenced in the other thread spells out a bunch of safe sizes / offsets to use, but that can be tricky on smaller memory platforms.
Signature · 1 line
Tom
Hi Tom,
Quoted 24 lines · Tom Rini
Quoted 22 lines · Frieder Schrempf
From: Frieder Schrempf <[email protected]>
This adds support for i.MX6UL/ULL-based evaluation kits with SoMs by Kontron Electronics GmbH.
Currently there are the following SoM flavors (SoM-Line):
* N6310: SOM with i.MX6UL-2, 256MB RAM, 256MB SPI NAND
* N6311: SOM with i.MX6UL-2, 512MB RAM, 512MB SPI NAND
* N6411: SOM with i.MX6ULL, 512MB RAM, 512MB SPI NANDAnd the according evaluation boards (Board-Line):
* N6310-S: Baseboard with SOM N6310, eMMC, display (optional), ...
* N6311-S: Baseboard with SOM N6311, eMMC, display (optional), ...
* N6411-S: Baseboard with SOM N6411, eMMC, display (optional), ...Currently U-Boot describes i.MX6UL and i.MX6ULL through separate config options at compile-time. Though the differences are so minor, that for the scope of these SoMs we just use a single defconfig that is compatible with both SoCs.
Signed-off-by Frieder Schrempf <[email protected]>Reviewed-by Stefano Babic <[email protected]>[snip]
Quoted 16 lines
include/configs/kontron_common.h line 71
Quoted 13 lines
include/configs/kontron_common.h new file +13
-0+/* +* ####################################### +* ### ENVIRONMENT ### +* ####################################### +*/ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "bootargs_base=" KONTRON_ENV_KERNEL_MTDPARTS "\0" \ + "script=boot.scr\0" \ + "kernel_addr_r=" KONTRON_ENV_KERNEL_ADDR "\0" \ + "fdt_addr_r=" KONTRON_ENV_FDT_ADDR "\0" \ + "ramdisk_addr_r=" KONTRON_ENV_RAMDISK_ADDR "\0" \ + "pxefile_addr_r=" KONTRON_ENV_PXE_ADDR "\0" \ + "scriptaddr=" KONTRON_ENV_PXE_ADDR "\0" \I assume there's more platforms coming in, and thus the common and mx6 split. But I still see some problems.
Yes, probably. But I admit that the use of the shared header file is rather limited. I'm thinking of getting rid of it in the next iteration of this patch.
Quoted 10 lines
include/configs/kontron_common.h line 77
Quoted 7 lines
include/configs/kontron_common.h new file +6
-0+"bootdir=\0" \ +"bootdelay=3\0" \ +"ipaddr=192.168.1.11\0" \ +"serverip=192.168.1.10\0" \ +"gatewayip=192.168.1.10\0" \ +"netmask=255.255.255.0\0" \It's really really frowned upon to put the ipaddr/etc in to the hard-coded default environment. Is this absolutely necessary?
Indeed! No it's not necessary and it's rather a historical relict. I will remove all those variables.
Quoted 5 lines
[snip]
Quoted 1 line
+#define
KONTRON_ENV_KERNEL_MTDPARTS"mtdparts=spi1.0:128k(spl),832k(u-boot),64k(env);spi4.0:192m(rootfs),-(user)"This should just be in the device tree (for Linux!) and we should be parsing that.
Agree, I will also remove this.
Quoted 7 lines
include/configs/kontron_mx6ul.h line 24
Quoted 3 lines
include/configs/kontron_mx6ul.h new file +2
-0+#define KONTRON_ENV_KERNEL_ADDR "0x82000000" +#define KONTRON_ENV_FDT_ADDR "0x83000000"16MB for kernel + BSS is very very small. You're likely to hit overlaps.
Quoted 7 lines
include/configs/kontron_mx6ul.h line 26
Quoted 2 lines
include/configs/kontron_mx6ul.h new file +2
-0+#define KONTRON_ENV_PXE_ADDR "0x83100000" +#define KONTRON_ENV_RAMDISK_ADDR "0x83200000"What is the smallest amount of memory you need to work with on these platforms? The header I referenced in the other thread spells out a bunch of safe sizes / offsets to use, but that can be tricky on smaller memory platforms.
As this board has a minimum of 256 MB DDR, I think I will just use the layout from the reference you provided.
Thanks for reviewing!
Frieder
Am 2021-07-21 10:03, schrieb Frieder Schrempf:
Quoted 45 lines
From: Frieder Schrempf <[email protected]>
This adds support for i.MX6UL/ULL-based evaluation kits with SoMs by Kontron Electronics GmbH.
Currently there are the following SoM flavors (SoM-Line):
* N6310: SOM with i.MX6UL-2, 256MB RAM, 256MB SPI NAND
* N6311: SOM with i.MX6UL-2, 512MB RAM, 512MB SPI NAND
* N6411: SOM with i.MX6ULL, 512MB RAM, 512MB SPI NANDAnd the according evaluation boards (Board-Line):
* N6310-S: Baseboard with SOM N6310, eMMC, display (optional), ...
* N6311-S: Baseboard with SOM N6311, eMMC, display (optional), ...
* N6411-S: Baseboard with SOM N6411, eMMC, display (optional), ...Currently U-Boot describes i.MX6UL and i.MX6ULL through separate config options at compile-time. Though the differences are so minor, that for the scope of these SoMs we just use a single defconfig that is compatible with both SoCs.
Signed-off-by Frieder Schrempf <[email protected]>Reviewed-by Stefano Babic <[email protected]>---
Fixes in v4:
* Fix checkpatch errors/warnings
* Stop disabling initrd/fdt relocationFixes in v3:
* Guard binman nodes to fix build of other UL boardsFixes in v2:
* AddMAINTAINERSfile
* Rename board directory
* Use binman to generate FIT
* Support legacy images
* Add Stefano's R-b tag--- arch/arm/dts/Makefile | 4 +- .../dts/imx6ul-kontron-n631x-s-u-boot.dtsi | 7 + arch/arm/dts/imx6ul-kontron-n631x-s.dts | 17 + arch/arm/dts/imx6ul-kontron-n631x-som.dtsi | 14 + .../dts/imx6ul-kontron-n6x1x-s-u-boot.dtsi | 98 ++++ arch/arm/dts/imx6ul-kontron-n6x1x-s.dts | 423 ++++++++++++++++++ arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi | 420 +++++++++++++++++ .../dts/imx6ul-kontron-n6x1x-som-common.dtsi | 124 +++++
Quoted 8 lines
.../dts/imx6ull-kontron-n641x-s-u-boot.dtsi | 7 + arch/arm/dts/imx6ull-kontron-n641x-s.dts | 16 + arch/arm/dts/imx6ull-kontron-n641x-som.dtsi | 13 + arch/arm/mach-imx/mx6/Kconfig | 9 + board/kontron/sl-mx6ul/Kconfig | 15 + board/kontron/sl-mx6ul/MAINTAINERS | 9 + board/kontron/sl-mx6ul/Makefile | 8 + board/kontron/sl-mx6ul/kontron_mx6ul.c | 85 ++++
Can we name that just mx6ul.c and drop the kontron prefix? Just for consitency reasons.
Quoted 4 lines
board/kontron/sl-mx6ul/spl.c | 377 ++++++++++++++++ configs/kontron_mx6ul_defconfig | 109 +++++ include/configs/kontron_common.h | 84 ++++ include/configs/kontron_mx6ul.h | 52 +++
no README in doc/board/kontron/...?
Quoted 42 lines
20 files changed, 1890 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n631x-s.dts create mode 100644 arch/arm/dts/imx6ul-kontron-n631x-som.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s.dts create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi create mode 100644 arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsi create mode 100644 arch/arm/dts/imx6ull-kontron-n641x-s-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ull-kontron-n641x-s.dts create mode 100644 arch/arm/dts/imx6ull-kontron-n641x-som.dtsi create mode 100644 board/kontron/sl-mx6ul/Kconfig create mode 100644 board/kontron/sl-mx6ul/MAINTAINERS create mode 100644 board/kontron/sl-mx6ul/Makefile create mode 100644 board/kontron/sl-mx6ul/kontron_mx6ul.c create mode 100644 board/kontron/sl-mx6ul/spl.c create mode 100644 configs/kontron_mx6ul_defconfig create mode 100644 include/configs/kontron_common.h create mode 100644 include/configs/kontron_mx6ul.harch/arm/dts/Makefile +3
-1@@ -811,7 +811,9 @@ dtb-$(CONFIG_MX6UL) += \ imx6ul-liteboard.dtb \ imx6ul-phytec-segin-ff-rdk-nand.dtb \ imx6ul-pico-hobbit.dtb \ - imx6ul-pico-pi.dtb + imx6ul-pico-pi.dtb \ + imx6ul-kontron-n631x-s.dtb \ + imx6ull-kontron-n641x-s.dtb dtb-$(CONFIG_MX6ULL) += \ imx6ull-14x14-evk.dtb \arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi new file +0
-0
arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi line 4
Quoted 4 lines
arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi new file +4
-0@@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2017 exceet electronics GmbH + * Copyright (C) 2018 Kontron Electronics GmbH
2021? I don't know how that is handled in u-boot though.
[..]
Quoted 294 lines
board/kontron/sl-mx6ul/spl.c new file +110
-0@@ -0,0 +1,377 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2018 Kontron Electronics GmbH +*/ + +#include <asm/arch/clock.h> +#include <asm/arch/crm_regs.h> +#include <asm/arch/mx6-pins.h> +#include <asm/arch/sys_proto.h> +#include <asm/global_data.h> +#include <asm/gpio.h> +#include <asm/io.h> +#include <asm/mach-imx/iomux-v3.h> +#include <fsl_esdhc_imx.h> +#include <init.h> +#include <linux/delay.h> +#include <linux/sizes.h> +#include <linux/errno.h> +#include <mmc.h> + +DECLARE_GLOBAL_DATA_PTR ; + +enum { +BOARD_TYPE_KTN_N631X =1 , +BOARD_TYPE_KTN_N641X , +BOARD_TYPE_MAX +}; + +#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ + PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) + +#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ + PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ + PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) + +#define USDHC_CD_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ + PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_LOW | \ + PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) + +#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) + +#include <spl.h> +#include <asm/arch/mx6-ddr.h> + +static iomux_v3_cfg_t const usdhc1_pads[] = { +MX6_PAD_SD1_CLK__USDHC1_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_SD1_CMD__USDHC1_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_SD1_DATA0__USDHC1_DATA0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_SD1_DATA1__USDHC1_DATA1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_SD1_DATA2__USDHC1_DATA2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_SD1_DATA3__USDHC1_DATA3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), + +/* CD */ +MX6_PAD_UART1_RTS_B__GPIO1_IO19 |MUX_PAD_CTRL (USDHC_CD_PAD_CTRL ), +}; + +#define USDHC1_CD_GPIO IMX_GPIO_NR(1, 19) + +static iomux_v3_cfg_t const usdhc2_pads[] = { +MX6_PAD_NAND_RE_B__USDHC2_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_NAND_WE_B__USDHC2_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_NAND_DATA00__USDHC2_DATA0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_NAND_DATA01__USDHC2_DATA1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_NAND_DATA02__USDHC2_DATA2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +MX6_PAD_NAND_DATA03__USDHC2_DATA3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +/* RST */ +MX6_PAD_NAND_ALE__GPIO4_IO10 |MUX_PAD_CTRL (NO_PAD_CTRL ), +}; + +#define USDHC2_PWR_GPIO IMX_GPIO_NR(4, 10) + +static struct fsl_esdhc_cfg usdhc_cfg[2 ] = { + {USDHC1_BASE_ADDR ,0 ,4 }, + {USDHC2_BASE_ADDR ,0 ,4 }, +}; + +int board_mmc_getcd (struct mmc *mmc) +{ +struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; +int ret =0 ; + +switch (cfg->esdhc_base) { +case USDHC1_BASE_ADDR : + ret = !gpio_get_value (USDHC1_CD_GPIO ); +break ; +case USDHC2_BASE_ADDR : +// This SDHC interface does not use a CD pin + ret =1 ; +break ; + } + +return ret; +} + +int board_mmc_init (struct bd_info *bis) +{ +int i, ret; + +/* +* According to the board_mmc_init() the following map is done: +* (U-boot device node) (Physical Port) +* mmc0 USDHC1 +* mmc1 USDHC2 +*/ +for (i =0 ; i <CONFIG_SYS_FSL_USDHC_NUM ; i++) { +switch (i) { +case 0 : + imx_iomux_v3_setup_multiple_pads(usdhc1_pads,
ARRAY_SIZE(usdhc1_pads));board/kontron/sl-mx6ul/spl.c new file +5
-0+gpio_direction_input (USDHC1_CD_GPIO ); + usdhc_cfg[0 ].sdhc_clk =mxc_get_clock (MXC_ESDHC_CLK ); +break ; +case 1 : + imx_iomux_v3_setup_multiple_pads(usdhc2_pads,
ARRAY_SIZE(usdhc2_pads));board/kontron/sl-mx6ul/spl.c new file +7
-0+gpio_direction_output (USDHC2_PWR_GPIO ,0 ); +udelay (500 ); +gpio_direction_output (USDHC2_PWR_GPIO ,1 ); + usdhc_cfg[1 ].sdhc_clk =mxc_get_clock (MXC_ESDHC2_CLK ); +break ; +default : + printf("Warning: you configured more USDHC controllers (%d) thansupported by the board\n",
board/kontron/sl-mx6ul/spl.c new file +31
-0+ i + 1); +return -EINVAL ; + } + + ret =fsl_esdhc_initialize (bis, &usdhc_cfg[i]); +if (ret) { +printf ("Warning: failed to initialize mmc dev %d\n" , i); +return ret; + } + } +return 0 ; +} + +iomux_v3_cfg_t const ecspi2_pads[] = { +MX6_PAD_CSI_DATA00__ECSPI2_SCLK |MUX_PAD_CTRL (SPI_PAD_CTRL ), +MX6_PAD_CSI_DATA02__ECSPI2_MOSI |MUX_PAD_CTRL (SPI_PAD_CTRL ), +MX6_PAD_CSI_DATA03__ECSPI2_MISO |MUX_PAD_CTRL (SPI_PAD_CTRL ), +MX6_PAD_CSI_DATA01__GPIO4_IO22 |MUX_PAD_CTRL (NO_PAD_CTRL ), +}; + +int board_spi_cs_gpio (unsigned int bus,unsigned int cs) +{ +return (bus ==CONFIG_SF_DEFAULT_BUS && cs ==CONFIG_SF_DEFAULT_CS ) + ? (IMX_GPIO_NR (4 ,22 )) :-1 ; +} + +static void setup_spi (void ) +{ +gpio_request (IMX_GPIO_NR (4 ,22 ),"spi2_cs0" ); +gpio_direction_output (IMX_GPIO_NR (4 ,22 ),1 ); + imx_iomux_v3_setup_multiple_pads(ecspi2_pads,
ARRAY_SIZE(ecspi2_pads));board/kontron/sl-mx6ul/spl.c new file +131
-0+ +enable_spi_clk (true,1 ); +} + +static iomux_v3_cfg_t const uart4_pads[] = { +MX6_PAD_UART4_TX_DATA__UART4_DCE_TX |MUX_PAD_CTRL (UART_PAD_CTRL ), +MX6_PAD_UART4_RX_DATA__UART4_DCE_RX |MUX_PAD_CTRL (UART_PAD_CTRL ), +}; + +static void setup_iomux_uart (void ) +{ +imx_iomux_v3_setup_multiple_pads (uart4_pads,ARRAY_SIZE (uart4_pads)); +} + +// DDR 256MB (Hynix H5TQ2G63DFR) +static struct mx6_ddr3_cfg mem_256M_ddr = { + .mem_speed =800 , + .density =2 , + .width =16 , + .banks =8 , + .rowaddr =14 , + .coladdr =10 , + .pagesz =2 , + .trcd =1350 , + .trcmin =4950 , + .trasmin =3600 , +}; + +static struct mx6_mmdc_calibration mx6_mmcd_256M_calib = { + .p0_mpwldectrl0 =0x00000000 , + .p0_mpdgctrl0 =0x01340134 , + .p0_mprddlctl =0x40405052 , + .p0_mpwrdlctl =0x40404E48 , +}; + +// DDR 512MB (Hynix H5TQ4G63DFR) +static struct mx6_ddr3_cfg mem_512M_ddr = { + .mem_speed =800 , + .density =4 , + .width =16 , + .banks =8 , + .rowaddr =15 , + .coladdr =10 , + .pagesz =2 , + .trcd =1350 , + .trcmin =4950 , + .trasmin =3600 , +}; + +static struct mx6_mmdc_calibration mx6_mmcd_512M_calib = { + .p0_mpwldectrl0 =0x00000000 , + .p0_mpdgctrl0 =0X01440144 , + .p0_mprddlctl =0x40405454 , + .p0_mpwrdlctl =0x40404E4C , +}; + +// Common DDR parameters (256MB and 512MB) +static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = { + .grp_addds =0x00000028 , + .grp_ddrmode_ctl =0x00020000 , + .grp_b0ds =0x00000028 , + .grp_ctlds =0x00000028 , + .grp_b1ds =0x00000028 , + .grp_ddrpke =0x00000000 , + .grp_ddrmode =0x00020000 , + .grp_ddr_type =0x000c0000 , +}; + +static struct mx6ul_iomux_ddr_regs mx6_ddr_ioregs = { + .dram_dqm0 =0x00000028 , + .dram_dqm1 =0x00000028 , + .dram_ras =0x00000028 , + .dram_cas =0x00000028 , + .dram_odt0 =0x00000028 , + .dram_odt1 =0x00000028 , + .dram_sdba2 =0x00000000 , + .dram_sdclk_0 =0x00000028 , + .dram_sdqs0 =0x00000028 , + .dram_sdqs1 =0x00000028 , + .dram_reset =0x00000028 , +}; + +struct mx6_ddr_sysinfo ddr_sysinfo = { + .dsize =0 , + .cs_density =20 , + .ncs =1 , + .cs1_mirror =0 , + .rtt_wr =2 , + .rtt_nom =1 ,/* RTT_Nom = RZQ/2 */ + .walat =1 ,/* Write additional latency */ + .ralat =5 ,/* Read additional latency */ + .mif3_mode =3 ,/* Command prediction working mode */ + .bi_on =1 ,/* Bank interleaving enabled */ + .sde_to_rst =0x10 ,/* 14 cycles, 200us (JEDEC default) */ + .rst_to_cke =0x23 ,/* 33 cycles, 500us (JEDEC default) */ + .ddr_type =DDR_TYPE_DDR3 , + .refsel =0 ,/* Refresh cycles at 64KHz */ + .refr =1 ,/* 2 refresh commands per refresh cycle */ +}; + +static void ccgr_init (void ) +{ +struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ; + +writel (0xFFFFFFFF , &ccm->CCGR0); +writel (0xFFFFFFFF , &ccm->CCGR1); +writel (0xFFFFFFFF , &ccm->CCGR2); +writel (0xFFFFFFFF , &ccm->CCGR3); +writel (0xFFFFFFFF , &ccm->CCGR4); +writel (0xFFFFFFFF , &ccm->CCGR5); +writel (0xFFFFFFFF , &ccm->CCGR6); +writel (0xFFFFFFFF , &ccm->CCGR7); +} + +static void spl_dram_init (void ) +{ +unsigned int size; + +// DDR RAM connection is always 16 bit wide. Init IOs. +mx6ul_dram_iocfg (16 , &mx6_ddr_ioregs, &mx6_grp_ioregs); + +// Try to detect the 512MB RAM chip first. +mx6_dram_cfg (&ddr_sysinfo, &mx6_mmcd_512M_calib, &mem_512M_ddr); + +// Get the available RAM size + size =get_ram_size ((void *)PHYS_SDRAM ,SZ_512M ); + + gd->ram_size = size; + +if (size ==SZ_512M ) { +// 512MB RAM was detected
board/kontron/sl-mx6ul/spl.c line 294
Quoted 10 lines
board/kontron/sl-mx6ul/spl.c new file +10
-0+return ; + }else if (size ==SZ_256M ) { +// 256MB RAM was detected, use correct config and calibration +mx6_dram_cfg (&ddr_sysinfo, &mx6_mmcd_256M_calib, &mem_256M_ddr); + }else { +printf ("Invalid DDR RAM size detected: %x\n" , size); + } +} + +int do_board_detect (void )
static?
Quoted 279 lines
board/kontron/sl-mx6ul/spl.c new file +8
-0+{ +if (is_mx6ul ()) + gd->board_type =BOARD_TYPE_KTN_N631X ; +else if (is_mx6ull ()) + gd->board_type =BOARD_TYPE_KTN_N641X ; + +printf ("Kontron SL i.MX6UL%s (N6%s1x) module, %lu MB RAM detected\n" , + is_mx6ull() ? "L" : "", is_mx6ull() ? "4" : "3", gd->ram_size/
SZ_1M);board/kontron/sl-mx6ul/spl.c new file +41
-0+ +return 0 ; +} + +void board_init_f (ulong dummy) +{ +ccgr_init (); + +/* setup AIPS and disable watchdog */ +arch_cpu_init (); + +/* iomux and setup of UART and SPI */ +board_early_init_f (); + +/* setup GP timer */ +timer_init (); + +/* UART clocks enabled and gd valid - init serial console */ +preloader_console_init (); + +/* DDR initialization */ +spl_dram_init (); + +/* Clear the BSS. */ +memset (__bss_start,0 , __bss_end - __bss_start); + +/* Detect the board type */ +do_board_detect (); + +/* load/boot image from boot device */ +board_init_r (NULL ,0 ); +} + +void board_boot_order (u32 *spl_boot_list) +{ +u32 bootdev =spl_boot_device (); + +/* +* The default boot fuse settings use the SD card (MMC1) as primary +* boot device, but allow SPI NOR as a fallback boot device. +* We can't detect the fallback case and spl_boot_device() will return
board/kontron/sl-mx6ul/spl.c new file +34
-0+* BOOT_DEVICE_MMC1 despite the actual boot device being SPI NOR. +* Therefore we try to load U-Boot proper vom SPI NOR after loading +* from MMC has failed. +*/ + spl_boot_list[0 ] = bootdev; + +switch (bootdev) { +case BOOT_DEVICE_MMC1 : +case BOOT_DEVICE_MMC2 : + spl_boot_list[1 ] =BOOT_DEVICE_SPI ; +break ; + } +} + +int board_early_init_f (void ) +{ +setup_iomux_uart (); +setup_spi (); + +return 0 ; +} + +int board_fit_config_name_match (const char *name) +{ +if (gd->board_type ==BOARD_TYPE_KTN_N631X &&is_mx6ul () && + !strcmp (name,"imx6ul-kontron-n631x-s" )) +return 0 ; + +if (gd->board_type ==BOARD_TYPE_KTN_N641X &&is_mx6ull () && + !strcmp (name,"imx6ull-kontron-n641x-s" )) +return 0 ; + +return -1 ; +}configs/kontron_mx6ul_defconfig new file +109
-0@@ -0,0 +1,109 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_MEMTEST_START=0x80000000 +CONFIG_SYS_MEMTEST_END=0x90000000 +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_OFFSET=0xF0000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 +CONFIG_MX6UL=y +CONFIG_TARGET_KONTRON_MX6UL=y +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="imx6ul-kontron-n631x-s" +CONFIG_SPL_TEXT_BASE=0x00908000 +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +CONFIG_SPL=y +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI_SUPPORT=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_FIT=y +CONFIG_SPL_LOAD_FIT=y +# CONFIG_USE_SPL_FIT_GENERATOR is not set +CONFIG_OF_BOARD_SETUP=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" +CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_BOARD_TYPES=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SPL_RAW_IMAGE_SUPPORT=y +CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y +CONFIG_SPL_LEGACY_IMAGE_CRC_CHECK=y +CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x8A +CONFIG_SPL_SPI_LOAD=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET=y +CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_SDP=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FS_UUID=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nor0=spi1.0,spi-nand0=spi4.0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=spi1.0:128k(spl),832k(u-boot),64k(env);spi4.0:-(UBI)" +CONFIG_CMD_UBI=y +CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIST="imx6ul-kontron-n631x-s imx6ull-kontron-n641x-s" +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USE_ENV_SPI_BUS=y +CONFIG_ENV_SPI_BUS=2 +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +CONFIG_DM_I2C=y +CONFIG_FSL_USDHC=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_MTD_SPI_NAND=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SF_DEFAULT_BUS=1 +CONFIG_SF_DEFAULT_MODE=0 +CONFIG_SF_DEFAULT_SPEED=10000000 +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_PHYLIB=y +CONFIG_PHY_MICREL=y +CONFIG_PHY_MICREL_KSZ8XXX=y +CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y +CONFIG_FEC_MXC=y +CONFIG_MII=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX6=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_CONS_INDEX=4 +CONFIG_MXC_UART=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_FSL_QSPI=y +CONFIG_MXC_SPI=y +CONFIG_IMX_THERMAL=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_FDT_FIXUP_PARTITIONS=yinclude/configs/kontron_common.h new file +73
-0@@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2018 Kontron Electronics GmbH +* +* Common configuration settings for the Kontron Electronics boards. +* +*/ + +#ifndef __KONTRON_COMMON_CONFIG_H +#define __KONTRON_COMMON_CONFIG_H + +#include <asm/arch/imx-regs.h> +#include <asm/mach-imx/gpio.h> +#include <linux/sizes.h> + +#ifdef CONFIG_MX6 +#include "mx6_common.h" +#ifdef CONFIG_SPL_BUILD +#include "imx6_spl.h" +#endif +#endif + +/* +* ####################################### +* ### MISC ### +* ####################################### +*/ +#define CONFIG_SYS_MALLOC_LEN SZ_64M +#define CONFIG_SYS_HZ 1000 + +#define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + +/* +* ####################################### +* ### Ethernet ### +* ####################################### +*/ +#ifdef CONFIG_FEC_MXC +#define CONFIG_ETHPRIME "eth0" +#else +#define CONFIG_ETHPRIME +#endif + +/* +* ####################################### +* ### USB ### +* ####################################### +*/ +#ifdef CONFIG_USB_EHCI_HCD +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CONFIG_MXC_USB_FLAGS 0 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#endif + +/* +* ####################################### +* ### ENVIRONMENT ### +* ####################################### +*/ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "bootargs_base=" KONTRON_ENV_KERNEL_MTDPARTS "\0" \ + "script=boot.scr\0" \ + "kernel_addr_r=" KONTRON_ENV_KERNEL_ADDR "\0" \ + "fdt_addr_r=" KONTRON_ENV_FDT_ADDR "\0" \ + "ramdisk_addr_r=" KONTRON_ENV_RAMDISK_ADDR "\0" \ + "pxefile_addr_r=" KONTRON_ENV_PXE_ADDR "\0" \ + "scriptaddr=" KONTRON_ENV_PXE_ADDR "\0" \ + "bootdir=\0" \ + "bootdelay=3\0" \
include/configs/kontron_common.h line 83
Quoted 10 lines
include/configs/kontron_common.h new file +10
-0+"ipaddr=192.168.1.11\0" \ +"serverip=192.168.1.10\0" \ +"gatewayip=192.168.1.10\0" \ +"netmask=255.255.255.0\0" \ +"ethact=" CONFIG_ETHPRIME "\0" \ +"hostname=" CONFIG_HOSTNAME "\0" \ +"bootubipart=spi-nand0\0" \ +"bootubivol=boot\0" \ +BOOTENV +
no fdtfile? or does the fallback apply?
Please not that I just skimmed over the patch, no thorough review.
-michael
Hi Michael,
Quoted 55 lines · Michael Walle
Am 2021-07-21 10:03, schrieb Frieder Schrempf:
Quoted 45 lines
From: Frieder Schrempf <[email protected]>
This adds support for i.MX6UL/ULL-based evaluation kits with SoMs by Kontron Electronics GmbH.
Currently there are the following SoM flavors (SoM-Line):
* N6310: SOM with i.MX6UL-2, 256MB RAM, 256MB SPI NAND
* N6311: SOM with i.MX6UL-2, 512MB RAM, 512MB SPI NAND
* N6411: SOM with i.MX6ULL, 512MB RAM, 512MB SPI NANDAnd the according evaluation boards (Board-Line):
* N6310-S: Baseboard with SOM N6310, eMMC, display (optional), ...
* N6311-S: Baseboard with SOM N6311, eMMC, display (optional), ...
* N6411-S: Baseboard with SOM N6411, eMMC, display (optional), ...Currently U-Boot describes i.MX6UL and i.MX6ULL through separate config options at compile-time. Though the differences are so minor, that for the scope of these SoMs we just use a single defconfig that is compatible with both SoCs.
Signed-off-by Frieder Schrempf <[email protected]>Reviewed-by Stefano Babic <[email protected]>---
Fixes in v4:
* Fix checkpatch errors/warnings
* Stop disabling initrd/fdt relocationFixes in v3:
* Guard binman nodes to fix build of other UL boardsFixes in v2:
* AddMAINTAINERSfile
* Rename board directory
* Use binman to generate FIT
* Support legacy images
* Add Stefano's R-b tag
---
arch/arm/dts/Makefile | 4 +- .../dts/imx6ul-kontron-n631x-s-u-boot.dtsi | 7 + arch/arm/dts/imx6ul-kontron-n631x-s.dts | 17 + arch/arm/dts/imx6ul-kontron-n631x-som.dtsi | 14 + .../dts/imx6ul-kontron-n6x1x-s-u-boot.dtsi | 98 ++++ arch/arm/dts/imx6ul-kontron-n6x1x-s.dts | 423 ++++++++++++++++++ arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsi | 420 +++++++++++++++++ .../dts/imx6ul-kontron-n6x1x-som-common.dtsi | 124 +++++Quoted 8 lines
.../dts/imx6ull-kontron-n641x-s-u-boot.dtsi | 7 + arch/arm/dts/imx6ull-kontron-n641x-s.dts | 16 + arch/arm/dts/imx6ull-kontron-n641x-som.dtsi | 13 + arch/arm/mach-imx/mx6/Kconfig | 9 + board/kontron/sl-mx6ul/Kconfig | 15 + board/kontron/sl-mx6ul/MAINTAINERS | 9 + board/kontron/sl-mx6ul/Makefile | 8 + board/kontron/sl-mx6ul/kontron_mx6ul.c | 85 ++++
Quoted 2 lines
Can we name that just
mx6ul.cand drop the kontron prefix? Just for consitency reasons.
I think it is quite common to name the board C-file according to the name of the board configuration. I don't like mx6ul.c as it is the SoC name, but renaming it to sl-mx6ul.c which refers to the product name of the SoM seems reasonable. And while at it I will also rename the defconfig and header files accordingly.
Quoted 7 lines
Quoted 5 lines
board/kontron/sl-mx6ul/spl.c | 377 ++++++++++++++++ configs/kontron_mx6ul_defconfig | 109 +++++ include/configs/kontron_common.h | 84 ++++ include/configs/kontron_mx6ul.h | 52 +++
no README in doc/board/kontron/...?
I will need to think about the content of such a file, but in general it is a good idea to add it.
Quoted 34 lines
Quoted 34 lines
20 files changed, 1890 insertions(+), 1 deletion(-)create mode 100644
arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsicreate mode 100644arch/arm/dts/imx6ul-kontron-n631x-s.dtscreate mode 100644arch/arm/dts/imx6ul-kontron-n631x-som.dtsicreate mode 100644arch/arm/dts/imx6ul-kontron-n6x1x-s-u-boot.dtsicreate mode 100644arch/arm/dts/imx6ul-kontron-n6x1x-s.dtscreate mode 100644arch/arm/dts/imx6ul-kontron-n6x1x-s.dtsicreate mode 100644arch/arm/dts/imx6ul-kontron-n6x1x-som-common.dtsicreate mode 100644arch/arm/dts/imx6ull-kontron-n641x-s-u-boot.dtsicreate mode 100644arch/arm/dts/imx6ull-kontron-n641x-s.dtscreate mode 100644arch/arm/dts/imx6ull-kontron-n641x-som.dtsicreate mode 100644 board/kontron/sl-mx6ul/Kconfig
create mode 100644 board/kontron/sl-mx6ul/MAINTAINERS create mode 100644 board/kontron/sl-mx6ul/Makefile
create mode 100644board/kontron/sl-mx6ul/kontron_mx6ul.ccreate mode 100644board/kontron/sl-mx6ul/spl.c
create mode 100644 configs/kontron_mx6ul_defconfig
create mode 100644include/configs/kontron_common.hcreate mode 100644include/configs/kontron_mx6ul.harch/arm/dts/Makefile +3
-1@@ -811,7 +811,9 @@ dtb-$(CONFIG_MX6UL) += \ imx6ul-liteboard.dtb \ imx6ul-phytec-segin-ff-rdk-nand.dtb \ imx6ul-pico-hobbit.dtb \ - imx6ul-pico-pi.dtb + imx6ul-pico-pi.dtb \ + imx6ul-kontron-n631x-s.dtb \ + imx6ull-kontron-n641x-s.dtb
Quoted 15 lines
arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi line 4
Quoted 13 lines
arch/arm/dts/Makefile +0
-0dtb-$(CONFIG_MX6ULL) += \ imx6ull-14x14-evk.dtb \arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi new file +4
-0@@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2017 exceet electronics GmbH + * Copyright (C) 2018 Kontron Electronics GmbH2021? I don't know how that is handled in u-boot though.
I once learned somewhere that you actually keep the original date in a copyright note as it is intended to state when this was originated and these files have been around downstream as long as 2017/2018. But I'm not a lawyer, so I won't bet on this...
[...]
Quoted 3 lines
arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi line 6
Quoted 2 lines
arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi new file +2
-0+ +int do_board_detect(void)static?
Yes
[...]
Quoted 20 lines
Quoted 20 lines
arch/arm/dts/imx6ul-kontron-n631x-s-u-boot.dtsi new file +20
-0+ +/* + * ####################################### + * ### ENVIRONMENT ### + * ####################################### + */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "bootargs_base=" KONTRON_ENV_KERNEL_MTDPARTS "\0" \ + "script=boot.scr\0" \ + "kernel_addr_r=" KONTRON_ENV_KERNEL_ADDR "\0" \ + "fdt_addr_r=" KONTRON_ENV_FDT_ADDR "\0" \ + "ramdisk_addr_r=" KONTRON_ENV_RAMDISK_ADDR "\0" \ + "pxefile_addr_r=" KONTRON_ENV_PXE_ADDR "\0" \ + "scriptaddr=" KONTRON_ENV_PXE_ADDR "\0" \ + "bootdir=\0" \ + "bootdelay=3\0" \ + "ipaddr=192.168.1.11\0" \ + "serverip=192.168.1.10\0" \ + "gatewayip=192.168.1.10\0" \ + "netmask=255.255.255.0\0" \
Quoted 8 lines
Quoted 6 lines
+ "ethact="
CONFIG_ETHPRIME"\0" \
+ "hostname="CONFIG_HOSTNAME"\0" \
+ "bootubipart=spi-nand0\0" \
+ "bootubivol=boot\0" \
+ BOOTENV
+no fdtfile? or does the fallback apply?
Currently the fdt is only selected through the extlinux.conf. I'll have to look at how fdtfile is supposed to work and how to set it in this case.
Quoted 2 lines
Please not that I just skimmed over the patch, no thorough review.
Thanks, nevertheless!
Frieder