[U-Boot] [PATCH 1/3] arm: mx6: tqma6: Fix USB and add other filesystems

[U-Boot] [PATCH 1/3] arm: mx6: tqma6: Fix USB and add other filesystems

[Stefan Roese]

This patch fixes the USB EHCI support on the TQMa6 SoM. Additionally
some filesystems are added, included the generic FS commands (e.g.
ls...).

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Markus Niebel <Markus.Niebel@tq-group.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 include/configs/tqma6.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index a099687..9022550 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -125,16 +125,19 @@
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
-#define CONFIG_MXC_USB_PORT	1
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS	0
+#define CONFIG_USB_MAX_CONTROLLER_COUNT	2
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
 
 /* Fuses */
 #define CONFIG_MXC_OCOTP
 #define CONFIG_CMD_FUSE
 
 #define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
+#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMD_PING
-- 
2.3.2

[U-Boot] [PATCH 2/3] arm: mx6: tqma6: Update to optionally configure an alternative SPI setup

[Stefan Roese]

By making the tqma6_iomuxc_spi() weak, this patch adds the possibility to
add a different function for this SPI configuration. This can be used
by other baseboards, that might have a different SPI setup.

This patch will be used by the upcoming WRU-IV board support which also
uses the TQMa6 SoM.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 board/tqc/tqma6/tqma6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index c9e163e..29db838 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -145,7 +145,7 @@ static unsigned const tqma6_ecspi1_cs[] = {
 	TQMA6_SF_CS_GPIO,
 };
 
-static void tqma6_iomuxc_spi(void)
+__weak void tqma6_iomuxc_spi(void)
 {
 	unsigned i;
 
-- 
2.3.2

[U-Boot] [PATCH 2/3] arm: mx6: tqma6: Update to optionally configure an alternative SPI setup

[Markus Niebel]

Hello Stefan,

Am 12.03.2015 um 13:34 schrieb Stefan Roese:
> By making the tqma6_iomuxc_spi() weak, this patch adds the possibility to
> add a different function for this SPI configuration. This can be used
> by other baseboards, that might have a different SPI setup.
> 
> This patch will be used by the upcoming WRU-IV board support which also
> uses the TQMa6 SoM.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  board/tqc/tqma6/tqma6.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
> index c9e163e..29db838 100644
> --- a/board/tqc/tqma6/tqma6.c
> +++ b/board/tqc/tqma6/tqma6.c
> @@ -145,7 +145,7 @@ static unsigned const tqma6_ecspi1_cs[] = {
>  	TQMA6_SF_CS_GPIO,
>  };
>  
> -static void tqma6_iomuxc_spi(void)
> +__weak void tqma6_iomuxc_spi(void)
>  {
>  	unsigned i;
>  
When implementing an baseboard specific init handler, we will get a warning about unused 
tqma6_ecspi1_pads and tqma6_ecspi1_cs, or did I miss something?

Just as a thought (not ready): Could we supply CS initialisation data via defines in the
baseboard config header and append it to the tables if needed?

Regards

Markus

[U-Boot] [PATCH 2/3] arm: mx6: tqma6: Update to optionally configure an alternative SPI setup

[Stefan Roese]

Hi Markus,

On 12.03.2015 15:25, Markus Niebel wrote:
> Am 12.03.2015 um 13:34 schrieb Stefan Roese:
>> By making the tqma6_iomuxc_spi() weak, this patch adds the possibility to
>> add a different function for this SPI configuration. This can be used
>> by other baseboards, that might have a different SPI setup.
>>
>> This patch will be used by the upcoming WRU-IV board support which also
>> uses the TQMa6 SoM.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> ---
>>   board/tqc/tqma6/tqma6.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
>> index c9e163e..29db838 100644
>> --- a/board/tqc/tqma6/tqma6.c
>> +++ b/board/tqc/tqma6/tqma6.c
>> @@ -145,7 +145,7 @@ static unsigned const tqma6_ecspi1_cs[] = {
>>   	TQMA6_SF_CS_GPIO,
>>   };
>>
>> -static void tqma6_iomuxc_spi(void)
>> +__weak void tqma6_iomuxc_spi(void)
>>   {
>>   	unsigned i;
>>
> When implementing an baseboard specific init handler, we will get
 > a warning about unused
> tqma6_ecspi1_pads and tqma6_ecspi1_cs, or did I miss something?

I'm not getting one with the current (unfinished) WRU4 baseboard. Which 
has no SPI.

> Just as a thought (not ready): Could we supply CS initialisation
 > data via defines in the
> baseboard config header and append it to the tables if needed?

Not sure if I understand this correctly. Could you give an example? 
Again, my current baseboard has no SPI at all.

Thanks,
Stefan

[U-Boot] [PATCH 2/3] arm: mx6: tqma6: Update to optionally configure an alternative SPI setup

[Markus Niebel]

Hello Stefan,
Am 12.03.2015 um 16:18 schrieb Stefan Roese:
> Hi Markus,
> 
> On 12.03.2015 15:25, Markus Niebel wrote:
>> Am 12.03.2015 um 13:34 schrieb Stefan Roese:
>>> By making the tqma6_iomuxc_spi() weak, this patch adds the possibility to
>>> add a different function for this SPI configuration. This can be used
>>> by other baseboards, that might have a different SPI setup.
>>>
>>> This patch will be used by the upcoming WRU-IV board support which also
>>> uses the TQMa6 SoM.
>>>
>>> Signed-off-by: Stefan Roese <sr@denx.de>
>>> ---
>>>   board/tqc/tqma6/tqma6.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
>>> index c9e163e..29db838 100644
>>> --- a/board/tqc/tqma6/tqma6.c
>>> +++ b/board/tqc/tqma6/tqma6.c
>>> @@ -145,7 +145,7 @@ static unsigned const tqma6_ecspi1_cs[] = {
>>>       TQMA6_SF_CS_GPIO,
>>>   };
>>>
>>> -static void tqma6_iomuxc_spi(void)
>>> +__weak void tqma6_iomuxc_spi(void)
>>>   {
>>>       unsigned i;
>>>
>> When implementing an baseboard specific init handler, we will get
>> a warning about unused
>> tqma6_ecspi1_pads and tqma6_ecspi1_cs, or did I miss something?
> 
> I'm not getting one with the current (unfinished) WRU4 baseboard. Which has no SPI.
> 
Oops, not understand the weak mechanism completely - compiler sees usage of data
in weak function but linker selects function from baseboard - correct?
If this is the case, we have only the duplication of IOMUX and CS gpio.

>> Just as a thought (not ready): Could we supply CS initialisation
>> data via defines in the
>> baseboard config header and append it to the tables if needed?
> 
> Not sure if I understand this correctly. Could you give an example? Again, my current baseboard has no SPI at all.
> 

tqma6_iomux_spi is for the SPI controller the serial nor is connected,
so baseboard specific data are additional CS.

You could solve the data duplication using 

#define TQMA6_BB_ECSPI1_CS_GPIO	IMX_GPIO_NR(n, mm),
#define TQMA6_BB_CS_PAD_CTRL	NEW_PAD_CTRL(MX6_PAD_bla__GPIOn, IOmm, <PAD_CTRL)

and in the board file:

if !defined(TQMA6_BB_ECSPI1_CS_GPIO)
#define TQMA6_BB_ECSPI1_CS_GPIO
#endif

static unsigned const tqma6_ecspi1_cs[] = {
       TQMA6_SF_CS_GPIO,
       TQMA6_BB_ECSPI1_CS_GPIO	
};

But OK, this looks not very nice

As I said, not completely ready, but would prevent some code duplication.

> Thanks,
> Stefan
> 

[U-Boot] [PATCH 2/3] arm: mx6: tqma6: Update to optionally configure an alternative SPI setup

[Stefan Roese]

Hi Markus,

On 13.03.2015 10:05, Markus Niebel wrote:
>>>> -static void tqma6_iomuxc_spi(void)
>>>> +__weak void tqma6_iomuxc_spi(void)
>>>>    {
>>>>        unsigned i;
>>>>
>>> When implementing an baseboard specific init handler, we will get
>>> a warning about unused
>>> tqma6_ecspi1_pads and tqma6_ecspi1_cs, or did I miss something?
>>
>> I'm not getting one with the current (unfinished) WRU4 baseboard. Which has no SPI.
>>
> Oops, not understand the weak mechanism completely - compiler sees usage of data
> in weak function but linker selects function from baseboard - correct?
> If this is the case, we have only the duplication of IOMUX and CS gpio.
>
>>> Just as a thought (not ready): Could we supply CS initialisation
>>> data via defines in the
>>> baseboard config header and append it to the tables if needed?
>>
>> Not sure if I understand this correctly. Could you give an example? Again, my current baseboard has no SPI at all.
>>
>
> tqma6_iomux_spi is for the SPI controller the serial nor is connected,
> so baseboard specific data are additional CS.
>
> You could solve the data duplication using
>
> #define TQMA6_BB_ECSPI1_CS_GPIO	IMX_GPIO_NR(n, mm),
> #define TQMA6_BB_CS_PAD_CTRL	NEW_PAD_CTRL(MX6_PAD_bla__GPIOn, IOmm, <PAD_CTRL)
>
> and in the board file:
>
> if !defined(TQMA6_BB_ECSPI1_CS_GPIO)
> #define TQMA6_BB_ECSPI1_CS_GPIO
> #endif
>
> static unsigned const tqma6_ecspi1_cs[] = {
>         TQMA6_SF_CS_GPIO,
>         TQMA6_BB_ECSPI1_CS_GPIO	
> };
>
> But OK, this looks not very nice
>
> As I said, not completely ready, but would prevent some code duplication.

With my current approach we have code duplication. I suggest we give 
this version a try and see if it scales for other, future baseboards as 
well. If not, we can always try a solution like you described above.

Okay?

Thanks,
Stefan

[U-Boot] [PATCH 2/3] arm: mx6: tqma6: Update to optionally configure an alternative SPI setup

[Stefan Roese]

On 13.03.2015 14:25, Stefan Roese wrote:
>> But OK, this looks not very nice
>>
>> As I said, not completely ready, but would prevent some code duplication.
>
> With my current approach we have code duplication.

Ups. I meant "we have *no* code duplication". Sorry!

Thanks,
Stefan

[U-Boot] [PATCH 2/3] arm: mx6: tqma6: Update to optionally configure an alternative SPI setup

[Markus Niebel]

Hello Stefan,
Am 13.03.2015 um 14:25 schrieb Stefan Roese:
> Hi Markus,
> 
> On 13.03.2015 10:05, Markus Niebel wrote:
>>>
>>> Not sure if I understand this correctly. Could you give an example? Again, my current baseboard has no SPI at all.
>>>
>>
>> tqma6_iomux_spi is for the SPI controller the serial nor is connected,
>> so baseboard specific data are additional CS.
>>
>> You could solve the data duplication using
>>
>> #define TQMA6_BB_ECSPI1_CS_GPIO    IMX_GPIO_NR(n, mm),
>> #define TQMA6_BB_CS_PAD_CTRL    NEW_PAD_CTRL(MX6_PAD_bla__GPIOn, IOmm, <PAD_CTRL)
>>
>> and in the board file:
>>
>> if !defined(TQMA6_BB_ECSPI1_CS_GPIO)
>> #define TQMA6_BB_ECSPI1_CS_GPIO
>> #endif
>>
>> static unsigned const tqma6_ecspi1_cs[] = {
>>         TQMA6_SF_CS_GPIO,
>>         TQMA6_BB_ECSPI1_CS_GPIO   
>> };
>>
>> But OK, this looks not very nice
>>
>> As I said, not completely ready, but would prevent some code duplication.
> 
> With my current approach we have code duplication. I suggest we give this version a try and see if it scales for other, future baseboards as well. If not, we can always try a solution like you described above.
> 
> Okay?

Yes, Okay.

you can add my Acked-by
> 
> Thanks,
> Stefan
> 
Regards

Markus

[U-Boot] [PATCH 2/3] arm: mx6: tqma6: Update to optionally configure an alternative SPI setup

[Stefan Roese]

Hi Stefano,

On 12.03.2015 13:34, Stefan Roese wrote:
> By making the tqma6_iomuxc_spi() weak, this patch adds the possibility to
> add a different function for this SPI configuration. This can be used
> by other baseboards, that might have a different SPI setup.
>
> This patch will be used by the upcoming WRU-IV board support which also
> uses the TQMa6 SoM.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>   board/tqc/tqma6/tqma6.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
> index c9e163e..29db838 100644
> --- a/board/tqc/tqma6/tqma6.c
> +++ b/board/tqc/tqma6/tqma6.c
> @@ -145,7 +145,7 @@ static unsigned const tqma6_ecspi1_cs[] = {
>   	TQMA6_SF_CS_GPIO,
>   };
>
> -static void tqma6_iomuxc_spi(void)
> +__weak void tqma6_iomuxc_spi(void)
>   {
>   	unsigned i;
>
>

Ping on this patch. Markus has Ack'ed it. Could you please push it to Tom?

Thanks,
Stefan

[U-Boot] [PATCH 2/3] arm: mx6: tqma6: Update to optionally configure an alternative SPI setup

[Stefano Babic]

On 05/05/2015 11:37, Stefan Roese wrote:
> Hi Stefano,
> 
> On 12.03.2015 13:34, Stefan Roese wrote:
>> By making the tqma6_iomuxc_spi() weak, this patch adds the possibility to
>> add a different function for this SPI configuration. This can be used
>> by other baseboards, that might have a different SPI setup.
>>
>> This patch will be used by the upcoming WRU-IV board support which also
>> uses the TQMa6 SoM.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> ---
>>   board/tqc/tqma6/tqma6.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
>> index c9e163e..29db838 100644
>> --- a/board/tqc/tqma6/tqma6.c
>> +++ b/board/tqc/tqma6/tqma6.c
>> @@ -145,7 +145,7 @@ static unsigned const tqma6_ecspi1_cs[] = {
>>       TQMA6_SF_CS_GPIO,
>>   };
>>
>> -static void tqma6_iomuxc_spi(void)
>> +__weak void tqma6_iomuxc_spi(void)
>>   {
>>       unsigned i;
>>
>>
> 
> Ping on this patch. Markus has Ack'ed it. Could you please push it to Tom?
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic


-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 3/3] arm: mx6: tqma6: Extract baseboard configs into separate config file

[Stefan Roese]

This patch extracts all baseboard specific defines into a separate config file.
This makes it easier to add other baseboards that use the TQMa6 SoM.

This patch will be used by the upcoming WRU-IV board support which also
uses the TQMa6 SoM.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Markus Niebel <Markus.Niebel@tq-group.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 include/configs/tqma6.h      | 52 ++++++++++----------------------------------
 include/configs/tqma6_mba6.h | 32 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 41 deletions(-)
 create mode 100644 include/configs/tqma6_mba6.h

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 9022550..69b6b57 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -35,16 +35,6 @@
 #define PHYS_SDRAM_SIZE			(1024u * SZ_1M)
 #endif
 
-#if defined(CONFIG_MBA6)
-
-#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
-#define CONFIG_DEFAULT_FDT_FILE		"imx6dl-mba6x.dtb"
-#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6Q)
-#define CONFIG_DEFAULT_FDT_FILE		"imx6q-mba6x.dtb"
-#endif
-
-#endif
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_SYS_GENERIC_BOARD
@@ -85,11 +75,6 @@
 
 /* I2C SYSMON (LM75) */
 #define CONFIG_DTT_LM75
-#if defined(CONFIG_MBA6)
-#define CONFIG_DTT_SENSORS		{ 0, 1 }
-#else
-#define CONFIG_DTT_SENSORS		{ 0 }
-#endif
 #define CONFIG_DTT_MAX_TEMP		70
 #define CONFIG_DTT_MIN_TEMP		-30
 #define CONFIG_DTT_HYSTERESIS	3
@@ -150,38 +135,12 @@
 #define CONFIG_PHYLIB
 #define CONFIG_MII
 
-#if defined(CONFIG_MBA6)
-
-#define CONFIG_FEC_XCV_TYPE		RGMII
-#define CONFIG_ETHPRIME			"FEC"
-
-#define CONFIG_FEC_MXC_PHYADDR		0x03
-#define CONFIG_PHY_MICREL
-#define CONFIG_PHY_KSZ9031
-
-#else
-
-#error "define PHY to use for your baseboard"
-
-#endif
-
 #define CONFIG_ARP_TIMEOUT		200UL
 /* Network config - Allow larger/faster download for TFTP/NFS */
 #define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE	4096
 #define CONFIG_NFS_READ_SIZE	4096
 
-#if defined(CONFIG_MBA6)
-
-#define CONFIG_MXC_UART_BASE		UART2_BASE
-#define CONFIG_CONSOLE_DEV		"ttymxc1"
-
-#else
-
-#error "define baseboard specific things (uart, number of SD-card slots)"
-
-#endif
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX		1
@@ -495,4 +454,15 @@
 #define CONFIG_CMD_CACHE
 #endif
 
+/*
+ * All the defines above are for the TQMa6 SoM
+ *
+ * Now include the baseboard specific configuration
+ */
+#ifdef CONFIG_MBA6
+#include "tqma6_mba6.h"
+#else
+#error "No baseboard for the TQMa6 defined!"
+#endif
+
 #endif /* __CONFIG_H */
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
new file mode 100644
index 0000000..a16120a
--- /dev/null
+++ b/include/configs/tqma6_mba6.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2013, 2014 Markus Niebel <Markus.Niebel@tq-group.com>
+ *
+ * Configuration settings for the TQ Systems TQMa6<Q,S> module.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_TQMA6_MBA6_H
+#define __CONFIG_TQMA6_MBA6_H
+
+/* And now the baseboard specific configuration */
+
+#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
+#define CONFIG_DEFAULT_FDT_FILE		"imx6dl-mba6x.dtb"
+#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6Q)
+#define CONFIG_DEFAULT_FDT_FILE		"imx6q-mba6x.dtb"
+#endif
+
+#define CONFIG_DTT_SENSORS		{ 0, 1 }
+
+#define CONFIG_FEC_XCV_TYPE		RGMII
+#define CONFIG_ETHPRIME			"FEC"
+
+#define CONFIG_FEC_MXC_PHYADDR		0x03
+#define CONFIG_PHY_MICREL
+#define CONFIG_PHY_KSZ9031
+
+#define CONFIG_MXC_UART_BASE		UART2_BASE
+#define CONFIG_CONSOLE_DEV		"ttymxc1"
+
+#endif /* __CONFIG_TQMA6_MBA6_H */
-- 
2.3.2

[U-Boot] [PATCH 3/3] arm: mx6: tqma6: Extract baseboard configs into separate config file

[Markus Niebel]

Hello Stefan,

I like the idea - did not know at time when we brought it to mainline that splitting configs
is an allowed way. See comment.

Am 12.03.2015 um 13:34 schrieb Stefan Roese:
> This patch extracts all baseboard specific defines into a separate config file.
> This makes it easier to add other baseboards that use the TQMa6 SoM.
> 
> This patch will be used by the upcoming WRU-IV board support which also
> uses the TQMa6 SoM.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Markus Niebel <Markus.Niebel@tq-group.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>  include/configs/tqma6.h      | 52 ++++++++++----------------------------------
>  include/configs/tqma6_mba6.h | 32 +++++++++++++++++++++++++++
>  2 files changed, 43 insertions(+), 41 deletions(-)
>  create mode 100644 include/configs/tqma6_mba6.h
> 
> diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
> index 9022550..69b6b57 100644
> --- a/include/configs/tqma6.h
> +++ b/include/configs/tqma6.h
> @@ -35,16 +35,6 @@
>  #define PHYS_SDRAM_SIZE			(1024u * SZ_1M)
>  #endif
>  
> -#if defined(CONFIG_MBA6)
> -
> -#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
> -#define CONFIG_DEFAULT_FDT_FILE		"imx6dl-mba6x.dtb"
> -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6Q)
> -#define CONFIG_DEFAULT_FDT_FILE		"imx6q-mba6x.dtb"
> -#endif
> -
> -#endif
> -
>  #define CONFIG_DISPLAY_CPUINFO
>  #define CONFIG_DISPLAY_BOARDINFO
>  #define CONFIG_SYS_GENERIC_BOARD
> @@ -85,11 +75,6 @@
>  
>  /* I2C SYSMON (LM75) */
>  #define CONFIG_DTT_LM75
> -#if defined(CONFIG_MBA6)
> -#define CONFIG_DTT_SENSORS		{ 0, 1 }
> -#else
> -#define CONFIG_DTT_SENSORS		{ 0 }
This will be lost for baseboards not implementing DTT_SENSORS feature
> -#endif
>  #define CONFIG_DTT_MAX_TEMP		70
>  #define CONFIG_DTT_MIN_TEMP		-30
>  #define CONFIG_DTT_HYSTERESIS	3
> @@ -150,38 +135,12 @@
>  #define CONFIG_PHYLIB
>  #define CONFIG_MII
>  
> -#if defined(CONFIG_MBA6)
> -
> -#define CONFIG_FEC_XCV_TYPE		RGMII
> -#define CONFIG_ETHPRIME			"FEC"
> -
> -#define CONFIG_FEC_MXC_PHYADDR		0x03
> -#define CONFIG_PHY_MICREL
> -#define CONFIG_PHY_KSZ9031
> -
> -#else
> -
> -#error "define PHY to use for your baseboard"
> -
> -#endif
> -
>  #define CONFIG_ARP_TIMEOUT		200UL
>  /* Network config - Allow larger/faster download for TFTP/NFS */
>  #define CONFIG_IP_DEFRAG
>  #define CONFIG_TFTP_BLOCKSIZE	4096
>  #define CONFIG_NFS_READ_SIZE	4096
>  
> -#if defined(CONFIG_MBA6)
> -
> -#define CONFIG_MXC_UART_BASE		UART2_BASE
> -#define CONFIG_CONSOLE_DEV		"ttymxc1"
> -
> -#else
> -
> -#error "define baseboard specific things (uart, number of SD-card slots)"
> -
> -#endif
> -
>  /* allow to overwrite serial and ethaddr */
>  #define CONFIG_ENV_OVERWRITE
>  #define CONFIG_CONS_INDEX		1
> @@ -495,4 +454,15 @@
>  #define CONFIG_CMD_CACHE
>  #endif
>  
> +/*
> + * All the defines above are for the TQMa6 SoM
> + *
> + * Now include the baseboard specific configuration
> + */
> +#ifdef CONFIG_MBA6
> +#include "tqma6_mba6.h"
> +#else
> +#error "No baseboard for the TQMa6 defined!"
> +#endif

Maybe this is the right place to add something like:

/* support at least the sensor on TQMa6 SOM */
#if !defined(CONFIG_DTT_SENSORS)
#define CONFIG_DTT_SENSORS		{ 0 }
#endif
> +
>  #endif /* __CONFIG_H */
> diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
> new file mode 100644
> index 0000000..a16120a
> --- /dev/null
> +++ b/include/configs/tqma6_mba6.h
> @@ -0,0 +1,32 @@
> +/*
> + * Copyright (C) 2013, 2014 Markus Niebel <Markus.Niebel@tq-group.com>
> + *
> + * Configuration settings for the TQ Systems TQMa6<Q,S> module.
> + *
> + * SPDX-License-Identifier:	GPL-2.0+
> + */
> +
> +#ifndef __CONFIG_TQMA6_MBA6_H
> +#define __CONFIG_TQMA6_MBA6_H
> +
> +/* And now the baseboard specific configuration */
Please delete this comment. 
> +
> +#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
> +#define CONFIG_DEFAULT_FDT_FILE		"imx6dl-mba6x.dtb"
> +#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6Q)
> +#define CONFIG_DEFAULT_FDT_FILE		"imx6q-mba6x.dtb"
> +#endif
> +
> +#define CONFIG_DTT_SENSORS		{ 0, 1 }
> +
> +#define CONFIG_FEC_XCV_TYPE		RGMII
> +#define CONFIG_ETHPRIME			"FEC"
> +
> +#define CONFIG_FEC_MXC_PHYADDR		0x03
> +#define CONFIG_PHY_MICREL
> +#define CONFIG_PHY_KSZ9031
> +
> +#define CONFIG_MXC_UART_BASE		UART2_BASE
> +#define CONFIG_CONSOLE_DEV		"ttymxc1"
> +
> +#endif /* __CONFIG_TQMA6_MBA6_H */
> 
Regards

Markus

[U-Boot] [PATCH 3/3] arm: mx6: tqma6: Extract baseboard configs into separate config file

[Stefan Roese]

Hi Markus,

On 12.03.2015 15:17, Markus Niebel wrote:
> I like the idea - did not know at time when we brought it to
 > mainline that splitting configs
> is an allowed way.

No, I'm not aware of such a thing. This proposed config file addition 
for the baseboard makes integration of multiple baseboards much easier 
than the current approach with the ugly #ifdef mess. So I definitely 
prefer this new version.

> See comment.

Okay. Some answers from me as well below.

> Am 12.03.2015 um 13:34 schrieb Stefan Roese:
>> This patch extracts all baseboard specific defines into a separate config file.
>> This makes it easier to add other baseboards that use the TQMa6 SoM.
>>
>> This patch will be used by the upcoming WRU-IV board support which also
>> uses the TQMa6 SoM.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> Cc: Markus Niebel <Markus.Niebel@tq-group.com>
>> Cc: Stefano Babic <sbabic@denx.de>
>> ---
>>   include/configs/tqma6.h      | 52 ++++++++++----------------------------------
>>   include/configs/tqma6_mba6.h | 32 +++++++++++++++++++++++++++
>>   2 files changed, 43 insertions(+), 41 deletions(-)
>>   create mode 100644 include/configs/tqma6_mba6.h
>>
>> diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
>> index 9022550..69b6b57 100644
>> --- a/include/configs/tqma6.h
>> +++ b/include/configs/tqma6.h
>> @@ -35,16 +35,6 @@
>>   #define PHYS_SDRAM_SIZE			(1024u * SZ_1M)
>>   #endif
>>
>> -#if defined(CONFIG_MBA6)
>> -
>> -#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
>> -#define CONFIG_DEFAULT_FDT_FILE		"imx6dl-mba6x.dtb"
>> -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6Q)
>> -#define CONFIG_DEFAULT_FDT_FILE		"imx6q-mba6x.dtb"
>> -#endif
>> -
>> -#endif
>> -
>>   #define CONFIG_DISPLAY_CPUINFO
>>   #define CONFIG_DISPLAY_BOARDINFO
>>   #define CONFIG_SYS_GENERIC_BOARD
>> @@ -85,11 +75,6 @@
>>
>>   /* I2C SYSMON (LM75) */
>>   #define CONFIG_DTT_LM75
>> -#if defined(CONFIG_MBA6)
>> -#define CONFIG_DTT_SENSORS		{ 0, 1 }
>> -#else
>> -#define CONFIG_DTT_SENSORS		{ 0 }
> This will be lost for baseboards not implementing DTT_SENSORS feature

I was wondering, why this define was there. And now its clear. Thanks. 
I'll update the patch accordingly.

>> -#endif
>>   #define CONFIG_DTT_MAX_TEMP		70
>>   #define CONFIG_DTT_MIN_TEMP		-30
>>   #define CONFIG_DTT_HYSTERESIS	3
>> @@ -150,38 +135,12 @@
>>   #define CONFIG_PHYLIB
>>   #define CONFIG_MII
>>
>> -#if defined(CONFIG_MBA6)
>> -
>> -#define CONFIG_FEC_XCV_TYPE		RGMII
>> -#define CONFIG_ETHPRIME			"FEC"
>> -
>> -#define CONFIG_FEC_MXC_PHYADDR		0x03
>> -#define CONFIG_PHY_MICREL
>> -#define CONFIG_PHY_KSZ9031
>> -
>> -#else
>> -
>> -#error "define PHY to use for your baseboard"
>> -
>> -#endif
>> -
>>   #define CONFIG_ARP_TIMEOUT		200UL
>>   /* Network config - Allow larger/faster download for TFTP/NFS */
>>   #define CONFIG_IP_DEFRAG
>>   #define CONFIG_TFTP_BLOCKSIZE	4096
>>   #define CONFIG_NFS_READ_SIZE	4096
>>
>> -#if defined(CONFIG_MBA6)
>> -
>> -#define CONFIG_MXC_UART_BASE		UART2_BASE
>> -#define CONFIG_CONSOLE_DEV		"ttymxc1"
>> -
>> -#else
>> -
>> -#error "define baseboard specific things (uart, number of SD-card slots)"
>> -
>> -#endif
>> -
>>   /* allow to overwrite serial and ethaddr */
>>   #define CONFIG_ENV_OVERWRITE
>>   #define CONFIG_CONS_INDEX		1
>> @@ -495,4 +454,15 @@
>>   #define CONFIG_CMD_CACHE
>>   #endif
>>
>> +/*
>> + * All the defines above are for the TQMa6 SoM
>> + *
>> + * Now include the baseboard specific configuration
>> + */
>> +#ifdef CONFIG_MBA6
>> +#include "tqma6_mba6.h"
>> +#else
>> +#error "No baseboard for the TQMa6 defined!"
>> +#endif
>
> Maybe this is the right place to add something like:
>
> /* support at least the sensor on TQMa6 SOM */
> #if !defined(CONFIG_DTT_SENSORS)
> #define CONFIG_DTT_SENSORS		{ 0 }
> #endif

Yes, will do. Thanks.

>> +
>>   #endif /* __CONFIG_H */
>> diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
>> new file mode 100644
>> index 0000000..a16120a
>> --- /dev/null
>> +++ b/include/configs/tqma6_mba6.h
>> @@ -0,0 +1,32 @@
>> +/*
>> + * Copyright (C) 2013, 2014 Markus Niebel <Markus.Niebel@tq-group.com>
>> + *
>> + * Configuration settings for the TQ Systems TQMa6<Q,S> module.
>> + *
>> + * SPDX-License-Identifier:	GPL-2.0+
>> + */
>> +
>> +#ifndef __CONFIG_TQMA6_MBA6_H
>> +#define __CONFIG_TQMA6_MBA6_H
>> +
>> +/* And now the baseboard specific configuration */
> Please delete this comment.

Okay.

Thanks,
Stefan

[U-Boot] [PATCH 1/3] arm: mx6: tqma6: Fix USB and add other filesystems

[Markus Niebel]

Am 12.03.2015 um 13:34 schrieb Stefan Roese:
> This patch fixes the USB EHCI support on the TQMa6 SoM. Additionally
> some filesystems are added, included the generic FS commands (e.g.
> ls...).
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Markus Niebel <Markus.Niebel@tq-group.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>  include/configs/tqma6.h | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
> index a099687..9022550 100644
> --- a/include/configs/tqma6.h
> +++ b/include/configs/tqma6.h
> @@ -125,16 +125,19 @@
>  #define CONFIG_USB_STORAGE
>  #define CONFIG_USB_HOST_ETHER
>  #define CONFIG_USB_ETHER_SMSC95XX
> -#define CONFIG_MXC_USB_PORT	1
>  #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
> -#define CONFIG_MXC_USB_FLAGS	0
> +#define CONFIG_USB_MAX_CONTROLLER_COUNT	2
> +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
>  
>  /* Fuses */
>  #define CONFIG_MXC_OCOTP
>  #define CONFIG_CMD_FUSE
>  
>  #define CONFIG_CMD_EXT2
> +#define CONFIG_CMD_EXT4
> +#define CONFIG_CMD_EXT4_WRITE
>  #define CONFIG_CMD_FAT
> +#define CONFIG_CMD_FS_GENERIC
>  #define CONFIG_DOS_PARTITION
>  
>  #define CONFIG_CMD_PING
> 
Acked-By: Markus Niebel <Markus.Niebel@tq-group.com>

[U-Boot] [PATCH 1/3] arm: mx6: tqma6: Fix USB and add other filesystems

[Stefan Roese]

Hi Stefano,

On 12.03.2015 13:34, Stefan Roese wrote:
> This patch fixes the USB EHCI support on the TQMa6 SoM. Additionally
> some filesystems are added, included the generic FS commands (e.g.
> ls...).
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Markus Niebel <Markus.Niebel@tq-group.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>   include/configs/tqma6.h | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
> index a099687..9022550 100644
> --- a/include/configs/tqma6.h
> +++ b/include/configs/tqma6.h
> @@ -125,16 +125,19 @@
>   #define CONFIG_USB_STORAGE
>   #define CONFIG_USB_HOST_ETHER
>   #define CONFIG_USB_ETHER_SMSC95XX
> -#define CONFIG_MXC_USB_PORT	1
>   #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
> -#define CONFIG_MXC_USB_FLAGS	0
> +#define CONFIG_USB_MAX_CONTROLLER_COUNT	2
> +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
>
>   /* Fuses */
>   #define CONFIG_MXC_OCOTP
>   #define CONFIG_CMD_FUSE
>
>   #define CONFIG_CMD_EXT2
> +#define CONFIG_CMD_EXT4
> +#define CONFIG_CMD_EXT4_WRITE
>   #define CONFIG_CMD_FAT
> +#define CONFIG_CMD_FS_GENERIC
>   #define CONFIG_DOS_PARTITION
>
>   #define CONFIG_CMD_PING

Ping on this patch. Markus has Ack'ed it. Could you please push it to Tom?

Thanks,
Stefan

[U-Boot] [PATCH 1/3] arm: mx6: tqma6: Fix USB and add other filesystems

[Stefano Babic]

On 05/05/2015 11:36, Stefan Roese wrote:
> Hi Stefano,
> 
> On 12.03.2015 13:34, Stefan Roese wrote:
>> This patch fixes the USB EHCI support on the TQMa6 SoM. Additionally
>> some filesystems are added, included the generic FS commands (e.g.
>> ls...).
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> Cc: Markus Niebel <Markus.Niebel@tq-group.com>
>> Cc: Stefano Babic <sbabic@denx.de>
>> ---
>>   include/configs/tqma6.h | 7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
>> index a099687..9022550 100644
>> --- a/include/configs/tqma6.h
>> +++ b/include/configs/tqma6.h
>> @@ -125,16 +125,19 @@
>>   #define CONFIG_USB_STORAGE
>>   #define CONFIG_USB_HOST_ETHER
>>   #define CONFIG_USB_ETHER_SMSC95XX
>> -#define CONFIG_MXC_USB_PORT    1
>>   #define CONFIG_MXC_USB_PORTSC    (PORT_PTS_UTMI | PORT_PTS_PTW)
>> -#define CONFIG_MXC_USB_FLAGS    0
>> +#define CONFIG_USB_MAX_CONTROLLER_COUNT    2
>> +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET    /* For OTG port */
>>
>>   /* Fuses */
>>   #define CONFIG_MXC_OCOTP
>>   #define CONFIG_CMD_FUSE
>>
>>   #define CONFIG_CMD_EXT2
>> +#define CONFIG_CMD_EXT4
>> +#define CONFIG_CMD_EXT4_WRITE
>>   #define CONFIG_CMD_FAT
>> +#define CONFIG_CMD_FS_GENERIC
>>   #define CONFIG_DOS_PARTITION
>>
>>   #define CONFIG_CMD_PING
> 
> Ping on this patch. Markus has Ack'ed it. Could you please push it to Tom?
> 

Sorry, I confuse these ones with the patches to split tqma code and I
was convinced I have already applied. I'll do it.

Best regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 1/3] arm: mx6: tqma6: Fix USB and add other filesystems

[Stefano Babic]

On 12/03/2015 13:34, Stefan Roese wrote:
> This patch fixes the USB EHCI support on the TQMa6 SoM. Additionally
> some filesystems are added, included the generic FS commands (e.g.
> ls...).
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Markus Niebel <Markus.Niebel@tq-group.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================