board: toradex: prepare and add colibri imx6ull 1gb (emmc) support
cover board: toradex: prepare and add colibri imx6ull 1gb (emmc) support
From: Marcel Ziswiler <[email protected]>
Some preparatory steps concerning tdx-cfg-block including a fix for the interactive mode IT handling and adding them new SKUs and then adding initial support for the Toradex Colibri iMX6ULL 1GB (eMMC) V1.1A module. They are now strapped to boot from eFuses which are factory fused to properly boot from their on-module eMMC.
Functionality wise the following is known to be working:
- 4-bit MMC/SD card slot
- 8-bit eMMC (fused default boot)
- bmode usb (imx_usb or uuu e.g. as used by the Toradex Easy Installer)
- Ethernet
- GPIOs
- I2C
- parallel RGB display
- USB device (e.g. for ums)
- USB host (e.g. for storage devices)
U-Boot 2021.10-rc1-00128-g4877bdab7e6 (Aug 16 2021 - 13:59:21 +0200)
CPU: Freescale i.MX6ULL rev1.1 792 MHz (running at 396 MHz) CPU: Industrial temperature grade (-40C to 105C) at 59C Reset cause: WDOG DRAM: 1 GiB MMC: FSL_SDHC: 1, FSL_SDHC: 0 Loading Environment from MMC... OK In: serial Out: serial Err: serial Model: Toradex Colibri iMX6ULL 1GB IT (eMMC) V1.1A, Serial# 06906494 Net: eth1: ethernet@20b4000 Hit any key to stop autoboot: 0
Colibri iMX6ULL #
Denys Drozdov (1):
toradex: configblock: fix interactive mode it handling
Marcel Ziswiler (2):
toradex: take over maintainership
toradex: tdx-cfg-block: add new i.mx 6ull and 8m plus skus
Max Krummenacher (1):
colibri-imx6ull: add emmc variant
Philippe Schenker (1):
colibri-imx6ull: imximage.cfg: integrate new 1GiB RAM variant
arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6ull-colibri-emmc.dts | 49 ++++++++++ arch/arm/dts/imx6ull-colibri.dts | 34 ++++++- arch/arm/dts/imx6ull-colibri.dtsi | 32 +------ board/toradex/apalis-imx8x/MAINTAINERS | 2 +- board/toradex/apalis_imx6/MAINTAINERS | 2 +- board/toradex/colibri-imx6ull/Kconfig | 54 ++++++++++- board/toradex/colibri-imx6ull/MAINTAINERS | 6 +- .../toradex/colibri-imx6ull/colibri-imx6ull.c | 27 +++++- board/toradex/colibri-imx6ull/imximage.cfg | 13 ++- board/toradex/colibri_imx6/MAINTAINERS | 2 +- board/toradex/colibri_imx7/MAINTAINERS | 2 +- board/toradex/colibri_t20/MAINTAINERS | 2 +- board/toradex/colibri_t30/MAINTAINERS | 2 +- board/toradex/colibri_vf/MAINTAINERS | 2 +- board/toradex/common/tdx-cfg-block.c | 34 +++++-- board/toradex/common/tdx-cfg-block.h | 5 ++ board/toradex/verdin-imx8mm/MAINTAINERS | 2 +- configs/colibri-imx6ull-emmc_defconfig | 90 +++++++++++++++++++ configs/colibri-imx6ull_defconfig | 1 + include/configs/colibri-imx6ull.h | 53 ++++++++--- 21 files changed, 343 insertions(+), 72 deletions(-) create mode 100644 arch/arm/dts/imx6ull-colibri-emmc.dts create mode 100644 configs/colibri-imx6ull-emmc_defconfig
Signature · 1 line
2.26.2
PATCH 1/5 toradex: take over maintainership
From: Marcel Ziswiler <[email protected]>
Also take over maintainership of remaining Toradex SoMs as Oleksandr has left our company.
---
board/toradex/apalis-imx8x/MAINTAINERS | 2 +- board/toradex/apalis_imx6/MAINTAINERS | 2 +- board/toradex/colibri-imx6ull/MAINTAINERS | 2 +- board/toradex/colibri_imx6/MAINTAINERS | 2 +- board/toradex/colibri_imx7/MAINTAINERS | 2 +- board/toradex/colibri_t20/MAINTAINERS | 2 +- board/toradex/colibri_t30/MAINTAINERS | 2 +- board/toradex/colibri_vf/MAINTAINERS | 2 +- board/toradex/verdin-imx8mm/MAINTAINERS | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
board/toradex/apalis-imx8x/MAINTAINERS +1 -1
@@ -1,5 +1,5 @@ Apalis iMX8X -M: Oleksandr Suvorov <[email protected]> +M: Marcel Ziswiler <[email protected]> W: http://developer.toradex.com/software/linux/linux-software S: Maintained F: arch/arm/dts/fsl-imx8x-apalis.dts
board/toradex/apalis_imx6/MAINTAINERS +1 -1
@@ -1,5 +1,5 @@ Apalis iMX6 -M: Oleksandr Suvorov <[email protected]> +M: Marcel Ziswiler <[email protected]> W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained
board/toradex/colibri-imx6ull/MAINTAINERS +1 -1
@@ -1,5 +1,5 @@ Colibri iMX6ULL -M: Oleksandr Suvorov <[email protected]> +M: Marcel Ziswiler <[email protected]> W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained
board/toradex/colibri_imx6/MAINTAINERS +1 -1
@@ -1,5 +1,5 @@ Colibri iMX6 -M: Oleksandr Suvorov <[email protected]> +M: Marcel Ziswiler <[email protected]> W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained
board/toradex/colibri_imx7/MAINTAINERS +1 -1
@@ -1,5 +1,5 @@ Colibri iMX7 -M: Oleksandr Suvorov <[email protected]> +M: Marcel Ziswiler <[email protected]> W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained
board/toradex/colibri_t20/MAINTAINERS +1 -1
@@ -1,5 +1,5 @@ COLIBRI_T20 -M: Oleksandr Suvorov <[email protected]> +M: Marcel Ziswiler <[email protected]> S: Maintained F: board/toradex/colibri_t20/ F: include/configs/colibri_t20.h
board/toradex/colibri_t30/MAINTAINERS +1 -1
@@ -1,5 +1,5 @@ Colibri T30 -M: Oleksandr Suvorov <[email protected]> +M: Marcel Ziswiler <[email protected]> S: Maintained F: board/toradex/colibri_t30/ F: include/configs/colibri_t30.h
board/toradex/colibri_vf/MAINTAINERS +1 -1
@@ -1,5 +1,5 @@ Colibri VFxx -M: Oleksandr Suvorov <[email protected]> +M: Marcel Ziswiler <[email protected]> W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained
board/toradex/verdin-imx8mm/MAINTAINERS +1 -1
@@ -1,5 +1,5 @@ Verdin iMX8M Mini -M: Oleksandr Suvorov <[email protected]> +M: Marcel Ziswiler <[email protected]> W: https://www.toradex.com/computer-on-modules/verdin-arm-family/nxp-imx-8m-mini S: Maintained F: arch/arm/dts/imx8mm-verdin.dts
Signature · 1 line
2.26.2
PATCH 2/5 toradex: configblock: fix interactive mode it handling
In reply to Marcel ZiswilerFrom: Denys Drozdov <[email protected]>
Restore "Is the module an IT version? [y/N]" for "cfgblock create" interactive mode command, which was leading to invalid detection of 0051 Colibri iMX8DX 1GB WB module;
Related-to: ELB-3482
---
board/toradex/common/tdx-cfg-block.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
board/toradex/common/tdx-cfg-block.c +4 -1
@@ -368,7 +368,10 @@ static int get_cfgblock_interactive(void)if (cpu_is_pxa27x ())sprintf (message,"Is the module the 312 MHz version? [y/N] " );else - it ='y' ; +sprintf (message,"Is the module an IT version? [y/N] " ); + + len =cli_readline (message); + it = console_buffer[0 ]; #if defined(CONFIG_TARGET_APALIS_IMX8) || \ defined(CONFIG_TARGET_APALIS_IMX8X) || \
Signature · 1 line
2.26.2
Fabio Estevam
reviewerRe: [PATCH v1 2/5] toradex: configblock: fix interactive mode it handling
Hi Marcel,
Quoted 9 lines · Marcel Ziswiler
From: Denys Drozdov <[email protected]>
Restore "Is the module an IT version? [y/N]" for "cfgblock create" interactive mode command, which was leading to invalid detection of 0051 Colibri iMX8DX 1GB WB module;
Fixes a5b5ad4d859b ("toradex: tdx-cfg-clock: add new i.mx 8m mini/plus skus")Related-to: ELB-3482
This Related-to tag does not seem to be a valid one.
Regards,
Fabio Estevam
Re: [PATCH v1 2/5] toradex: configblock: fix interactive mode it handling
Hi Fabio
Quoted 6 lines · Fabio Estevam
Hi Marcel,
Quoted 3 lines · Marcel Ziswiler
From: Denys Drozdov <[email protected]>
Quoted 8 lines
Quoted 6 lines
Restore "Is the module an IT version? [y/N]" for "cfgblock create" interactive mode command, which was leading to invalid detection of 0051 Colibri iMX8DX 1GB WB module;
Fixes a5b5ad4d859b ("toradex: tdx-cfg-clock: add new i.mx 8m mini/plus skus")Related-to: ELB-3482
This Related-to tag does not seem to be a valid one.
I am not exactly sure as to what exactly you are referring to here concerning validity of such tags. I believe we are not the only company (e.g. NXP themselves included) using this to refer to our internal ticketing system which BTW is even half public (e.g. not all tickets have required public information and are therefore published but this particular one even is):
https://developer.toradex.com/software/linux/linux-software/release-details?view=all&key=ELB-3482
Quoted 3 lines
Regards,
Fabio Estevam
Cheers
Marcel
Fabio Estevam
reviewerRe: [PATCH v1 2/5] toradex: configblock: fix interactive mode it handling
Hi Marcel,
Quoted 4 lines · Marcel Ziswiler
I am not exactly sure as to what exactly you are referring to here concerning validity of such tags. I believe we are not the only company (e.g. NXP themselves included) using this to refer to our internal ticketing system which BTW is even half public (e.g. not all tickets have required public information and are therefore published but this particular one even is):
I simply did "git log" and then searched for "Related-to" and could not find such a tag in U-Boot, so that is why I asked.
Regards,
Fabio Estevam
PATCH 3/5 toradex: tdx-cfg-block: add new i.mx 6ull and 8m plus skus
In reply to Marcel ZiswilerFrom: Marcel Ziswiler <[email protected]>
Add new i.MX 6ULL and 8M Plus SKUs to ConfigBlock handling:
0062: Colibri iMX6ULL 1GB IT (eMMC)
0063: Verdin iMX8M Plus Quad 4GB IT
0064: Verdin iMX8M Plus Quad 2GB Wi-Fi / BT IT
0065: Verdin iMX8M Plus QuadLite 1GB IT
0066: Verdin iMX8M Plus Quad 8GB Wi-Fi / BT
---
board/toradex/common/tdx-cfg-block.c | 29 ++++++++++++++++++++++++---- board/toradex/common/tdx-cfg-block.h | 5 +++++ 2 files changed, 30 insertions(+), 4 deletions(-)
board/toradex/common/tdx-cfg-block.c +25 -4
@@ -145,6 +145,11 @@ const char * const toradex_modules[] = { [59] = "Verdin iMX8M Mini Quad 2GB IT", [60] = "Verdin iMX8M Mini DualLite 1GB WB IT", [61] = "Verdin iMX8M Plus Quad 2GB", + [62] = "Colibri iMX6ULL 1GB IT (eMMC)", + [63] = "Verdin iMX8M Plus Quad 4GB IT", + [64] = "Verdin iMX8M Plus Quad 2GB Wi-Fi / BT IT", + [65] = "Verdin iMX8M Plus QuadLite 1GB IT", + [66] = "Verdin iMX8M Plus Quad 8GB Wi-Fi / BT", };const char *const toradex_carrier_boards[] = {
@@ -415,7 +420,10 @@ static int get_cfgblock_interactive(void)if (wb =='y' || wb =='Y' ) tdx_hw_tag.prodid =COLIBRI_IMX6ULL_WIFI_BT_IT ;else - tdx_hw_tag.prodid =COLIBRI_IMX6ULL_IT ; +if (gd->ram_size ==0x20000000 ) + tdx_hw_tag.prodid =COLIBRI_IMX6ULL_IT ; +else + tdx_hw_tag.prodid =COLIBRI_IMX6ULL_IT_EMMC ; }else {if (wb =='y' || wb =='Y' ) tdx_hw_tag.prodid =COLIBRI_IMX6ULL_WIFI_BT ;
@@ -424,7 +432,10 @@ static int get_cfgblock_interactive(void) }#endif }else if (!strcmp ("imx7d" , soc)) - tdx_hw_tag.prodid =COLIBRI_IMX7D ; +if (gd->ram_size ==0x20000000 ) + tdx_hw_tag.prodid =COLIBRI_IMX7D ; +else + tdx_hw_tag.prodid =COLIBRI_IMX7D_EMMC ;else if (!strcmp ("imx7s" , soc)) tdx_hw_tag.prodid =COLIBRI_IMX7S ;else if (is_cpu_type (MXC_CPU_IMX8QM )) {
@@ -474,11 +485,21 @@ static int get_cfgblock_interactive(void) tdx_hw_tag.prodid =VERDIN_IMX8MMQ_IT ; }else if (is_cpu_type (MXC_CPU_IMX8MN )) { tdx_hw_tag.prodid =VERDIN_IMX8MNQ_WIFI_BT ; + }else if (is_cpu_type (MXC_CPU_IMX8MPL )) { + tdx_hw_tag.prodid =VERDIN_IMX8MPQL_IT ; }else if (is_cpu_type (MXC_CPU_IMX8MP )) {if (wb =='y' || wb =='Y' ) - tdx_hw_tag.prodid =VERDIN_IMX8MPQ_WIFI_BT_IT ; +if (gd->ram_size ==0x80000000 ) + tdx_hw_tag.prodid =VERDIN_IMX8MPQ_2GB_WIFI_BT_IT ; +else if (gd->ram_size ==0x200000000 ) + tdx_hw_tag.prodid =VERDIN_IMX8MPQ_8GB_WIFI_BT ; +else + tdx_hw_tag.prodid =VERDIN_IMX8MPQ_WIFI_BT_IT ;else - tdx_hw_tag.prodid =VERDIN_IMX8MPQ ; +if (it =='y' || it =='Y' ) + tdx_hw_tag.prodid =VERDIN_IMX8MPQ_IT ; +else + tdx_hw_tag.prodid =VERDIN_IMX8MPQ ; }else if (!strcmp ("tegra20" , soc)) {if (it =='y' || it =='Y' )if (gd->ram_size ==0x10000000 )
board/toradex/common/tdx-cfg-block.h +5 -0
@@ -82,6 +82,11 @@ enum {VERDIN_IMX8MMQ_IT ,VERDIN_IMX8MMDL_WIFI_BT_IT ,/* 60 */ VERDIN_IMX8MPQ , +COLIBRI_IMX6ULL_IT_EMMC , +VERDIN_IMX8MPQ_IT , +VERDIN_IMX8MPQ_2GB_WIFI_BT_IT , +VERDIN_IMX8MPQL_IT ,/* 65 */ + VERDIN_IMX8MPQ_8GB_WIFI_BT, }; enum {
Signature · 1 line
2.26.2
PATCH 4/5 colibri-imx6ull: imximage.cfg: integrate new 1GiB RAM variant
In reply to Marcel ZiswilerFrom: Philippe Schenker <[email protected]>
Integrate new Toradex SKU 0062 Colibri iMX6ULL 1GB IT. This commit basically adjusts three parameters of the RAM settings:
Increase density from 4Gb to 8Gb
Increase ROW address from 15 to 16
Increase tRFC (refresh command time) from 260 to 350
This timing is valid for all Toradex Colibri iMX6ULL SKUs
Related-to: ELB-4055, ELB-4057
---
board/toradex/colibri-imx6ull/imximage.cfg | 13 +++++-------- include/configs/colibri-imx6ull.h | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-)
board/toradex/colibri-imx6ull/imximage.cfg +5 -8
@@ -83,16 +83,14 @@ DATA 4 0x021B08C0 0x00944009 DATA 4 0x021B08b8 0x00000800 DATA 4 0x021B0004 0x0002002D DATA 4 0x021B0008 0x1B333030 -DATA 4 0x021B000C 0x676B52F3 +DATA 4 0x021B000C 0x8B8F52F3 DATA 4 0x021B0010 0xB66D0B63 DATA 4 0x021B0014 0x01FF00DB DATA 4 0x021B0018 0x00201740 -DATA 4 0x021B001C 0x00008000 DATA 4 0x021B002C 0x000026D2 -DATA 4 0x021B0030 0x006B1023 -DATA 4 0x021B0040 0x0000004F -DATA 4 0x021B0000 0x84180000 -DATA 4 0x021B0890 0x00400000 +DATA 4 0x021B0030 0x008F1023 +DATA 4 0x021B0040 0x0000005F +DATA 4 0x021B0000 0x85180000 DATA 4 0x021B001C 0x02008032 DATA 4 0x021B001C 0x00008033 DATA 4 0x021B001C 0x00048031
@@ -100,7 +98,6 @@ DATA 4 0x021B001C 0x15208030 DATA 4 0x021B001C 0x04008040 DATA 4 0x021B0020 0x00000800 DATA 4 0x021B0818 0x00000227 -DATA 4 0x021B0004 0x0002552D +DATA 4 0x021B0004 0x0002556D DATA 4 0x021B0404 0x00011006 DATA 4 0x021B001C 0x00000000 -
include/configs/colibri-imx6ull.h +1 -1
@@ -13,7 +13,7 @@#include "mx6_common.h" #define CONFIG_IOMUX_LPSR -#define PHYS_SDRAM_SIZE SZ_512M +#define PHYS_SDRAM_SIZE SZ_1G/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
Signature · 1 line
2.26.2
PATCH 5/5 colibri-imx6ull: add emmc variant
In reply to Marcel ZiswilerFrom: Max Krummenacher <[email protected]>
Add code to build the eMMC variant of the Colibri iMX6ULL, i.e. the 'Colibri iMX6ULL 1GB' which has a eMMC instead of the raw NAND used on other SKUs.
Related-to: ELB-4056, ELB-4057
---
arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6ull-colibri-emmc.dts | 49 ++++++++++ arch/arm/dts/imx6ull-colibri.dts | 34 ++++++- arch/arm/dts/imx6ull-colibri.dtsi | 32 +------ board/toradex/colibri-imx6ull/Kconfig | 54 ++++++++++- board/toradex/colibri-imx6ull/MAINTAINERS | 4 +- .../toradex/colibri-imx6ull/colibri-imx6ull.c | 27 +++++- configs/colibri-imx6ull-emmc_defconfig | 90 +++++++++++++++++++ configs/colibri-imx6ull_defconfig | 1 + include/configs/colibri-imx6ull.h | 51 ++++++++--- 10 files changed, 294 insertions(+), 49 deletions(-) create mode 100644 arch/arm/dts/imx6ull-colibri-emmc.dts create mode 100644 configs/colibri-imx6ull-emmc_defconfig
arch/arm/dts/Makefile +1 -0
@@ -819,6 +819,7 @@ dtb-$(CONFIG_MX6UL) += \ dtb-$(CONFIG_MX6ULL) += \ imx6ull-14x14-evk.dtb \ imx6ull-colibri.dtb \ + imx6ull-colibri-emmc.dtb \ imx6ull-myir-mys-6ulx-eval.dtb \ imx6ull-seeed-npi-imx6ull-dev-board.dtb \ imx6ull-phytec-segin-ff-rdk-emmc.dtb \
arch/arm/dts/imx6ull-colibri-emmc.dts new file +49 -0
49 lines not on this page · raw message
arch/arm/dts/imx6ull-colibri.dts +33 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright 2018-2019 Toradex AG + * Copyright 2018-2021 Toradex AG */ #include "imx6ull-colibri.dtsi"
@@ -10,3 +10,35 @@ model = "Toradex Colibri iMX6ULL"; compatible = "toradex,colibri-imx6ull", "fsl,imx6ull"; }; + +/* NAND */ +&gpmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand>; + nand-on-flash-bbt; + nand-ecc-mode = "hw"; + nand-ecc-strength = <8>; + nand-ecc-step-size = <512>; + status = "okay"; +}; + +&iomuxc { + pinctrl_gpmi_nand: gpmi-nand-grp { + fsl,pins = < + MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9 + MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01 0x100a9 + MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02 0x100a9 + MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03 0x100a9 + MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04 0x100a9 + MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05 0x100a9 + MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06 0x100a9 + MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07 0x100a9 + MX6UL_PAD_NAND_CLE__RAWNAND_CLE 0x100a9 + MX6UL_PAD_NAND_ALE__RAWNAND_ALE 0x100a9 + MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B 0x100a9 + MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B 0x100a9 + MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B 0x100a9 + MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0x100a9 + >; + }; +};
arch/arm/dts/imx6ull-colibri.dtsi +1 -31
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright 2019 Toradex AG + * Copyright 2019-2021 Toradex AG */ /dts-v1/;
@@ -92,17 +92,6 @@ }; }; -/* NAND */ -&gpmi { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpmi_nand>; - nand-on-flash-bbt; - nand-ecc-mode = "hw"; - nand-ecc-strength = <8>; - nand-ecc-step-size = <512>; - status = "okay"; -}; - /* * I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board) */
@@ -340,25 +329,6 @@ >; }; - pinctrl_gpmi_nand: gpmi-nand-grp { - fsl,pins = < - MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9 - MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01 0x100a9 - MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02 0x100a9 - MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03 0x100a9 - MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04 0x100a9 - MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05 0x100a9 - MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06 0x100a9 - MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07 0x100a9 - MX6UL_PAD_NAND_CLE__RAWNAND_CLE 0x100a9 - MX6UL_PAD_NAND_ALE__RAWNAND_ALE 0x100a9 - MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B 0x100a9 - MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B 0x100a9 - MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B 0x100a9 - MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0x100a9 - >; - }; - pinctrl_i2c1: i2c1-grp { fsl,pins = < MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
board/toradex/colibri-imx6ull/Kconfig +50 -4
76 lines not on this page · raw message
board/toradex/colibri-imx6ull/MAINTAINERS +3 -1
@@ -4,8 +4,10 @@ W: http://developer.toradex.com/software/linux/linux-software W: https://www.toradex.com/community S: Maintained F: arch/arm/dts/imx6ull-colibri.dts -F: arch/arm/dts/imx6ull-colibri-u-boot.dtsi F: arch/arm/dts/imx6ull-colibri.dtsi +F: arch/arm/dts/imx6ull-colibri-emmc.dts +F: arch/arm/dts/imx6ull-colibri-u-boot.dtsi F: board/toradex/colibri-imx6ull/ F: configs/colibri-imx6ull_defconfig +F: configs/colibri-imx6ull-emmc_defconfig F: include/configs/colibri-imx6ull.h
board/toradex/colibri-imx6ull/colibri-imx6ull.c +26 -1
@@ -43,6 +43,14 @@ DECLARE_GLOBAL_DATA_PTR;#define NAND_PAD_READY0_CTRL (PAD_CTL_DSE_48ohm | PAD_CTL_PUS_22K_UP) +#define FLASH_DETECTION_CTRL (PAD_CTL_HYS | PAD_CTL_PUE) +#define FLASH_DET_GPIO IMX_GPIO_NR(4, 1) +static iomux_v3_cfg_t const flash_detection_pads[] = { +MX6_PAD_NAND_WE_B__GPIO4_IO01 |MUX_PAD_CTRL (FLASH_DETECTION_CTRL ), +}; + +static bool is_emmc; +int dram_init (void ) { gd->ram_size =get_ram_size ((void *)PHYS_SDRAM ,PHYS_SDRAM_SIZE );
@@ -120,6 +128,16 @@ int board_init(void)/* address of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; +/* +* Enable GPIO on NAND_WE_B/eMMC_RST with 100k pull-down. eMMC_RST +* is pulled high with 4.7k for eMMC devices. This allows to reliably +* detect eMMC/NAND flash +*/ +imx_iomux_v3_setup_multiple_pads (flash_detection_pads,ARRAY_SIZE (flash_detection_pads)); +gpio_request (FLASH_DET_GPIO ,"flash-detection-gpio" ); + is_emmc =gpio_get_value (FLASH_DET_GPIO ); +gpio_free (FLASH_DET_GPIO ); +#ifdef CONFIG_FEC_MXC setup_fec ();#endif
@@ -148,8 +166,15 @@ int board_late_init(void)* Wi-Fi/Bluetooth make sure we use the -wifi device tree. */ if (tdx_hw_tag.prodid ==COLIBRI_IMX6ULL_WIFI_BT_IT || - tdx_hw_tag.prodid ==COLIBRI_IMX6ULL_WIFI_BT ) + tdx_hw_tag.prodid ==COLIBRI_IMX6ULL_WIFI_BT ) {env_set ("variant" ,"-wifi" ); + }else { +if (is_emmc) +env_set ("variant" ,"-emmc" ); + } +#else +if (is_emmc) +env_set ("variant" ,"-emmc" );#endif /*
configs/colibri-imx6ull-emmc_defconfig new file +90 -0
90 lines not on this page · raw message
configs/colibri-imx6ull_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x380000 CONFIG_MX6ULL=y CONFIG_TARGET_COLIBRI_IMX6ULL=y +CONFIG_TARGET_COLIBRI_IMX6ULL_NAND=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri" CONFIG_DISTRO_DEFAULTS=y
include/configs/colibri-imx6ull.h +40 -11
104 lines not on this page · raw message
Signature · 1 line
2.26.2