From dbab8b8e10e535bc58c9f31a54961678c4de5254 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 29 May 2015 13:00:36 -0300 Subject: mx6cuboxi: Fix boot of hummingboard dual-lite Hummingboard dual-lite is picking the incorrect calibration structure. Fix it so that it can boot. While at it, also fix p1_mpdgctrl1 register to match Solid-run's setting. Reported-by: Andrei Gherzan Signed-off-by: Fabio Estevam Tested-by: Andrei Gherzan --- board/solidrun/mx6cuboxi/mx6cuboxi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'board') diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c index d15c726a01..9b1ecf0457 100644 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c @@ -536,7 +536,7 @@ static const struct mx6_mmdc_calibration mx6dl_1g_mmcd_calib = { .p0_mpdgctrl0 = 0x023C0224, .p0_mpdgctrl1 = 0x02000220, .p1_mpdgctrl0 = 0x02200220, - .p1_mpdgctrl1 = 0x02000220, + .p1_mpdgctrl1 = 0x02040208, .p0_mprddlctl = 0x44444846, .p1_mprddlctl = 0x4042463C, .p0_mpwrdlctl = 0x32343032, @@ -627,7 +627,7 @@ static void spl_dram_init(int width) else if (is_cpu_type(MXC_CPU_MX6Q)) mx6_dram_cfg(&sysinfo, &mx6q_2g_mmcd_calib, &mem_ddr_4g); else if (is_cpu_type(MXC_CPU_MX6DL)) - mx6_dram_cfg(&sysinfo, &mx6q_1g_mmcd_calib, &mem_ddr_2g); + mx6_dram_cfg(&sysinfo, &mx6dl_1g_mmcd_calib, &mem_ddr_2g); else if (is_cpu_type(MXC_CPU_MX6SOLO)) mx6_dram_cfg(&sysinfo, &mx6dl_512m_mmcd_calib, &mem_ddr_2g); } -- cgit v1.2.1 From 51f6c4280f95a8066e965cfa3268de5ad737d385 Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Thu, 4 Jun 2015 17:25:31 +0200 Subject: arm: mx6: tqma6: CPU type selection via Kconfig This is the first patch to remove the CONFIG_SYS_EXTRA_OPTIONS. This patch implements CPU type selection from Kconfig. Further Kconfig stuff is added later. Signed-off-by: Markus Niebel --- board/tqc/tqma6/Kconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'board') diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index f8b3d1fd40..3e4d9f5170 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -12,4 +12,25 @@ config SYS_SOC config SYS_CONFIG_NAME default "tqma6" +choice + prompt "TQMa6 SoC variant" + default TQMA6Q + help + select the TQMa6 module variant. The variants differing in the used + i.MX6 CPU type and DRAM + +config TQMA6Q + bool "TQMa6Q / TQMa6D" + select MX6Q + help + select TQMa6Q / TQMa6D with i.MX6Q/D and 1GiB DRAM + +config TQMA6S + bool "TQMa6S" + select MX6S + help + select TQMa6S with i.MX6S and 512 MiB DRAM + +endchoice + endif -- cgit v1.2.1 From 30ed1257dbd61efc5d3d0856d81b69aba380705b Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Thu, 4 Jun 2015 17:25:32 +0200 Subject: arm: imx6: tqma6: implement IMX_CONFIG with Kconfig Now that we have the Kconfig based CPU type selection, use this to fill the IMX_CONFIG automatically Signed-off-by: Markus Niebel --- board/tqc/tqma6/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'board') diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index 3e4d9f5170..ce47ba49c6 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -33,4 +33,8 @@ config TQMA6S endchoice +config IMX_CONFIG + default "board/tqc/tqma6/tqma6q.cfg" if TQMA6Q + default "board/tqc/tqma6/tqma6s.cfg" if TQMA6S + endif -- cgit v1.2.1 From 55c0e49ab31dbd7d45ee978ae08194a8f28ae188 Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Thu, 4 Jun 2015 17:25:33 +0200 Subject: arm: imx6: tqma6: boot device selection via Kconfig Signed-off-by: Markus Niebel --- board/tqc/tqma6/Kconfig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'board') diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index ce47ba49c6..132e82f68d 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -33,6 +33,25 @@ config TQMA6S endchoice +choice + prompt "TQMa6 boot configuration" + default TQMA6X_MMC_BOOT + help + Configure boot device. This is also used to implement environment + location. + +config TQMA6X_MMC_BOOT + bool "MMC / SD Boot" + help + Boot from eMMC / SD Card + +config TQMA6X_SPI_BOOT + bool "SPI NOR Boot" + help + Boot from on board SPI NOR flash + +endchoice + config IMX_CONFIG default "board/tqc/tqma6/tqma6q.cfg" if TQMA6Q default "board/tqc/tqma6/tqma6s.cfg" if TQMA6S -- cgit v1.2.1 From fc6e442568b645fc8132f7bc41623370953d4661 Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Thu, 4 Jun 2015 17:25:34 +0200 Subject: arm: imx6: tqma6: implement KConfig baseboard selection this finally removes the need for extra settings in defconfig Signed-off-by: Markus Niebel --- board/tqc/tqma6/Kconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'board') diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index 132e82f68d..b56237d187 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -52,6 +52,20 @@ config TQMA6X_SPI_BOOT endchoice +choice + prompt "TQMa6 base board variant" + default MBA6 + help + Select base board for TQMa6 + +config MBA6 + bool "TQMa6 on MBa6 Starterkit" + help + Select the MBa6 starterkit. This features a GigE Phy, USB, SD-Card + etc. + +endchoice + config IMX_CONFIG default "board/tqc/tqma6/tqma6q.cfg" if TQMA6Q default "board/tqc/tqma6/tqma6s.cfg" if TQMA6S -- cgit v1.2.1