* [PATCH v2 01/14] imx: mx7: fix DDRC size in A7-M4 mapping table
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
@ 2020-07-15 10:30 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers Igor Opaniuk
` (13 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:30 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
According to i.MX 7Solo Applications Processor Reference Manual,
2.1.3 Cortex-M4 Memory Map, M4 can address only 1536MB of DDRC
(Start Address: 0x8000_0000; End Address: 0xDFFF_FFFF).
Correct DDRC size to 0x60000000.
Fixes: c0f037f6("mach-imx: bootaux: elf firmware support")
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
arch/arm/mach-imx/mx7/soc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index 798fe74a3d..9cb61f5c34 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -218,7 +218,7 @@ const struct rproc_att hostmap[] = {
{ 0x00940000, 0x00940000, 0x20000 }, /* OCRAM_PXP */
{ 0x20240000, 0x00940000, 0x20000 }, /* OCRAM_PXP */
{ 0x10000000, 0x80000000, 0x0fff0000 }, /* DDR Code alias */
- { 0x80000000, 0x80000000, 0xe0000000 }, /* DDRC */
+ { 0x80000000, 0x80000000, 0x60000000 }, /* DDRC */
{ /* sentinel */ }
};
#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 01/14] imx: mx7: fix DDRC size in A7-M4 mapping table
2020-07-15 10:30 ` [PATCH v2 01/14] imx: mx7: fix DDRC size in A7-M4 mapping table Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> According to i.MX 7Solo Applications Processor Reference Manual,
> 2.1.3 Cortex-M4 Memory Map, M4 can address only 1536MB of DDRC
> (Start Address: 0x8000_0000; End Address: 0xDFFF_FFFF).
> Correct DDRC size to 0x60000000.
> Fixes: c0f037f6("mach-imx: bootaux: elf firmware support")
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
2020-07-15 10:30 ` [PATCH v2 01/14] imx: mx7: fix DDRC size in A7-M4 mapping table Igor Opaniuk
@ 2020-07-15 10:30 ` Igor Opaniuk
2020-07-27 12:49 ` Stefano Babic
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 03/14] toradex: tdx-cfg-block: add carrier boards and display adapters Igor Opaniuk
` (12 subsequent siblings)
14 siblings, 2 replies; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:30 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
These functions wrap functionality for storing config blocks in EEPROM.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
board/toradex/common/Makefile | 1 +
board/toradex/common/tdx-eeprom.c | 90 +++++++++++++++++++++++++++++++
board/toradex/common/tdx-eeprom.h | 14 +++++
3 files changed, 105 insertions(+)
create mode 100644 board/toradex/common/tdx-eeprom.c
create mode 100644 board/toradex/common/tdx-eeprom.h
diff --git a/board/toradex/common/Makefile b/board/toradex/common/Makefile
index 6b9fccb6b9..7b19b6e4c8 100644
--- a/board/toradex/common/Makefile
+++ b/board/toradex/common/Makefile
@@ -8,4 +8,5 @@ obj- := __dummy__.o
else
obj-$(CONFIG_TDX_CFG_BLOCK) += tdx-cfg-block.o
obj-y += tdx-common.o
+obj-y += tdx-eeprom.o
endif
diff --git a/board/toradex/common/tdx-eeprom.c b/board/toradex/common/tdx-eeprom.c
new file mode 100644
index 0000000000..fbc267dab6
--- /dev/null
+++ b/board/toradex/common/tdx-eeprom.c
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2020 Toradex
+ */
+
+#include <dm.h>
+#include <i2c_eeprom.h>
+#include <linux/errno.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int get_tdx_eeprom(u32 eeprom_id, struct udevice **devp)
+{
+ int ret = 0;
+ int node;
+ ofnode eeprom;
+ char eeprom_str[16];
+ const char *path;
+
+ if (!gd->fdt_blob) {
+ printf("%s: don't have a valid gd->fdt_blob!\n", __func__);
+ return -EFAULT;
+ }
+
+ node = fdt_path_offset(gd->fdt_blob, "/aliases");
+ if (node < 0)
+ return -ENODEV;
+
+ sprintf(eeprom_str, "eeprom%d", eeprom_id);
+
+ path = fdt_getprop(gd->fdt_blob, node, eeprom_str, NULL);
+ if (!path) {
+ printf("%s: no alias for %s\n", __func__, eeprom_str);
+ return -ENODEV;
+ }
+
+ eeprom = ofnode_path(path);
+ if (!ofnode_valid(eeprom)) {
+ printf("%s: invalid hardware path to EEPROM\n", __func__);
+ return -ENODEV;
+ }
+
+ ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, eeprom, devp);
+ if (ret) {
+ printf("%s: cannot find EEPROM by node\n", __func__);
+ return ret;
+ }
+
+ return ret;
+}
+
+int read_tdx_eeprom_data(u32 eeprom_id, int offset, u8 *buf,
+ int size)
+{
+ struct udevice *dev;
+ int ret;
+
+ ret = get_tdx_eeprom(eeprom_id, &dev);
+ if (ret)
+ return ret;
+
+ ret = i2c_eeprom_read(dev, 0x0, buf, size);
+ if (ret) {
+ printf("%s: error reading data from EEPROM id: %d!, ret = %d\n",
+ __func__, eeprom_id, ret);
+ return ret;
+ }
+
+ return ret;
+}
+
+int write_tdx_eeprom_data(u32 eeprom_id, int offset, u8 *buf,
+ int size)
+{
+ struct udevice *dev;
+ int ret;
+
+ ret = get_tdx_eeprom(eeprom_id, &dev);
+ if (ret)
+ return ret;
+
+ ret = i2c_eeprom_write(dev, 0x0, buf, size);
+ if (ret) {
+ printf("%s: error writing data to EEPROM id: %d, ret = %d\n",
+ __func__, eeprom_id, ret);
+ return ret;
+ }
+
+ return ret;
+}
diff --git a/board/toradex/common/tdx-eeprom.h b/board/toradex/common/tdx-eeprom.h
new file mode 100644
index 0000000000..a6772d2f3f
--- /dev/null
+++ b/board/toradex/common/tdx-eeprom.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2020 Toradex
+ */
+
+#ifndef _TDX_EEPROM_H
+#define _TDX_EEPROM_H
+
+#include <i2c_eeprom.h>
+
+int read_tdx_eeprom_data(u32 eeprom_id, int offset, uint8_t *buf, int size);
+int write_tdx_eeprom_data(u32 eeprom_id, int offset, uint8_t *buf, int size);
+
+#endif /* _TDX_EEPROM_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers
2020-07-15 10:30 ` [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers Igor Opaniuk
@ 2020-07-27 12:49 ` Stefano Babic
2020-07-27 13:35 ` Tom Rini
2020-07-27 19:09 ` sbabic at denx.de
1 sibling, 1 reply; 34+ messages in thread
From: Stefano Babic @ 2020-07-27 12:49 UTC (permalink / raw)
To: u-boot
Hi Igor,
On 15.07.20 12:30, Igor Opaniuk wrote:
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
>
> These functions wrap functionality for storing config blocks in EEPROM.
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> ---
>
This breaks one of your (obsolete ?) board, colibri_pxa270
Reason is a side-effect in dm/read.h:
arm: + colibri_pxa270
+In file included from include/dm.h:12,
+ from board/toradex/common/tdx-eeprom.c:6:
+include/dm/read.h: In function 'dev_read_alias_seq':
+include/dm/read.h:932:10: error: 'ENOTSUPP' undeclared (first use in
this function)
+ 932 | return -ENOTSUPP;
+ | ^~~~~~~~
+include/dm/read.h:932:10: note: each undeclared identifier is reported
only once for each function it appears in
+make[2]: *** [scripts/Makefile.build:266:
board/toradex/common/tdx-eeprom.o] Error 1
+make[1]: *** [Makefile:1793: board/toradex/common] Error 2
+make: *** [Makefile:167: sub-make] Error 2
Adding the include to dm/read.h, issue is solved:
diff --git a/include/dm/read.h b/include/dm/read.h
index f02ec95954..cc4ab22f65 100644
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -12,6 +12,7 @@
#include <dm/fdtaddr.h>
#include <dm/ofnode.h>
#include <dm/uclass.h>
+#include <linux/errno.h>
struct resource;
I could add it myself if there is a general agreement, but the usual way
is to repost it.
Best regards,
Stefano
> (no changes since v1)
>
> board/toradex/common/Makefile | 1 +
> board/toradex/common/tdx-eeprom.c | 90 +++++++++++++++++++++++++++++++
> board/toradex/common/tdx-eeprom.h | 14 +++++
> 3 files changed, 105 insertions(+)
> create mode 100644 board/toradex/common/tdx-eeprom.c
> create mode 100644 board/toradex/common/tdx-eeprom.h
>
> diff --git a/board/toradex/common/Makefile b/board/toradex/common/Makefile
> index 6b9fccb6b9..7b19b6e4c8 100644
> --- a/board/toradex/common/Makefile
> +++ b/board/toradex/common/Makefile
> @@ -8,4 +8,5 @@ obj- := __dummy__.o
> else
> obj-$(CONFIG_TDX_CFG_BLOCK) += tdx-cfg-block.o
> obj-y += tdx-common.o
> +obj-y += tdx-eeprom.o
> endif
> diff --git a/board/toradex/common/tdx-eeprom.c b/board/toradex/common/tdx-eeprom.c
> new file mode 100644
> index 0000000000..fbc267dab6
> --- /dev/null
> +++ b/board/toradex/common/tdx-eeprom.c
> @@ -0,0 +1,90 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (c) 2020 Toradex
> + */
> +
> +#include <dm.h>
> +#include <i2c_eeprom.h>
> +#include <linux/errno.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +static int get_tdx_eeprom(u32 eeprom_id, struct udevice **devp)
> +{
> + int ret = 0;
> + int node;
> + ofnode eeprom;
> + char eeprom_str[16];
> + const char *path;
> +
> + if (!gd->fdt_blob) {
> + printf("%s: don't have a valid gd->fdt_blob!\n", __func__);
> + return -EFAULT;
> + }
> +
> + node = fdt_path_offset(gd->fdt_blob, "/aliases");
> + if (node < 0)
> + return -ENODEV;
> +
> + sprintf(eeprom_str, "eeprom%d", eeprom_id);
> +
> + path = fdt_getprop(gd->fdt_blob, node, eeprom_str, NULL);
> + if (!path) {
> + printf("%s: no alias for %s\n", __func__, eeprom_str);
> + return -ENODEV;
> + }
> +
> + eeprom = ofnode_path(path);
> + if (!ofnode_valid(eeprom)) {
> + printf("%s: invalid hardware path to EEPROM\n", __func__);
> + return -ENODEV;
> + }
> +
> + ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, eeprom, devp);
> + if (ret) {
> + printf("%s: cannot find EEPROM by node\n", __func__);
> + return ret;
> + }
> +
> + return ret;
> +}
> +
> +int read_tdx_eeprom_data(u32 eeprom_id, int offset, u8 *buf,
> + int size)
> +{
> + struct udevice *dev;
> + int ret;
> +
> + ret = get_tdx_eeprom(eeprom_id, &dev);
> + if (ret)
> + return ret;
> +
> + ret = i2c_eeprom_read(dev, 0x0, buf, size);
> + if (ret) {
> + printf("%s: error reading data from EEPROM id: %d!, ret = %d\n",
> + __func__, eeprom_id, ret);
> + return ret;
> + }
> +
> + return ret;
> +}
> +
> +int write_tdx_eeprom_data(u32 eeprom_id, int offset, u8 *buf,
> + int size)
> +{
> + struct udevice *dev;
> + int ret;
> +
> + ret = get_tdx_eeprom(eeprom_id, &dev);
> + if (ret)
> + return ret;
> +
> + ret = i2c_eeprom_write(dev, 0x0, buf, size);
> + if (ret) {
> + printf("%s: error writing data to EEPROM id: %d, ret = %d\n",
> + __func__, eeprom_id, ret);
> + return ret;
> + }
> +
> + return ret;
> +}
> diff --git a/board/toradex/common/tdx-eeprom.h b/board/toradex/common/tdx-eeprom.h
> new file mode 100644
> index 0000000000..a6772d2f3f
> --- /dev/null
> +++ b/board/toradex/common/tdx-eeprom.h
> @@ -0,0 +1,14 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +/*
> + * Copyright (c) 2020 Toradex
> + */
> +
> +#ifndef _TDX_EEPROM_H
> +#define _TDX_EEPROM_H
> +
> +#include <i2c_eeprom.h>
> +
> +int read_tdx_eeprom_data(u32 eeprom_id, int offset, uint8_t *buf, int size);
> +int write_tdx_eeprom_data(u32 eeprom_id, int offset, uint8_t *buf, int size);
> +
> +#endif /* _TDX_EEPROM_H */
>
--
=====================================================================
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
=====================================================================
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers
2020-07-27 12:49 ` Stefano Babic
@ 2020-07-27 13:35 ` Tom Rini
2020-07-27 14:17 ` Stefano Babic
0 siblings, 1 reply; 34+ messages in thread
From: Tom Rini @ 2020-07-27 13:35 UTC (permalink / raw)
To: u-boot
On Mon, Jul 27, 2020 at 02:49:30PM +0200, Stefano Babic wrote:
> Hi Igor,
>
> On 15.07.20 12:30, Igor Opaniuk wrote:
> > From: Igor Opaniuk <igor.opaniuk@toradex.com>
> >
> > These functions wrap functionality for storing config blocks in EEPROM.
> >
> > Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> > ---
> >
>
> This breaks one of your (obsolete ?) board, colibri_pxa270
>
> Reason is a side-effect in dm/read.h:
>
> arm: + colibri_pxa270
> +In file included from include/dm.h:12,
> + from board/toradex/common/tdx-eeprom.c:6:
> +include/dm/read.h: In function 'dev_read_alias_seq':
> +include/dm/read.h:932:10: error: 'ENOTSUPP' undeclared (first use in
> this function)
> + 932 | return -ENOTSUPP;
> + | ^~~~~~~~
> +include/dm/read.h:932:10: note: each undeclared identifier is reported
> only once for each function it appears in
> +make[2]: *** [scripts/Makefile.build:266:
> board/toradex/common/tdx-eeprom.o] Error 1
> +make[1]: *** [Makefile:1793: board/toradex/common] Error 2
> +make: *** [Makefile:167: sub-make] Error 2
>
>
> Adding the include to dm/read.h, issue is solved:
>
> diff --git a/include/dm/read.h b/include/dm/read.h
> index f02ec95954..cc4ab22f65 100644
> --- a/include/dm/read.h
> +++ b/include/dm/read.h
> @@ -12,6 +12,7 @@
> #include <dm/fdtaddr.h>
> #include <dm/ofnode.h>
> #include <dm/uclass.h>
> +#include <linux/errno.h>
>
> struct resource;
>
>
> I could add it myself if there is a general agreement, but the usual way
> is to repost it.
This is also fixed by:
http://patchwork.ozlabs.org/project/uboot/patch/20200723120138.10625-1-dmurphy at ti.com/
as Dan also ran in to this problem. I assigned it to Simon but if you
want to take it as part of being able to pick up Igor's series now I'm
sure that's fine. Thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200727/87fd0506/attachment.sig>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers
2020-07-27 13:35 ` Tom Rini
@ 2020-07-27 14:17 ` Stefano Babic
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Babic @ 2020-07-27 14:17 UTC (permalink / raw)
To: u-boot
On 27.07.20 15:35, Tom Rini wrote:
> On Mon, Jul 27, 2020 at 02:49:30PM +0200, Stefano Babic wrote:
>> Hi Igor,
>>
>> On 15.07.20 12:30, Igor Opaniuk wrote:
>>> From: Igor Opaniuk <igor.opaniuk@toradex.com>
>>>
>>> These functions wrap functionality for storing config blocks in EEPROM.
>>>
>>> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
>>> ---
>>>
>>
>> This breaks one of your (obsolete ?) board, colibri_pxa270
>>
>> Reason is a side-effect in dm/read.h:
>>
>> arm: + colibri_pxa270
>> +In file included from include/dm.h:12,
>> + from board/toradex/common/tdx-eeprom.c:6:
>> +include/dm/read.h: In function 'dev_read_alias_seq':
>> +include/dm/read.h:932:10: error: 'ENOTSUPP' undeclared (first use in
>> this function)
>> + 932 | return -ENOTSUPP;
>> + | ^~~~~~~~
>> +include/dm/read.h:932:10: note: each undeclared identifier is reported
>> only once for each function it appears in
>> +make[2]: *** [scripts/Makefile.build:266:
>> board/toradex/common/tdx-eeprom.o] Error 1
>> +make[1]: *** [Makefile:1793: board/toradex/common] Error 2
>> +make: *** [Makefile:167: sub-make] Error 2
>>
>>
>> Adding the include to dm/read.h, issue is solved:
>>
>> diff --git a/include/dm/read.h b/include/dm/read.h
>> index f02ec95954..cc4ab22f65 100644
>> --- a/include/dm/read.h
>> +++ b/include/dm/read.h
>> @@ -12,6 +12,7 @@
>> #include <dm/fdtaddr.h>
>> #include <dm/ofnode.h>
>> #include <dm/uclass.h>
>> +#include <linux/errno.h>
>>
>> struct resource;
>>
>>
>> I could add it myself if there is a general agreement, but the usual way
>> is to repost it.
>
> This is also fixed by:
> http://patchwork.ozlabs.org/project/uboot/patch/20200723120138.10625-1-dmurphy at ti.com/
> as Dan also ran in to this problem. I assigned it to Simon but if you
> want to take it as part of being able to pick up Igor's series now I'm
> sure that's fine. Thanks!
Fine, thanks ! I pick up Dan's.
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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers
2020-07-15 10:30 ` [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers Igor Opaniuk
2020-07-27 12:49 ` Stefano Babic
@ 2020-07-27 19:09 ` sbabic at denx.de
1 sibling, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> These functions wrap functionality for storing config blocks in EEPROM.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 03/14] toradex: tdx-cfg-block: add carrier boards and display adapters
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
2020-07-15 10:30 ` [PATCH v2 01/14] imx: mx7: fix DDRC size in A7-M4 mapping table Igor Opaniuk
2020-07-15 10:30 ` [PATCH v2 02/14] toradex: tdx-cfg-block: add EEPROM read/store wrappers Igor Opaniuk
@ 2020-07-15 10:30 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 04/14] toradex: tdx-cfg-block: add support for EEPROM Igor Opaniuk
` (11 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:30 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
Add defines for supported carrier boards and display adapters.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
board/toradex/common/tdx-cfg-block.c | 12 ++++++++++++
board/toradex/common/tdx-cfg-block.h | 11 +++++++++++
2 files changed, 23 insertions(+)
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 75216ecf6d..adf67216c6 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -124,6 +124,18 @@ const char * const toradex_modules[] = {
[57] = "Verdin iMX8M Mini DualLite 1GB",
};
+const char * const toradex_carrier_boards[] = {
+ [0] = "UNKNOWN CARRIER BOARD",
+ [155] = "Dahlia",
+ [156] = "Verdin Development Board",
+};
+
+const char * const toradex_display_adapters[] = {
+ [0] = "UNKNOWN DISPLAY ADAPTER",
+ [157] = "Verdin DSI to HDMI Adapter",
+ [159] = "Verdin DSI to LVDS Adapter",
+};
+
#ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_MMC
static int tdx_cfg_block_mmc_storage(u8 *config_block, int write)
{
diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h
index d8f3941f26..d58be23abb 100644
--- a/board/toradex/common/tdx-cfg-block.h
+++ b/board/toradex/common/tdx-cfg-block.h
@@ -80,7 +80,18 @@ enum {
VERDIN_IMX8MMDL,
};
+enum {
+ DAHLIA = 155,
+ VERDIN_DEVELOPMENT_BOARD = 156,
+};
+
+enum {
+ VERDIN_DSI_TO_HDMI_ADAPTER = 157,
+ VERDIN_DSI_TO_LVDS_ADAPTER = 159,
+};
+
extern const char * const toradex_modules[];
+extern const char * const toradex_carrier_boards[];
extern bool valid_cfgblock;
extern struct toradex_hw tdx_hw_tag;
extern struct toradex_eth_addr tdx_eth_addr;
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 03/14] toradex: tdx-cfg-block: add carrier boards and display adapters
2020-07-15 10:30 ` [PATCH v2 03/14] toradex: tdx-cfg-block: add carrier boards and display adapters Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Add defines for supported carrier boards and display adapters.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 04/14] toradex: tdx-cfg-block: add support for EEPROM
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (2 preceding siblings ...)
2020-07-15 10:30 ` [PATCH v2 03/14] toradex: tdx-cfg-block: add carrier boards and display adapters Igor Opaniuk
@ 2020-07-15 10:30 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 05/14] toradex: tdx-cfg-clock: add migration routine from PID8 Igor Opaniuk
` (10 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:30 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
This introduces support for EEPROM as a storage for the main Toradex
config block and additional config blocks on extra EEPROM chips (on
carrier board or video adapters).
To enable EEPROM as a storage for the main config block:
TDX_HAVE_EEPROM=y.
For additional EEPROMs please enable this Kconfig symbol:
TDX_CFG_BLOCK_EXTRA=y.
Information about existing EEPROM chips is provided via Device Tree
using aliases.
You can also write configuration for the carrier board using
create_carrier subcommand for cfgblock. Example:
Verdin iMX8MM # cfgblock create_carrier
Supported carrier boards:
UNKNOWN CARRIER = [0]
Verdin Carrier Board = [1]
Choose your carrier board (provide ID): 1
Enter carrier board version (e.g. V1.1B): V1.0A
Enter carrier board serial number: 10622780
Also with barcode:
Verdin iMX8MM # cfgblock create carrier -y 0156100010622780
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
board/toradex/common/Kconfig | 18 ++
board/toradex/common/tdx-cfg-block.c | 312 +++++++++++++++++++++++----
board/toradex/common/tdx-cfg-block.h | 3 +
3 files changed, 294 insertions(+), 39 deletions(-)
diff --git a/board/toradex/common/Kconfig b/board/toradex/common/Kconfig
index 11f4aab359..36068d2e3b 100644
--- a/board/toradex/common/Kconfig
+++ b/board/toradex/common/Kconfig
@@ -20,6 +20,12 @@ config TDX_HAVE_NAND
config TDX_HAVE_NOR
bool
+config TDX_HAVE_EEPROM
+ bool
+
+config TDX_HAVE_EEPROM_EXTRA
+ bool
+
if TDX_CFG_BLOCK
config TDX_CFG_BLOCK_IS_IN_MMC
@@ -37,6 +43,11 @@ config TDX_CFG_BLOCK_IS_IN_NOR
depends on TDX_HAVE_NOR
default y
+config TDX_CFG_BLOCK_IS_IN_EEPROM
+ bool
+ depends on TDX_HAVE_EEPROM
+ default y
+
config TDX_CFG_BLOCK_DEV
int "Toradex config block eMMC device ID"
depends on TDX_CFG_BLOCK_IS_IN_MMC
@@ -66,4 +77,11 @@ config TDX_CFG_BLOCK_2ND_ETHADDR
Ethernet carrier boards. This options enables the code to set the
second Ethernet address as environment variable (eth1addr).
+config TDX_CFG_BLOCK_EXTRA
+ bool "Support for additional EEPROMs (carrier board, display adapter)"
+ depends on TDX_HAVE_EEPROM_EXTRA
+ help
+ Enables fetching auxilary config blocks from carrier board/display
+ adapter EEPROMs.
+
endif
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index adf67216c6..5162ed48b8 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -5,6 +5,8 @@
#include <common.h>
#include "tdx-cfg-block.h"
+#include "tdx-eeprom.h"
+
#include <command.h>
#include <asm/cache.h>
@@ -37,21 +39,31 @@ DECLARE_GLOBAL_DATA_PTR;
#define TAG_VALID 0xcf01
#define TAG_MAC 0x0000
+#define TAG_CAR_SERIAL 0x0021
#define TAG_HW 0x0008
#define TAG_INVALID 0xffff
#define TAG_FLAG_VALID 0x1
+#define TDX_EEPROM_ID_MODULE 0
+#define TDX_EEPROM_ID_CARRIER 1
+
#if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_MMC)
#define TDX_CFG_BLOCK_MAX_SIZE 512
#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND)
#define TDX_CFG_BLOCK_MAX_SIZE 64
#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR)
#define TDX_CFG_BLOCK_MAX_SIZE 64
+#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_EEPROM)
+#define TDX_CFG_BLOCK_MAX_SIZE 64
#else
#error Toradex config block location not set
#endif
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+#define TDX_CFG_BLOCK_EXTRA_MAX_SIZE 64
+#endif
+
struct toradex_tag {
u32 len:14;
u32 flags:2;
@@ -62,6 +74,11 @@ bool valid_cfgblock;
struct toradex_hw tdx_hw_tag;
struct toradex_eth_addr tdx_eth_addr;
u32 tdx_serial;
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+u32 tdx_car_serial;
+bool valid_cfgblock_carrier;
+struct toradex_hw tdx_car_hw_tag;
+#endif
const char * const toradex_modules[] = {
[0] = "UNKNOWN MODULE",
@@ -236,6 +253,20 @@ static int write_tdx_cfg_block_to_nor(unsigned char *config_block)
}
#endif
+#ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_EEPROM
+static int read_tdx_cfg_block_from_eeprom(unsigned char *config_block)
+{
+ return read_tdx_eeprom_data(TDX_EEPROM_ID_MODULE, 0x0, config_block,
+ TDX_CFG_BLOCK_MAX_SIZE);
+}
+
+static int write_tdx_cfg_block_to_eeprom(unsigned char *config_block)
+{
+ return write_tdx_eeprom_data(TDX_EEPROM_ID_MODULE, 0x0, config_block,
+ TDX_CFG_BLOCK_MAX_SIZE);
+}
+#endif
+
int read_tdx_cfg_block(void)
{
int ret = 0;
@@ -259,6 +290,8 @@ int read_tdx_cfg_block(void)
ret = read_tdx_cfg_block_from_nand(config_block);
#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR)
ret = read_tdx_cfg_block_from_nor(config_block);
+#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_EEPROM)
+ ret = read_tdx_cfg_block_from_eeprom(config_block);
#else
ret = -EINVAL;
#endif
@@ -275,7 +308,12 @@ int read_tdx_cfg_block(void)
valid_cfgblock = true;
offset = 4;
- while (offset < TDX_CFG_BLOCK_MAX_SIZE) {
+ /*
+ * check if there is enough space for storing tag and value of the
+ * biggest element
+ */
+ while (offset + sizeof(struct toradex_tag) +
+ sizeof(struct toradex_hw) < TDX_CFG_BLOCK_MAX_SIZE) {
tag = (struct toradex_tag *)(config_block + offset);
offset += 4;
if (tag->id == TAG_INVALID)
@@ -334,7 +372,6 @@ static int get_cfgblock_interactive(void)
it = 'y';
#endif
-
#if defined(CONFIG_TARGET_APALIS_IMX8) || \
defined(CONFIG_TARGET_APALIS_IMX8X) || \
defined(CONFIG_TARGET_COLIBRI_IMX6ULL) || \
@@ -505,7 +542,8 @@ static int get_cfgblock_interactive(void)
return 0;
}
-static int get_cfgblock_barcode(char *barcode)
+static int get_cfgblock_barcode(char *barcode, struct toradex_hw *tag,
+ u32 *serial)
{
if (strlen(barcode) < 16) {
printf("Argument too short, barcode is 16 chars long\n");
@@ -513,31 +551,154 @@ static int get_cfgblock_barcode(char *barcode)
}
/* Get hardware information from the first 8 digits */
- tdx_hw_tag.ver_major = barcode[4] - '0';
- tdx_hw_tag.ver_minor = barcode[5] - '0';
- tdx_hw_tag.ver_assembly = barcode[7] - '0';
+ tag->ver_major = barcode[4] - '0';
+ tag->ver_minor = barcode[5] - '0';
+ tag->ver_assembly = barcode[7] - '0';
barcode[4] = '\0';
- tdx_hw_tag.prodid = simple_strtoul(barcode, NULL, 10);
+ tag->prodid = simple_strtoul(barcode, NULL, 10);
/* Parse second part of the barcode (serial number */
barcode += 8;
- tdx_serial = simple_strtoul(barcode, NULL, 10);
+ *serial = simple_strtoul(barcode, NULL, 10);
return 0;
}
-static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc,
- char *const argv[])
+static int write_tag(u8 *config_block, int *offset, int tag_id,
+ u8 *tag_data, size_t tag_data_size)
{
- u8 *config_block;
struct toradex_tag *tag;
- size_t size = TDX_CFG_BLOCK_MAX_SIZE;
+
+ if (!offset || !config_block)
+ return -EINVAL;
+
+ tag = (struct toradex_tag *)(config_block + *offset);
+ tag->id = tag_id;
+ tag->flags = TAG_FLAG_VALID;
+ /* len is provided as number of 32bit values after the tag */
+ tag->len = (tag_data_size + sizeof(u32) - 1) / sizeof(u32);
+ *offset += sizeof(struct toradex_tag);
+ if (tag_data && tag_data_size) {
+ memcpy(config_block + *offset, tag_data,
+ tag_data_size);
+ *offset += tag_data_size;
+ }
+
+ return 0;
+}
+
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+int read_tdx_cfg_block_carrier(void)
+{
+ int ret = 0;
+ u8 *config_block = NULL;
+ struct toradex_tag *tag;
+ size_t size = TDX_CFG_BLOCK_EXTRA_MAX_SIZE;
+ int offset;
+
+ /* Allocate RAM area for carrier config block */
+ config_block = memalign(ARCH_DMA_MINALIGN, size);
+ if (!config_block) {
+ printf("Not enough malloc space available!\n");
+ return -ENOMEM;
+ }
+
+ memset(config_block, 0, size);
+
+ ret = read_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, config_block,
+ size);
+ if (ret)
+ return ret;
+
+ /* Expect a valid tag first */
+ tag = (struct toradex_tag *)config_block;
+ if (tag->flags != TAG_FLAG_VALID || tag->id != TAG_VALID) {
+ valid_cfgblock_carrier = false;
+ ret = -EINVAL;
+ goto out;
+ }
+ valid_cfgblock_carrier = true;
+ offset = 4;
+
+ while (offset + sizeof(struct toradex_tag) +
+ sizeof(struct toradex_hw) < TDX_CFG_BLOCK_MAX_SIZE) {
+ tag = (struct toradex_tag *)(config_block + offset);
+ offset += 4;
+ if (tag->id == TAG_INVALID)
+ break;
+
+ if (tag->flags == TAG_FLAG_VALID) {
+ switch (tag->id) {
+ case TAG_CAR_SERIAL:
+ memcpy(&tdx_car_serial, config_block + offset,
+ sizeof(tdx_car_serial));
+ break;
+ case TAG_HW:
+ memcpy(&tdx_car_hw_tag, config_block +
+ offset, 8);
+ break;
+ }
+ }
+
+ /* Get to next tag according to current tags length */
+ offset += tag->len * 4;
+ }
+out:
+ free(config_block);
+ return ret;
+}
+
+static int get_cfgblock_carrier_interactive(void)
+{
+ char message[CONFIG_SYS_CBSIZE];
+ int len;
+
+ printf("Supported carrier boards:\n");
+ printf("CARRIER BOARD NAME\t\t [ID]\n");
+ for (int i = 0; i < sizeof(toradex_carrier_boards) /
+ sizeof(toradex_carrier_boards[0]); i++)
+ if (toradex_carrier_boards[i])
+ printf("%s \t\t [%d]\n", toradex_carrier_boards[i], i);
+
+ sprintf(message, "Choose your carrier board (provide ID): ");
+ len = cli_readline(message);
+ tdx_car_hw_tag.prodid = simple_strtoul(console_buffer, NULL, 10);
+
+ do {
+ sprintf(message, "Enter carrier board version (e.g. V1.1B): V");
+ len = cli_readline(message);
+ } while (len < 4);
+
+ tdx_car_hw_tag.ver_major = console_buffer[0] - '0';
+ tdx_car_hw_tag.ver_minor = console_buffer[2] - '0';
+ tdx_car_hw_tag.ver_assembly = console_buffer[3] - 'A';
+
+ while (len < 8) {
+ sprintf(message, "Enter carrier board serial number: ");
+ len = cli_readline(message);
+ }
+
+ tdx_car_serial = simple_strtoul(console_buffer, NULL, 10);
+
+ return 0;
+}
+
+static int do_cfgblock_carrier_create(struct cmd_tbl *cmdtp, int flag, int argc,
+ char * const argv[])
+{
+ u8 *config_block;
+ size_t size = TDX_CFG_BLOCK_EXTRA_MAX_SIZE;
int offset = 0;
int ret = CMD_RET_SUCCESS;
int err;
int force_overwrite = 0;
+ if (argc >= 3) {
+ if (argv[2][0] == '-' && argv[2][1] == 'y')
+ force_overwrite = 1;
+ }
+
/* Allocate RAM area for config block */
config_block = memalign(ARCH_DMA_MINALIGN, size);
if (!config_block) {
@@ -546,12 +707,95 @@ static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc,
}
memset(config_block, 0xff, size);
+ read_tdx_cfg_block_carrier();
+ if (valid_cfgblock_carrier && !force_overwrite) {
+ char message[CONFIG_SYS_CBSIZE];
+
+ sprintf(message, "A valid Toradex Carrier config block is present, still recreate? [y/N] ");
+
+ if (!cli_readline(message))
+ goto out;
+
+ if (console_buffer[0] != 'y' &&
+ console_buffer[0] != 'Y')
+ goto out;
+ }
+
+ if (argc < 3 || (force_overwrite && argc < 4)) {
+ err = get_cfgblock_carrier_interactive();
+ } else {
+ if (force_overwrite)
+ err = get_cfgblock_barcode(argv[3], &tdx_car_hw_tag,
+ &tdx_car_serial);
+ else
+ err = get_cfgblock_barcode(argv[2], &tdx_car_hw_tag,
+ &tdx_car_serial);
+ }
+
+ if (err) {
+ ret = CMD_RET_FAILURE;
+ goto out;
+ }
+
+ /* Valid Tag */
+ write_tag(config_block, &offset, TAG_VALID, NULL, 0);
+
+ /* Product Tag */
+ write_tag(config_block, &offset, TAG_HW, (u8 *)&tdx_car_hw_tag,
+ sizeof(tdx_car_hw_tag));
+
+ /* Serial Tag */
+ write_tag(config_block, &offset, TAG_CAR_SERIAL, (u8 *)&tdx_car_serial,
+ sizeof(tdx_car_serial));
+
+ memset(config_block + offset, 0, 32 - offset);
+ err = write_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, config_block,
+ size);
+ if (err) {
+ printf("Failed to write Toradex Extra config block: %d\n",
+ ret);
+ ret = CMD_RET_FAILURE;
+ goto out;
+ }
+
+ printf("Toradex Extra config block successfully written\n");
+
+out:
+ free(config_block);
+ return ret;
+}
+
+#endif /* CONFIG_TDX_CFG_BLOCK_EXTRA */
+
+static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc,
+ char * const argv[])
+{
+ u8 *config_block;
+ size_t size = TDX_CFG_BLOCK_MAX_SIZE;
+ int offset = 0;
+ int ret = CMD_RET_SUCCESS;
+ int err;
+ int force_overwrite = 0;
if (argc >= 3) {
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+ if (!strcmp(argv[2], "carrier"))
+ return do_cfgblock_carrier_create(cmdtp, flag,
+ --argc, ++argv);
+#endif /* CONFIG_TDX_CFG_BLOCK_EXTRA */
if (argv[2][0] == '-' && argv[2][1] == 'y')
force_overwrite = 1;
}
+ /* Allocate RAM area for config block */
+ config_block = memalign(ARCH_DMA_MINALIGN, size);
+ if (!config_block) {
+ printf("Not enough malloc space available!\n");
+ return CMD_RET_FAILURE;
+ }
+
+ memset(config_block, 0xff, size);
+
read_tdx_cfg_block();
if (valid_cfgblock) {
#if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND)
@@ -593,9 +837,11 @@ static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc,
err = get_cfgblock_interactive();
} else {
if (force_overwrite)
- err = get_cfgblock_barcode(argv[3]);
+ err = get_cfgblock_barcode(argv[3], &tdx_hw_tag,
+ &tdx_serial);
else
- err = get_cfgblock_barcode(argv[2]);
+ err = get_cfgblock_barcode(argv[2], &tdx_hw_tag,
+ &tdx_serial);
}
if (err) {
ret = CMD_RET_FAILURE;
@@ -607,39 +853,25 @@ static int do_cfgblock_create(struct cmd_tbl *cmdtp, int flag, int argc,
tdx_eth_addr.nic = htonl(tdx_serial << 8);
/* Valid Tag */
- tag = (struct toradex_tag *)config_block;
- tag->id = TAG_VALID;
- tag->flags = TAG_FLAG_VALID;
- tag->len = 0;
- offset += 4;
+ write_tag(config_block, &offset, TAG_VALID, NULL, 0);
/* Product Tag */
- tag = (struct toradex_tag *)(config_block + offset);
- tag->id = TAG_HW;
- tag->flags = TAG_FLAG_VALID;
- tag->len = 2;
- offset += 4;
-
- memcpy(config_block + offset, &tdx_hw_tag, 8);
- offset += 8;
+ write_tag(config_block, &offset, TAG_HW, (u8 *)&tdx_hw_tag,
+ sizeof(tdx_hw_tag));
/* MAC Tag */
- tag = (struct toradex_tag *)(config_block + offset);
- tag->id = TAG_MAC;
- tag->flags = TAG_FLAG_VALID;
- tag->len = 2;
- offset += 4;
+ write_tag(config_block, &offset, TAG_MAC, (u8 *)&tdx_eth_addr,
+ sizeof(tdx_eth_addr));
- memcpy(config_block + offset, &tdx_eth_addr, 6);
- offset += 6;
memset(config_block + offset, 0, 32 - offset);
-
#if defined(CONFIG_TDX_CFG_BLOCK_IS_IN_MMC)
err = tdx_cfg_block_mmc_storage(config_block, 1);
#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NAND)
err = write_tdx_cfg_block_to_nand(config_block);
#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_NOR)
err = write_tdx_cfg_block_to_nor(config_block);
+#elif defined(CONFIG_TDX_CFG_BLOCK_IS_IN_EEPROM)
+ err = write_tdx_cfg_block_to_eeprom(config_block);
#else
err = -EINVAL;
#endif
@@ -679,8 +911,10 @@ static int do_cfgblock(struct cmd_tbl *cmdtp, int flag, int argc,
return CMD_RET_USAGE;
}
-U_BOOT_CMD(cfgblock, 4, 0, do_cfgblock,
- "Toradex config block handling commands",
- "create [-y] [barcode] - (Re-)create Toradex config block\n"
- "cfgblock reload - Reload Toradex config block from flash"
+U_BOOT_CMD(
+ cfgblock, 5, 0, do_cfgblock,
+ "Toradex config block handling commands",
+ "create [-y] [barcode] - (Re-)create Toradex config block\n"
+ "create carrier [-y] [barcode] - (Re-)create Toradex Carrier config block\n"
+ "cfgblock reload - Reload Toradex config block from flash"
);
diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h
index d58be23abb..e18da3370e 100644
--- a/board/toradex/common/tdx-cfg-block.h
+++ b/board/toradex/common/tdx-cfg-block.h
@@ -94,9 +94,12 @@ extern const char * const toradex_modules[];
extern const char * const toradex_carrier_boards[];
extern bool valid_cfgblock;
extern struct toradex_hw tdx_hw_tag;
+extern struct toradex_hw tdx_car_hw_tag;
extern struct toradex_eth_addr tdx_eth_addr;
extern u32 tdx_serial;
+extern u32 tdx_car_serial;
int read_tdx_cfg_block(void);
+int read_tdx_cfg_block_carrier(void);
#endif /* _TDX_CFG_BLOCK_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 04/14] toradex: tdx-cfg-block: add support for EEPROM
2020-07-15 10:30 ` [PATCH v2 04/14] toradex: tdx-cfg-block: add support for EEPROM Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> This introduces support for EEPROM as a storage for the main Toradex
> config block and additional config blocks on extra EEPROM chips (on
> carrier board or video adapters).
> To enable EEPROM as a storage for the main config block:
> TDX_HAVE_EEPROM=y.
> For additional EEPROMs please enable this Kconfig symbol:
> TDX_CFG_BLOCK_EXTRA=y.
> Information about existing EEPROM chips is provided via Device Tree
> using aliases.
> You can also write configuration for the carrier board using
> create_carrier subcommand for cfgblock. Example:
> Verdin iMX8MM # cfgblock create_carrier
> Supported carrier boards:
> UNKNOWN CARRIER = [0]
> Verdin Carrier Board = [1]
> Choose your carrier board (provide ID): 1
> Enter carrier board version (e.g. V1.1B): V1.0A
> Enter carrier board serial number: 10622780
> Also with barcode:
> Verdin iMX8MM # cfgblock create carrier -y 0156100010622780
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 05/14] toradex: tdx-cfg-clock: add migration routine from PID8
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (3 preceding siblings ...)
2020-07-15 10:30 ` [PATCH v2 04/14] toradex: tdx-cfg-block: add support for EEPROM Igor Opaniuk
@ 2020-07-15 10:30 ` Igor Opaniuk
2020-07-27 19:10 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 06/14] toradex: tdx-cfg-block: add carrier board info printing Igor Opaniuk
` (9 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:30 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
Add migration routine from PID8 pre-stored values on EEPROM
(including sane value checks).
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
board/toradex/common/tdx-cfg-block.c | 78 ++++++++++++++++++++++++++++
board/toradex/common/tdx-cfg-block.h | 2 +
2 files changed, 80 insertions(+)
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 5162ed48b8..bf27b2fa66 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -649,6 +649,84 @@ out:
return ret;
}
+int check_pid8_sanity(char *pid8)
+{
+ char s_carrierid_verdin_dev[5];
+ char s_carrierid_dahlia[5];
+
+ sprintf(s_carrierid_verdin_dev, "0%d", VERDIN_DEVELOPMENT_BOARD);
+ sprintf(s_carrierid_dahlia, "0%d", DAHLIA);
+
+ /* sane value check, first 4 chars which represent carrier id */
+ if (!strncmp(pid8, s_carrierid_verdin_dev, 4))
+ return 0;
+
+ if (!strncmp(pid8, s_carrierid_dahlia, 4))
+ return 0;
+
+ return -EINVAL;
+}
+
+int try_migrate_tdx_cfg_block_carrier(void)
+{
+ char pid8[8];
+ int offset = 0;
+ int ret = CMD_RET_SUCCESS;
+ size_t size = TDX_CFG_BLOCK_EXTRA_MAX_SIZE;
+ u8 *config_block;
+
+ memset(pid8, 0x0, 8);
+ ret = read_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, (u8 *)pid8, 8);
+ if (ret)
+ return ret;
+
+ if (check_pid8_sanity(pid8))
+ return -EINVAL;
+
+ /* Allocate RAM area for config block */
+ config_block = memalign(ARCH_DMA_MINALIGN, size);
+ if (!config_block) {
+ printf("Not enough malloc space available!\n");
+ return CMD_RET_FAILURE;
+ }
+
+ memset(config_block, 0xff, size);
+ /* we try parse PID8 concatenating zeroed serial number */
+ tdx_car_hw_tag.ver_major = pid8[4] - '0';
+ tdx_car_hw_tag.ver_minor = pid8[5] - '0';
+ tdx_car_hw_tag.ver_assembly = pid8[7] - '0';
+
+ pid8[4] = '\0';
+ tdx_car_hw_tag.prodid = simple_strtoul(pid8, NULL, 10);
+
+ /* Valid Tag */
+ write_tag(config_block, &offset, TAG_VALID, NULL, 0);
+
+ /* Product Tag */
+ write_tag(config_block, &offset, TAG_HW, (u8 *)&tdx_car_hw_tag,
+ sizeof(tdx_car_hw_tag));
+
+ /* Serial Tag */
+ write_tag(config_block, &offset, TAG_CAR_SERIAL, (u8 *)&tdx_car_serial,
+ sizeof(tdx_car_serial));
+
+ memset(config_block + offset, 0, 32 - offset);
+ ret = write_tdx_eeprom_data(TDX_EEPROM_ID_CARRIER, 0x0, config_block,
+ size);
+ if (ret) {
+ printf("Failed to write Toradex Extra config block: %d\n",
+ ret);
+ ret = CMD_RET_FAILURE;
+ goto out;
+ }
+
+ printf("Successfully migrated to Toradex Config Block from PID8\n");
+
+out:
+ free(config_block);
+ return ret;
+}
+
static int get_cfgblock_carrier_interactive(void)
{
char message[CONFIG_SYS_CBSIZE];
diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h
index e18da3370e..8f91d9aec6 100644
--- a/board/toradex/common/tdx-cfg-block.h
+++ b/board/toradex/common/tdx-cfg-block.h
@@ -102,4 +102,6 @@ extern u32 tdx_car_serial;
int read_tdx_cfg_block(void);
int read_tdx_cfg_block_carrier(void);
+int try_migrate_tdx_cfg_block_carrier(void);
+
#endif /* _TDX_CFG_BLOCK_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 05/14] toradex: tdx-cfg-clock: add migration routine from PID8
2020-07-15 10:30 ` [PATCH v2 05/14] toradex: tdx-cfg-clock: add migration routine from PID8 Igor Opaniuk
@ 2020-07-27 19:10 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:10 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Add migration routine from PID8 pre-stored values on EEPROM
> (including sane value checks).
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 06/14] toradex: tdx-cfg-block: add carrier board info printing
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (4 preceding siblings ...)
2020-07-15 10:30 ` [PATCH v2 05/14] toradex: tdx-cfg-clock: add migration routine from PID8 Igor Opaniuk
@ 2020-07-15 10:30 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 07/14] ARM: dts: imx8mm-verdin: eeprom nodes adjustments Igor Opaniuk
` (8 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:30 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
Add carrier board info printing during boot time:
U-Boot 2020.07-rc4-02435-g1756e05 (Jun 22 2020 - 22:43:59 +0300)
CPU: Freescale i.MX8MMQ rev1.0 at 1200 MHz
....
Carrier: Toradex Verdin Development Board V1.0A, Serial# 10622780
Verdin iMX8MM #
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
board/toradex/common/tdx-common.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index e8de923f3e..7e353b4fd9 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -19,6 +19,12 @@
static char tdx_serial_str[9];
static char tdx_board_rev_str[6];
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+static char tdx_car_serial_str[9];
+static char tdx_car_rev_str[6];
+static char *tdx_carrier_board_name;
+#endif
+
#ifdef CONFIG_REVISION_TAG
u32 get_board_rev(void)
{
@@ -88,6 +94,28 @@ int show_board_info(void)
toradex_modules[tdx_hw_tag.prodid],
tdx_board_rev_str,
tdx_serial_str);
+#ifdef CONFIG_TDX_CFG_BLOCK_EXTRA
+ if (read_tdx_cfg_block_carrier()) {
+ printf("MISSING TORADEX CARRIER CONFIG BLOCKS\n");
+ try_migrate_tdx_cfg_block_carrier();
+ } else {
+ tdx_carrier_board_name = (char *)
+ toradex_carrier_boards[tdx_car_hw_tag.prodid];
+
+ sprintf(tdx_car_serial_str, "%08u", tdx_car_serial);
+ sprintf(tdx_car_rev_str, "V%1d.%1d%c",
+ tdx_car_hw_tag.ver_major,
+ tdx_car_hw_tag.ver_minor,
+ (char)tdx_car_hw_tag.ver_assembly +
+ 'A');
+
+ env_set("carrier_serial#", tdx_car_serial_str);
+ printf("Carrier: Toradex %s %s, Serial# %s\n",
+ tdx_carrier_board_name,
+ tdx_car_rev_str,
+ tdx_car_serial_str);
+ }
+#endif
}
/*
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 06/14] toradex: tdx-cfg-block: add carrier board info printing
2020-07-15 10:30 ` [PATCH v2 06/14] toradex: tdx-cfg-block: add carrier board info printing Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Add carrier board info printing during boot time:
> U-Boot 2020.07-rc4-02435-g1756e05 (Jun 22 2020 - 22:43:59 +0300)
> CPU: Freescale i.MX8MMQ rev1.0 at 1200 MHz
> ....
> Carrier: Toradex Verdin Development Board V1.0A, Serial# 10622780
> Verdin iMX8MM #
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 07/14] ARM: dts: imx8mm-verdin: eeprom nodes adjustments
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (5 preceding siblings ...)
2020-07-15 10:30 ` [PATCH v2 06/14] toradex: tdx-cfg-block: add carrier board info printing Igor Opaniuk
@ 2020-07-15 10:30 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:30 ` [PATCH v2 08/14] verdin-imx8mm: add EEPROM support for carrier board Igor Opaniuk
` (7 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:30 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
Rename EEPROM nodes.
Create aliases for EEPROM to unify their order:
eeprom0 - on-module EEPROM
eeprom1 - carrier-board EEPROM
eeprom2 - MIPI-DSI to HDMI adapter EEPROM
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
arch/arm/dts/imx8mm-verdin.dts | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/arch/arm/dts/imx8mm-verdin.dts b/arch/arm/dts/imx8mm-verdin.dts
index b86f46e03e..1c67c08c88 100644
--- a/arch/arm/dts/imx8mm-verdin.dts
+++ b/arch/arm/dts/imx8mm-verdin.dts
@@ -16,6 +16,12 @@
stdout-path = &uart1;
};
+ aliases {
+ eeprom0 = &eeprom_module;
+ eeprom1 = &eeprom_carrier_board;
+ eeprom2 = &eeprom_display_adapter;
+ };
+
/* fixed clock dedicated to SPI CAN controller */
clk20m: oscillator {
compatible = "fixed-clock";
@@ -321,8 +327,8 @@
vcc-supply = <&ldo5_reg>;
};
- eeprom at 50 {
- compatible = "st,24c02";
+ eeprom_module: eeprom at 50 {
+ compatible = "st,24c02", "atmel,24c02", "i2c-eeprom";
pagesize = <16>;
reg = <0x50>;
};
@@ -377,16 +383,16 @@
status = "okay";
};
- /* EEPROM on MIPI-DSI to HDMI adapter */
- eeprom_50: eeprom at 50 {
- compatible = "st,24c02";
+ /* EEPROM on display adapter (MIPI DSI Display Adapter) */
+ eeprom_display_adapter: eeprom at 50 {
+ compatible = "st,24c02", "atmel,24c02", "i2c-eeprom";
pagesize = <16>;
reg = <0x50>;
};
- /* EEPROM on Verdin Development board */
- eeprom_57: eeprom at 57 {
- compatible = "st,24c02";
+ /* EEPROM on carrier board */
+ eeprom_carrier_board: eeprom at 57 {
+ compatible = "st,24c02", "atmel,24c02", "i2c-eeprom";
pagesize = <16>;
reg = <0x57>;
};
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 07/14] ARM: dts: imx8mm-verdin: eeprom nodes adjustments
2020-07-15 10:30 ` [PATCH v2 07/14] ARM: dts: imx8mm-verdin: eeprom nodes adjustments Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Rename EEPROM nodes.
> Create aliases for EEPROM to unify their order:
> eeprom0 - on-module EEPROM
> eeprom1 - carrier-board EEPROM
> eeprom2 - MIPI-DSI to HDMI adapter EEPROM
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 08/14] verdin-imx8mm: add EEPROM support for carrier board
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (6 preceding siblings ...)
2020-07-15 10:30 ` [PATCH v2 07/14] ARM: dts: imx8mm-verdin: eeprom nodes adjustments Igor Opaniuk
@ 2020-07-15 10:30 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 09/14] ARM: dts: imx6ull-colibri: move u-boot specific node Igor Opaniuk
` (6 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:30 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
Enable these Kconfig symbols:
TDX_CFG_BLOCK_EXTRA=y
TDX_HAVE_EEPROM_EXTRA=y
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
board/toradex/verdin-imx8mm/Kconfig | 6 ++++++
configs/verdin-imx8mm_defconfig | 1 +
2 files changed, 7 insertions(+)
diff --git a/board/toradex/verdin-imx8mm/Kconfig b/board/toradex/verdin-imx8mm/Kconfig
index 8a2fe98682..149aed6da7 100644
--- a/board/toradex/verdin-imx8mm/Kconfig
+++ b/board/toradex/verdin-imx8mm/Kconfig
@@ -12,9 +12,15 @@ config SYS_CONFIG_NAME
config TDX_CFG_BLOCK
default y
+config TDX_CFG_BLOCK_EXTRA
+ default y
+
config TDX_HAVE_MMC
default y
+config TDX_HAVE_EEPROM_EXTRA
+ default y
+
config TDX_CFG_BLOCK_DEV
default "0"
diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig
index 302345f17a..d1c951f122 100644
--- a/configs/verdin-imx8mm_defconfig
+++ b/configs/verdin-imx8mm_defconfig
@@ -74,6 +74,7 @@ CONFIG_MXC_GPIO=y
CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MXC=y
CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
CONFIG_DM_MMC=y
CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC_IMX=y
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 08/14] verdin-imx8mm: add EEPROM support for carrier board
2020-07-15 10:30 ` [PATCH v2 08/14] verdin-imx8mm: add EEPROM support for carrier board Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Enable these Kconfig symbols:
> TDX_CFG_BLOCK_EXTRA=y
> TDX_HAVE_EEPROM_EXTRA=y
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 09/14] ARM: dts: imx6ull-colibri: move u-boot specific node
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (7 preceding siblings ...)
2020-07-15 10:30 ` [PATCH v2 08/14] verdin-imx8mm: add EEPROM support for carrier board Igor Opaniuk
@ 2020-07-15 10:31 ` Igor Opaniuk
2020-07-27 19:10 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 10/14] toradex: common: show boot logo Igor Opaniuk
` (5 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:31 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
1. Move aliases and legacy lcdif node to the u-boot specific dts include.
2. Provide proper display timings, as in the downstream Toradex kernel
[1].
[1]: https://git.toradex.com/cgit/linux-toradex.git/tree/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi?h=toradex_4.9-2.3.x-imx#n183
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
arch/arm/dts/imx6ull-colibri-u-boot.dtsi | 45 ++++++++++++++++++++++++
arch/arm/dts/imx6ull-colibri.dtsi | 43 ----------------------
2 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi
index 531cdcc4da..afdb0f43cf 100644
--- a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi
+++ b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi
@@ -3,6 +3,15 @@
* Copyright 2019 Toradex AG
*/
+/ {
+ aliases {
+ u-boot,dm-pre-reloc;
+ mmc0 = &usdhc1;
+ usb0 = &usbotg1; /* required for ums */
+ display0 = &lcdif;
+ };
+};
+
&pinctrl_uart1 {
u-boot,dm-pre-reloc;
};
@@ -10,3 +19,39 @@
&pinctrl_uart1_ctrl1 {
u-boot,dm-pre-reloc;
};
+
+&lcdif {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_lcdif_dat
+ &pinctrl_lcdif_ctrl>;
+ status = "okay";
+ display = <&display0>;
+ u-boot,dm-pre-reloc;
+
+ display0: display0 {
+ bits-per-pixel = <18>;
+ bus-width = <24>;
+ status = "okay";
+
+ display-timings {
+ native-mode = <&timing_vga>;
+ timing_vga: 640x480 {
+ u-boot,dm-pre-reloc;
+ clock-frequency = <25175000>;
+ hactive = <640>;
+ vactive = <480>;
+ hback-porch = <40>;
+ hfront-porch = <24>;
+ vback-porch = <32>;
+ vfront-porch = <11>;
+ hsync-len = <96>;
+ vsync-len = <2>;
+
+ de-active = <1>;
+ hsync-active = <0>;
+ vsync-active = <0>;
+ pixelclk-active = <0>;
+ };
+ };
+ };
+};
diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi
index fca53119fe..b7bf79f28c 100644
--- a/arch/arm/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/dts/imx6ull-colibri.dtsi
@@ -8,13 +8,6 @@
#include "imx6ull.dtsi"
/ {
- aliases {
- u-boot,dm-pre-reloc;
- mmc0 = &usdhc1;
- usb0 = &usbotg1; /* required for ums */
- display0 = &lcdif;
- };
-
chosen {
stdout-path = &uart1;
};
@@ -151,42 +144,6 @@
};
};
-&lcdif {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_lcdif_dat
- &pinctrl_lcdif_ctrl>;
- status = "okay";
- display = <&display0>;
- u-boot,dm-pre-reloc;
-
- display0: display0 {
- bits-per-pixel = <18>;
- bus-width = <24>;
- status = "okay";
-
- display-timings {
- native-mode = <&timing_vga>;
- timing_vga: 640x480 {
- u-boot,dm-pre-reloc;
- clock-frequency = <25175000>;
- hactive = <640>;
- vactive = <480>;
- hback-porch = <48>;
- hfront-porch = <16>;
- vback-porch = <33>;
- vfront-porch = <10>;
- hsync-len = <96>;
- vsync-len = <2>;
-
- de-active = <1>;
- hsync-active = <0>;
- vsync-active = <0>;
- pixelclk-active = <0>;
- };
- };
- };
-};
-
/* PWM <A> */
&pwm4 {
pinctrl-names = "default";
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 10/14] toradex: common: show boot logo
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (8 preceding siblings ...)
2020-07-15 10:31 ` [PATCH v2 09/14] ARM: dts: imx6ull-colibri: move u-boot specific node Igor Opaniuk
@ 2020-07-15 10:31 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 11/14] ARM: dts: imx7-colibri: multiple node updates Igor Opaniuk
` (4 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:31 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
Add function for showing boot logo, embed into u-boot blob.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
board/toradex/common/tdx-common.c | 26 ++++++++++++++++++++++++++
board/toradex/common/tdx-common.h | 4 ++++
2 files changed, 30 insertions(+)
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index 7e353b4fd9..ae6489667f 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -9,6 +9,13 @@
#include <init.h>
#include <linux/libfdt.h>
+#ifdef CONFIG_DM_VIDEO
+#include <bmp_logo.h>
+#include <dm.h>
+#include <splash.h>
+#include <video.h>
+#endif
+
#include "tdx-cfg-block.h"
#include <asm/setup.h>
#include "tdx-common.h"
@@ -196,3 +203,22 @@ int ft_common_board_setup(void *blob, bd_t *bd)
}
#endif /* CONFIG_TDX_CFG_BLOCK */
+
+#if defined(CONFIG_DM_VIDEO)
+int show_boot_logo(void)
+{
+ struct udevice *dev;
+ int ret;
+ int xpos, ypos;
+
+ splash_get_pos(&xpos, &ypos);
+
+ ret = uclass_get_device(UCLASS_VIDEO, 0, &dev);
+ if (ret)
+ return ret;
+
+ ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, xpos, ypos, true);
+
+ return ret;
+}
+#endif /* CONFIG_DM_VIDEO */
diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h
index c537dca71e..63614c8671 100644
--- a/board/toradex/common/tdx-common.h
+++ b/board/toradex/common/tdx-common.h
@@ -11,4 +11,8 @@
int ft_common_board_setup(void *blob, bd_t *bd);
+#if defined(CONFIG_DM_VIDEO)
+int show_boot_logo(void);
+#endif
+
#endif /* _TDX_COMMON_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 10/14] toradex: common: show boot logo
2020-07-15 10:31 ` [PATCH v2 10/14] toradex: common: show boot logo Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Add function for showing boot logo, embed into u-boot blob.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 11/14] ARM: dts: imx7-colibri: multiple node updates
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (9 preceding siblings ...)
2020-07-15 10:31 ` [PATCH v2 10/14] toradex: common: show boot logo Igor Opaniuk
@ 2020-07-15 10:31 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 12/14] colibri-imx6ull: show boot logo Igor Opaniuk
` (3 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:31 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
1. Move u-boot specific nodes to u-boot dts include: legacy lcdif
node and aliases.
2. Add iomux configuration for LCD.
3. Drop un-needed u-boot,dm-pre-reloc for alias node.
4. Fix display-timings, use the one from Toradex downstream kernel [1]
[1]: https://git.toradex.com/cgit/linux-toradex.git/tree/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi?h=toradex_4.9-2.3.x-imx#n206
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
arch/arm/dts/imx7-colibri-emmc.dts | 2 +-
arch/arm/dts/imx7-colibri-rawnand.dts | 10 ++--
arch/arm/dts/imx7-colibri-u-boot.dtsi | 39 ++++++++++++++++
arch/arm/dts/imx7-colibri.dtsi | 65 +++++++++++++-------------
board/toradex/colibri_imx7/MAINTAINERS | 1 +
5 files changed, 79 insertions(+), 38 deletions(-)
create mode 100644 arch/arm/dts/imx7-colibri-u-boot.dtsi
diff --git a/arch/arm/dts/imx7-colibri-emmc.dts b/arch/arm/dts/imx7-colibri-emmc.dts
index bc0d10c716..8545498275 100644
--- a/arch/arm/dts/imx7-colibri-emmc.dts
+++ b/arch/arm/dts/imx7-colibri-emmc.dts
@@ -5,13 +5,13 @@
/dts-v1/;
#include "imx7-colibri.dtsi"
+#include "imx7-colibri-u-boot.dtsi"
/ {
model = "Toradex Colibri iMX7D 1GB (eMMC)";
compatible = "toradex,imx7d-colibri-emmc", "fsl,imx7d";
aliases {
- u-boot,dm-pre-reloc;
mmc0 = &usdhc3;
mmc1 = &usdhc1;
display1 = &lcdif;
diff --git a/arch/arm/dts/imx7-colibri-rawnand.dts b/arch/arm/dts/imx7-colibri-rawnand.dts
index 5f12a2ac2a..5211fb1f44 100644
--- a/arch/arm/dts/imx7-colibri-rawnand.dts
+++ b/arch/arm/dts/imx7-colibri-rawnand.dts
@@ -5,19 +5,21 @@
/dts-v1/;
#include "imx7-colibri.dtsi"
+#include "imx7-colibri-u-boot.dtsi"
/ {
model = "Toradex Colibri iMX7S/D";
compatible = "toradex,imx7-colibri", "fsl,imx7";
- chosen {
- stdout-path = &uart1;
- };
-
aliases {
+ display1 = &lcdif;
usb0 = &usbotg1; /* required for ums */
};
+ chosen {
+ stdout-path = &uart1;
+ };
+
reg_5v0: regulator-5v0 {
compatible = "regulator-fixed";
regulator-name = "5V";
diff --git a/arch/arm/dts/imx7-colibri-u-boot.dtsi b/arch/arm/dts/imx7-colibri-u-boot.dtsi
new file mode 100644
index 0000000000..91386476d5
--- /dev/null
+++ b/arch/arm/dts/imx7-colibri-u-boot.dtsi
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Copyright 2020 Toradex
+ */
+
+&lcdif {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_lcdif_dat
+ &pinctrl_lcdif_ctrl>;
+ display = <&display0>;
+ u-boot,dm-pre-reloc;
+
+ display0: display0 {
+ bits-per-pixel = <18>;
+ bus-width = <18>;
+ status = "okay";
+
+ display-timings {
+ native-mode = <&timing_vga>;
+ timing_vga: 640x480 {
+ clock-frequency = <25175000>;
+ hactive = <640>;
+ vactive = <480>;
+ hback-porch = <40>;
+ hfront-porch = <24>;
+ vback-porch = <32>;
+ vfront-porch = <11>;
+ hsync-len = <96>;
+ vsync-len = <2>;
+
+ de-active = <1>;
+ hsync-active = <0>;
+ vsync-active = <0>;
+ pixelclk-active = <0>;
+ };
+ };
+ };
+};
diff --git a/arch/arm/dts/imx7-colibri.dtsi b/arch/arm/dts/imx7-colibri.dtsi
index ec95f22a0c..b352036e30 100644
--- a/arch/arm/dts/imx7-colibri.dtsi
+++ b/arch/arm/dts/imx7-colibri.dtsi
@@ -172,6 +172,38 @@
>;
};
+ pinctrl_lcdif_dat: lcdif-dat-grp {
+ fsl,pins = <
+ MX7D_PAD_LCD_DATA00__LCD_DATA0 0x79
+ MX7D_PAD_LCD_DATA01__LCD_DATA1 0x79
+ MX7D_PAD_LCD_DATA02__LCD_DATA2 0x79
+ MX7D_PAD_LCD_DATA03__LCD_DATA3 0x79
+ MX7D_PAD_LCD_DATA04__LCD_DATA4 0x79
+ MX7D_PAD_LCD_DATA05__LCD_DATA5 0x79
+ MX7D_PAD_LCD_DATA06__LCD_DATA6 0x79
+ MX7D_PAD_LCD_DATA07__LCD_DATA7 0x79
+ MX7D_PAD_LCD_DATA08__LCD_DATA8 0x79
+ MX7D_PAD_LCD_DATA09__LCD_DATA9 0x79
+ MX7D_PAD_LCD_DATA10__LCD_DATA10 0x79
+ MX7D_PAD_LCD_DATA11__LCD_DATA11 0x79
+ MX7D_PAD_LCD_DATA12__LCD_DATA12 0x79
+ MX7D_PAD_LCD_DATA13__LCD_DATA13 0x79
+ MX7D_PAD_LCD_DATA14__LCD_DATA14 0x79
+ MX7D_PAD_LCD_DATA15__LCD_DATA15 0x79
+ MX7D_PAD_LCD_DATA16__LCD_DATA16 0x79
+ MX7D_PAD_LCD_DATA17__LCD_DATA17 0x79
+ >;
+ };
+
+ pinctrl_lcdif_ctrl: lcdif-ctrl-grp {
+ fsl,pins = <
+ MX7D_PAD_LCD_CLK__LCD_CLK 0x79
+ MX7D_PAD_LCD_ENABLE__LCD_ENABLE 0x79
+ MX7D_PAD_LCD_VSYNC__LCD_VSYNC 0x79
+ MX7D_PAD_LCD_HSYNC__LCD_HSYNC 0x79
+ >;
+ };
+
pinctrl_enet1: enet1grp {
fsl,pins = <
MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x14
@@ -227,36 +259,3 @@
>;
};
};
-
-&lcdif {
- status = "okay";
- display = <&display0>;
- u-boot,dm-pre-reloc;
-
- display0: display0 {
- bits-per-pixel = <18>;
- bus-width = <24>;
- status = "okay";
-
- display-timings {
- native-mode = <&timing_vga>;
- timing_vga: 640x480 {
- u-boot,dm-pre-reloc;
- clock-frequency = <25175000>;
- hactive = <640>;
- vactive = <480>;
- hback-porch = <48>;
- hfront-porch = <16>;
- vback-porch = <33>;
- vfront-porch = <10>;
- hsync-len = <96>;
- vsync-len = <2>;
-
- de-active = <1>;
- hsync-active = <0>;
- vsync-active = <0>;
- pixelclk-active = <0>;
- };
- };
- };
-};
diff --git a/board/toradex/colibri_imx7/MAINTAINERS b/board/toradex/colibri_imx7/MAINTAINERS
index 82246be160..61a504487a 100644
--- a/board/toradex/colibri_imx7/MAINTAINERS
+++ b/board/toradex/colibri_imx7/MAINTAINERS
@@ -9,5 +9,6 @@ F: include/configs/colibri_imx7.h
F: configs/colibri_imx7_defconfig
F: configs/colibri_imx7_emmc_defconfig
F: arch/arm/dts/imx7-colibri.dtsi
+F: arch/arm/dts/imx7-colibri-u-boot.dtsi
F: arch/arm/dts/imx7-colibri-emmc.dts
F: arch/arm/dts/imx7-colibri-rawnand.dts
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 11/14] ARM: dts: imx7-colibri: multiple node updates
2020-07-15 10:31 ` [PATCH v2 11/14] ARM: dts: imx7-colibri: multiple node updates Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> 1. Move u-boot specific nodes to u-boot dts include: legacy lcdif
> node and aliases.
> 2. Add iomux configuration for LCD.
> 3. Drop un-needed u-boot,dm-pre-reloc for alias node.
> 4. Fix display-timings, use the one from Toradex downstream kernel [1]
> [1]: https://git.toradex.com/cgit/linux-toradex.git/tree/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi?h=toradex_4.9-2.3.x-imx#n206
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 12/14] colibri-imx6ull: show boot logo
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (10 preceding siblings ...)
2020-07-15 10:31 ` [PATCH v2 11/14] ARM: dts: imx7-colibri: multiple node updates Igor Opaniuk
@ 2020-07-15 10:31 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 13/14] colibri-imx6ull: fix splash screen logo drawing Igor Opaniuk
` (2 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:31 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
1. Show boot logo embed in U-Boot blob.
2. Drop iomux configration for LCD, and use the one provided in device
tree.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
.../toradex/colibri-imx6ull/colibri-imx6ull.c | 40 ++++---------------
1 file changed, 7 insertions(+), 33 deletions(-)
diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
index c67d02f7c2..8a34872cab 100644
--- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c
+++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c
@@ -57,32 +57,7 @@ static void setup_gpmi_nand(void)
}
#endif /* CONFIG_NAND_MXS */
-#ifdef CONFIG_VIDEO_MXS
-static iomux_v3_cfg_t const lcd_pads[] = {
- MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_ENABLE__LCDIF_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_HSYNC__LCDIF_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA00__LCDIF_DATA00 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA01__LCDIF_DATA01 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA02__LCDIF_DATA02 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA03__LCDIF_DATA03 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA04__LCDIF_DATA04 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA05__LCDIF_DATA05 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA06__LCDIF_DATA06 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA07__LCDIF_DATA07 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA08__LCDIF_DATA08 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA09__LCDIF_DATA09 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA10__LCDIF_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA11__LCDIF_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA12__LCDIF_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA13__LCDIF_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA14__LCDIF_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA15__LCDIF_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA16__LCDIF_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX6_PAD_LCD_DATA17__LCDIF_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-};
-
+#ifdef CONFIG_DM_VIDEO
static iomux_v3_cfg_t const backlight_pads[] = {
/* Backlight On */
MX6_PAD_JTAG_TMS__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
@@ -95,8 +70,6 @@ static iomux_v3_cfg_t const backlight_pads[] = {
static int setup_lcd(void)
{
- imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
-
imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads));
/* Set BL_ON */
@@ -153,11 +126,6 @@ int board_init(void)
#ifdef CONFIG_NAND_MXS
setup_gpmi_nand();
#endif
-
-#ifdef CONFIG_VIDEO_MXS
- setup_lcd();
-#endif
-
return 0;
}
@@ -203,6 +171,12 @@ int board_late_init(void)
}
#endif /* CONFIG_CMD_USB_SDP */
+#if defined(CONFIG_DM_VIDEO)
+ setup_lcd();
+
+ show_boot_logo();
+#endif
+
return 0;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 12/14] colibri-imx6ull: show boot logo
2020-07-15 10:31 ` [PATCH v2 12/14] colibri-imx6ull: show boot logo Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> 1. Show boot logo embed in U-Boot blob.
> 2. Drop iomux configration for LCD, and use the one provided in device
> tree.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 13/14] colibri-imx6ull: fix splash screen logo drawing
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (11 preceding siblings ...)
2020-07-15 10:31 ` [PATCH v2 12/14] colibri-imx6ull: show boot logo Igor Opaniuk
@ 2020-07-15 10:31 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-15 10:31 ` [PATCH v2 14/14] colibri-imx7: fix splash " Igor Opaniuk
2020-07-23 15:03 ` [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:31 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
Configure white on black for video console.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
configs/colibri-imx6ull_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index ce145cd24f..3292fcc85d 100644
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_FDT_FIXUP_PARTITIONS=y
+CONFIG_SYS_WHITE_ON_BLACK=y
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 13/14] colibri-imx6ull: fix splash screen logo drawing
2020-07-15 10:31 ` [PATCH v2 13/14] colibri-imx6ull: fix splash screen logo drawing Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> Configure white on black for video console.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 14/14] colibri-imx7: fix splash logo drawing
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (12 preceding siblings ...)
2020-07-15 10:31 ` [PATCH v2 13/14] colibri-imx6ull: fix splash screen logo drawing Igor Opaniuk
@ 2020-07-15 10:31 ` Igor Opaniuk
2020-07-27 19:09 ` sbabic at denx.de
2020-07-23 15:03 ` [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-15 10:31 UTC (permalink / raw)
To: u-boot
From: Igor Opaniuk <igor.opaniuk@toradex.com>
1. Configure white on black for video console.
2. Enable printing bmp logo during late board init stage.
3. Use iomux configuration from device tree.
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---
(no changes since v1)
board/toradex/colibri_imx7/colibri_imx7.c | 44 +++++++----------------
configs/colibri_imx7_defconfig | 2 ++
configs/colibri_imx7_emmc_defconfig | 2 ++
3 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 8df925dacf..f585260586 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -100,32 +100,7 @@ static void setup_gpmi_nand(void)
}
#endif
-#ifdef CONFIG_VIDEO_MXS
-static iomux_v3_cfg_t const lcd_pads[] = {
- MX7D_PAD_LCD_CLK__LCD_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_ENABLE__LCD_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA00__LCD_DATA0 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA01__LCD_DATA1 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA02__LCD_DATA2 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA03__LCD_DATA3 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA04__LCD_DATA4 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA05__LCD_DATA5 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA06__LCD_DATA6 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA07__LCD_DATA7 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA08__LCD_DATA8 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA09__LCD_DATA9 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA10__LCD_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA11__LCD_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA12__LCD_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA13__LCD_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA14__LCD_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA15__LCD_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA16__LCD_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA17__LCD_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL),
-};
-
+#ifdef CONFIG_DM_VIDEO
static iomux_v3_cfg_t const backlight_pads[] = {
/* Backlight On */
MX7D_PAD_SD1_WP__GPIO5_IO1 | MUX_PAD_CTRL(NO_PAD_CTRL),
@@ -139,8 +114,6 @@ static iomux_v3_cfg_t const backlight_pads[] = {
static int setup_lcd(void)
{
- imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
-
imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads));
/* Set BL_ON */
@@ -215,10 +188,6 @@ int board_init(void)
setup_gpmi_nand();
#endif
-#ifdef CONFIG_VIDEO_MXS
- setup_lcd();
-#endif
-
#ifdef CONFIG_USB_EHCI_MX7
imx_iomux_v3_setup_multiple_pads(usb_cdet_pads, ARRAY_SIZE(usb_cdet_pads));
gpio_request(USB_CDET_GPIO, "usb-cdet-gpio");
@@ -382,4 +351,15 @@ int board_usb_phy_mode(int port)
return USB_INIT_HOST;
}
}
+
+int board_late_init(void)
+{
+#if defined(CONFIG_DM_VIDEO)
+ setup_lcd();
+
+ show_boot_logo();
+#endif
+ return 0;
+}
+
#endif
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 3c49d70260..73015ed825 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -89,3 +89,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_FDT_FIXUP_PARTITIONS=y
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_SYS_WHITE_ON_BLACK=y
diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index c7bcb87ddd..8ba03a2b38 100644
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -84,3 +84,5 @@ CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y
CONFIG_FAT_WRITE=y
CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_SYS_WHITE_ON_BLACK=y
--
2.17.1
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v2 14/14] colibri-imx7: fix splash logo drawing
2020-07-15 10:31 ` [PATCH v2 14/14] colibri-imx7: fix splash " Igor Opaniuk
@ 2020-07-27 19:09 ` sbabic at denx.de
0 siblings, 0 replies; 34+ messages in thread
From: sbabic at denx.de @ 2020-07-27 19:09 UTC (permalink / raw)
To: u-boot
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> 1. Configure white on black for video console.
> 2. Enable printing bmp logo during late board init stage.
> 3. Use iomux configuration from device tree.
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Applied to u-boot-imx, master, 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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10
2020-07-15 10:30 [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
` (13 preceding siblings ...)
2020-07-15 10:31 ` [PATCH v2 14/14] colibri-imx7: fix splash " Igor Opaniuk
@ 2020-07-23 15:03 ` Igor Opaniuk
2020-07-23 15:16 ` Stefano Babic
14 siblings, 1 reply; 34+ messages in thread
From: Igor Opaniuk @ 2020-07-23 15:03 UTC (permalink / raw)
To: u-boot
Hi Stefano,
On Wed, Jul 15, 2020 at 1:31 PM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>
> This is the common combined patch-series, which superseeds [1], [2], [3].
>
> Includes:
> 1. Fixes for splash screen logo drawing in Colibri iMX7/iMX6ULL.
> 2. Support for EEPROM as a storage for the main Toradex
> config block and additional config blocks on extra EEPROM chips (on
> carrier board or video adapters).
> 3. DDRC size fixes in A7-M4 mapping table for bootaux command.
>
> v2:
> - ?ombine [1], [2], [3] into one patch-series.
> - Correct strings for carrier board names/adapters.
> - Fix display timings, sync with downstream Toradex Linux.
>
> [1]: https://patchwork.ozlabs.org/project/uboot/list/?series=185024
> [2]: https://patchwork.ozlabs.org/project/uboot/list/?series=185100
> [3]: https://patchwork.ozlabs.org/project/uboot/list/?series=185354
>
> Igor Opaniuk (14):
> imx: mx7: fix DDRC size in A7-M4 mapping table
> toradex: tdx-cfg-block: add EEPROM read/store wrappers
> toradex: tdx-cfg-block: add carrier boards and display adapters
> toradex: tdx-cfg-block: add support for EEPROM
> toradex: tdx-cfg-clock: add migration routine from PID8
> toradex: tdx-cfg-block: add carrier board info printing
> ARM: dts: imx8mm-verdin: eeprom nodes adjustments
> verdin-imx8mm: add EEPROM support for carrier board
> ARM: dts: imx6ull-colibri: move u-boot specific node
> toradex: common: show boot logo
> ARM: dts: imx7-colibri: multiple node updates
> colibri-imx6ull: show boot logo
> colibri-imx6ull: fix splash screen logo drawing
> colibri-imx7: fix splash logo drawing
>
> arch/arm/dts/imx6ull-colibri-u-boot.dtsi | 45 ++
> arch/arm/dts/imx6ull-colibri.dtsi | 43 --
> arch/arm/dts/imx7-colibri-emmc.dts | 2 +-
> arch/arm/dts/imx7-colibri-rawnand.dts | 10 +-
> arch/arm/dts/imx7-colibri-u-boot.dtsi | 39 ++
> arch/arm/dts/imx7-colibri.dtsi | 65 ++-
> arch/arm/dts/imx8mm-verdin.dts | 22 +-
> arch/arm/mach-imx/mx7/soc.c | 2 +-
> .../toradex/colibri-imx6ull/colibri-imx6ull.c | 40 +-
> board/toradex/colibri_imx7/MAINTAINERS | 1 +
> board/toradex/colibri_imx7/colibri_imx7.c | 44 +-
> board/toradex/common/Kconfig | 18 +
> board/toradex/common/Makefile | 1 +
> board/toradex/common/tdx-cfg-block.c | 402 ++++++++++++++++--
> board/toradex/common/tdx-cfg-block.h | 16 +
> board/toradex/common/tdx-common.c | 54 +++
> board/toradex/common/tdx-common.h | 4 +
> board/toradex/common/tdx-eeprom.c | 90 ++++
> board/toradex/common/tdx-eeprom.h | 14 +
> board/toradex/verdin-imx8mm/Kconfig | 6 +
> configs/colibri-imx6ull_defconfig | 1 +
> configs/colibri_imx7_defconfig | 2 +
> configs/colibri_imx7_emmc_defconfig | 2 +
> configs/verdin-imx8mm_defconfig | 1 +
> 24 files changed, 730 insertions(+), 194 deletions(-)
> create mode 100644 arch/arm/dts/imx7-colibri-u-boot.dtsi
> create mode 100644 board/toradex/common/tdx-eeprom.c
> create mode 100644 board/toradex/common/tdx-eeprom.h
>
> --
> 2.17.1
>
Any chance to get it merged?
Thanks
--
Best regards - Freundliche Gr?sse - Meilleures salutations
Igor Opaniuk
mailto: igor.opaniuk at gmail.com
skype: igor.opanyuk
+380 (93) 836 40 67
http://ua.linkedin.com/in/iopaniuk
^ permalink raw reply [flat|nested] 34+ messages in thread* [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10
2020-07-23 15:03 ` [PATCH v2 00/14] toradex: imx: fixes and updates for v2020.10 Igor Opaniuk
@ 2020-07-23 15:16 ` Stefano Babic
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Babic @ 2020-07-23 15:16 UTC (permalink / raw)
To: u-boot
Hi Igor,
On 23.07.20 17:03, Igor Opaniuk wrote:
> Hi Stefano,
>
> On Wed, Jul 15, 2020 at 1:31 PM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>>
>> This is the common combined patch-series, which superseeds [1], [2], [3].
>>
>> Includes:
>> 1. Fixes for splash screen logo drawing in Colibri iMX7/iMX6ULL.
>> 2. Support for EEPROM as a storage for the main Toradex
>> config block and additional config blocks on extra EEPROM chips (on
>> carrier board or video adapters).
>> 3. DDRC size fixes in A7-M4 mapping table for bootaux command.
>>
>> v2:
>> - ?ombine [1], [2], [3] into one patch-series.
>> - Correct strings for carrier board names/adapters.
>> - Fix display timings, sync with downstream Toradex Linux.
>>
>> [1]: https://patchwork.ozlabs.org/project/uboot/list/?series=185024
>> [2]: https://patchwork.ozlabs.org/project/uboot/list/?series=185100
>> [3]: https://patchwork.ozlabs.org/project/uboot/list/?series=185354
>>
>> Igor Opaniuk (14):
>> imx: mx7: fix DDRC size in A7-M4 mapping table
>> toradex: tdx-cfg-block: add EEPROM read/store wrappers
>> toradex: tdx-cfg-block: add carrier boards and display adapters
>> toradex: tdx-cfg-block: add support for EEPROM
>> toradex: tdx-cfg-clock: add migration routine from PID8
>> toradex: tdx-cfg-block: add carrier board info printing
>> ARM: dts: imx8mm-verdin: eeprom nodes adjustments
>> verdin-imx8mm: add EEPROM support for carrier board
>> ARM: dts: imx6ull-colibri: move u-boot specific node
>> toradex: common: show boot logo
>> ARM: dts: imx7-colibri: multiple node updates
>> colibri-imx6ull: show boot logo
>> colibri-imx6ull: fix splash screen logo drawing
>> colibri-imx7: fix splash logo drawing
>>
>> arch/arm/dts/imx6ull-colibri-u-boot.dtsi | 45 ++
>> arch/arm/dts/imx6ull-colibri.dtsi | 43 --
>> arch/arm/dts/imx7-colibri-emmc.dts | 2 +-
>> arch/arm/dts/imx7-colibri-rawnand.dts | 10 +-
>> arch/arm/dts/imx7-colibri-u-boot.dtsi | 39 ++
>> arch/arm/dts/imx7-colibri.dtsi | 65 ++-
>> arch/arm/dts/imx8mm-verdin.dts | 22 +-
>> arch/arm/mach-imx/mx7/soc.c | 2 +-
>> .../toradex/colibri-imx6ull/colibri-imx6ull.c | 40 +-
>> board/toradex/colibri_imx7/MAINTAINERS | 1 +
>> board/toradex/colibri_imx7/colibri_imx7.c | 44 +-
>> board/toradex/common/Kconfig | 18 +
>> board/toradex/common/Makefile | 1 +
>> board/toradex/common/tdx-cfg-block.c | 402 ++++++++++++++++--
>> board/toradex/common/tdx-cfg-block.h | 16 +
>> board/toradex/common/tdx-common.c | 54 +++
>> board/toradex/common/tdx-common.h | 4 +
>> board/toradex/common/tdx-eeprom.c | 90 ++++
>> board/toradex/common/tdx-eeprom.h | 14 +
>> board/toradex/verdin-imx8mm/Kconfig | 6 +
>> configs/colibri-imx6ull_defconfig | 1 +
>> configs/colibri_imx7_defconfig | 2 +
>> configs/colibri_imx7_emmc_defconfig | 2 +
>> configs/verdin-imx8mm_defconfig | 1 +
>> 24 files changed, 730 insertions(+), 194 deletions(-)
>> create mode 100644 arch/arm/dts/imx7-colibri-u-boot.dtsi
>> create mode 100644 board/toradex/common/tdx-eeprom.c
>> create mode 100644 board/toradex/common/tdx-eeprom.h
>>
>> --
>> 2.17.1
>>
>
> Any chance to get it merged?
>
Yes, sorry, I saw patches, most of patches (see EEprom, etc) are very
specific to Toradex, and I cannot say a lot. I do not see any isse and I
will merge them. They will be part of my next PR to Tom.
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
=====================================================================
^ permalink raw reply [flat|nested] 34+ messages in thread