Store U-Boot environnement in eMMC on i.MX8MPlus
Hi all, I try to store my U-Boot environment in eMMC on i.MX8MPlus, I then remove the CONFIG_ENV_IS_NOWHERE option, and I then put the following options: CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_OFFSET=0x40 CONFIG_ENV_SIZE=0x2000 CONFIG_SYS_MMC_ENV_PART=0 However during the boot sequence I get stuck here: U-Boot SPL 2023.01 (Jan 25 2023 - 08:23:12 +0100) DDRINFO: start DRAM init DDRINFO: DRAM rate 3000MTS DDRINFO:ddrphy calibration done DDRINFO: ddrmix config done NormalBoot Trying to boot from BOOTROM Boot Stage: USB boot Find img info 0x&48017200, size 872 Need continue download 1024 Download 1090688, Total size 1092224 NOTICE: BL31: v2.4(release):acddd624b NOTICE: BL31: Built: 08:21:46, Jan 24 2023 whereas if I have the option CONFIG_ENV_IS_NOWHERE=y U-Boot SPL 2023.01 (Jan 25 2023 - 08:41:47 +0100) DDRINFO: start DRAM init DDRINFO: DRAM rate 3000MTS DDRINFO:ddrphy calibration done DDRINFO: ddrmix config done NormalBoot Trying to boot from BOOTROM Boot Stage: USB boot Find img info 0x&48016e00, size 872 Need continue download 1024 Download 1089160, Total size 1090696 NOTICE: BL31: v2.4(release):acddd624b NOTICE: BL31: Built: 08:21:46, Jan 24 2023 U-Boot 2023.01 (Jan 25 2023 - 08:41:47 +0100) CPU: i.MX8MP Lite[4] rev1.1 1600 MHz (running at 1200 MHz) CPU: Industrial temperature grade (-40C to 105C) at 52C Reset cause: POR Model: IMX8MPLUS DRAM: 1 GiB Core: 187 devices, 26 uclasses, devicetree: separate MMC:FSL_SDHC:0 Loading Environment from nowhere...OK In: serial Out: serial Err: serial BuildInfo: - ATF acddd62 do you have any idea about this? Best regards, Joris OFFOUGA
Re: Usb on imx8mm
Hi Peng, Thanks for your reply. Will it be done in the near future, if not can you give me recommendations to do it? Best regards, Joris Offouga Le 22/06/2020 à 03:14, Peng Fan a écrit : It is not supported for now. Regards, Peng. Subject: Usb on imx8mm Hello, I try to use the usb on u imx8mm but the usb controller does not seem recognized: u-boot => usb start starting USB ... Do you have an idea ? Best regards Joris Offouga
Usb on imx8mm
Hello, I try to use the usb on u imx8mm but the usb controller does not seem recognized: u-boot => usb start starting USB ... Do you have an idea ? Best regards Joris Offouga
[PATCH V2 1/4] warp7: Fix the pmic_get() parameter in the DM case
When pmic_get() is used with DM the first parameter must be
the complete node name plus the unit address, so fix it
accordingly
Signed-off-by: Joris Offouga
Reviewed-by: Fabio Estevam
---
changes v1->v2:
add commit log
change commit message
add reviewed
board/warp7/warp7.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 9efc62f2fb..1ebec93916 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -67,7 +67,7 @@ int power_init_board(void)
struct udevice *dev;
int ret, dev_id, rev_id;
- ret = pmic_get("pfuze3000", );
+ ret = pmic_get("pfuze3000@8", );
if (ret == -ENODEV)
return 0;
if (ret != 0)
--
2.20.1
[PATCH V2 4/4] mx7dsabre: Fix usbtog probe when use dfu or ums
Before:
=> ums 0 mmc 0
UMS: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x1dacc00
usb dr_mode not found
CTRL+C - Operation aborted
=> dfu 0 mmc 0
usb dr_mode not found
After :
=> ums 0 mmc 0
UMS: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x1dacc00
=> dfu 0 mmc 0
Signed-off-by: Joris Offouga
---
changes v1->v2:
none
arch/arm/dts/imx7d-sdb-u-boot.dtsi | 4
1 file changed, 4 insertions(+)
diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
index 05dd74eee1..b78358fa13 100644
--- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
@@ -1,3 +1,7 @@
{
status = "disable";
};
+
+ {
+ dr_mode = "peripheral";
+};
--
2.20.1
[PATCH V2 3/4] arm: dts: imx7s-warp7: Move u-boot specific node in u-boot.dtsi
These nodes are not in upstream kernel, so move these in u-boot.dtsi
Signed-off-by: Joris Offouga
---
changes v1->v2:
fix stdoutpath in to stdout-path
add commit log
arch/arm/dts/imx7s-warp-u-boot.dtsi | 10 ++
arch/arm/dts/imx7s-warp.dts | 9 -
2 files changed, 10 insertions(+), 9 deletions(-)
create mode 100644 arch/arm/dts/imx7s-warp-u-boot.dtsi
diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi
b/arch/arm/dts/imx7s-warp-u-boot.dtsi
new file mode 100644
index 00..6319840b1c
--- /dev/null
+++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi
@@ -0,0 +1,10 @@
+/ {
+aliases {
+mmc0 =
+usb0 =
+};
+
+chosen {
+stdout-path =
+};
+};
diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
index db5ef67eb1..f7ba2c0a24 100644
--- a/arch/arm/dts/imx7s-warp.dts
+++ b/arch/arm/dts/imx7s-warp.dts
@@ -17,15 +17,6 @@
reg = <0x8000 0x2000>;
};
- aliases {
- mmc0 =
- usb0 =
- };
-
- chosen {
- stdout-path =
- };
-
gpio-keys {
compatible = "gpio-keys";
pinctrl-0 = <_gpio>;
--
2.20.1
[PATCH V2 2/4] warp7: remove unused usb configs
With commit 6b503f9e6549("warp7: Switch to DM USB").
These configs are not necessary
Signed-off-by: Joris Offouga
---
changes v1->v2:
add 12 digits for commit ID
fix typo in commit log
include/configs/warp7.h | 4
1 file changed, 4 deletions(-)
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index da894ec0ca..39c00480bd 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -149,12 +149,8 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART0
-/* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Only OTG1 port enabled */
#define CONFIG_IMX_THERMAL
--
2.20.1
Re: [PATCH 3/4] arm: dts: imx7s-warp7: Move u-boot specific node in u-boot.dtsi
Le 29/01/2020 à 21:22, Fabio Estevam a écrit :
Hi Joris,
On Wed, Jan 29, 2020 at 5:16 PM Joris Offouga wrote:
Please always provide a commit log.
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7s-warp-u-boot.dtsi | 10 ++
arch/arm/dts/imx7s-warp.dts | 9 -
2 files changed, 10 insertions(+), 9 deletions(-)
create mode 100644 arch/arm/dts/imx7s-warp-u-boot.dtsi
diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi
b/arch/arm/dts/imx7s-warp-u-boot.dtsi
new file mode 100644
index 00..65da3a0d23
--- /dev/null
+++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi
@@ -0,0 +1,10 @@
+/ {
+aliases {
+mmc0 =
+usb0 =
+};
+
+chosen {
+stdoutpath =
This should be stdout-path instead.
indeed, i send v2
Actually I think it is better to have the Linux upstream dts to have
the stdout-path entry.
Care to send a patch for that?
of course i would
Best regards,
Joris
Thanks
Re: [PATCH 4/4] mx7dsabre: Fix usbtog probe when use dfu or ums
Le 29/01/2020 à 21:25, Fabio Estevam a écrit :
On Wed, Jan 29, 2020 at 5:16 PM Joris Offouga wrote:
diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
index 05dd74eee1..b78358fa13 100644
--- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
@@ -1,3 +1,7 @@
{
status = "disable";
};
+
+ {
+ dr_mode = "peripheral";
Why to include this in the U-Boot specific version?
I see dr_mode = "peripheral" in the main dts.
This is not present in main dts :
https://gitlab.denx.de/u-boot/u-boot/blob/master/arch/arm/dts/imx7d-sdb.dts#L401
I include in u-boot.dtsi because is not present in mainline kernel :
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/arm/boot/dts/imx7d-sdb.dts#n413
Best regards,
Joris
+};
--
2.20.1
[PATCH 1/4] warp7: fix pmic probe
Signed-off-by: Joris Offouga
---
board/warp7/warp7.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 9efc62f2fb..1ebec93916 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -67,7 +67,7 @@ int power_init_board(void)
struct udevice *dev;
int ret, dev_id, rev_id;
- ret = pmic_get("pfuze3000", );
+ ret = pmic_get("pfuze3000@8", );
if (ret == -ENODEV)
return 0;
if (ret != 0)
--
2.20.1
[PATCH 3/4] arm: dts: imx7s-warp7: Move u-boot specific node in u-boot.dtsi
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7s-warp-u-boot.dtsi | 10 ++
arch/arm/dts/imx7s-warp.dts | 9 -
2 files changed, 10 insertions(+), 9 deletions(-)
create mode 100644 arch/arm/dts/imx7s-warp-u-boot.dtsi
diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi
b/arch/arm/dts/imx7s-warp-u-boot.dtsi
new file mode 100644
index 00..65da3a0d23
--- /dev/null
+++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi
@@ -0,0 +1,10 @@
+/ {
+aliases {
+mmc0 =
+usb0 =
+};
+
+chosen {
+stdoutpath =
+};
+};
diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
index db5ef67eb1..f7ba2c0a24 100644
--- a/arch/arm/dts/imx7s-warp.dts
+++ b/arch/arm/dts/imx7s-warp.dts
@@ -17,15 +17,6 @@
reg = <0x8000 0x2000>;
};
- aliases {
- mmc0 =
- usb0 =
- };
-
- chosen {
- stdout-path =
- };
-
gpio-keys {
compatible = "gpio-keys";
pinctrl-0 = <_gpio>;
--
2.20.1
[PATCH 4/4] mx7dsabre: Fix usbtog probe when use dfu or ums
Before:
=> ums 0 mmc 0
UMS: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x1dacc00
usb dr_mode not found
CTRL+C - Operation aborted
=> dfu 0 mmc 0
usb dr_mode not found
After :
=> ums 0 mmc 0
UMS: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x1dacc00
=> dfu 0 mmc 0
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7d-sdb-u-boot.dtsi | 4
1 file changed, 4 insertions(+)
diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
index 05dd74eee1..b78358fa13 100644
--- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
@@ -1,3 +1,7 @@
{
status = "disable";
};
+
+ {
+ dr_mode = "peripheral";
+};
--
2.20.1
[PATCH 2/4] warp7: remove unused usb configs
With commit 6b503f ("warp7: Switch to DM USB").
This configs are not necessary
Signed-off-by: Joris Offouga
---
include/configs/warp7.h | 4
1 file changed, 4 deletions(-)
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index da894ec0ca..49d2415445 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -150,11 +150,7 @@
#define CONFIG_SYS_MMC_ENV_PART0
/* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Only OTG1 port enabled */
#define CONFIG_IMX_THERMAL
--
2.20.1
Re: [PATCH] gpio: Let DM_74X164 be built without CONFIG_SPL_GPIO
Hi Fabio, Le 29/01/2020 à 17:10, Tom Rini a écrit : On Wed, Jan 29, 2020 at 12:59:28PM -0300, Fabio Estevam wrote: On Wed, Jan 29, 2020 at 12:35 PM Tom Rini wrote: Ah. But it is DM_GPIO? I think looking at bcee8d6764f9 there's a few Yes, CONFIG_DM_GPIO is selected in mx7dsabresd_defconfig. OK, good. other i.MX boards that are also broken something needs to be moved to Kconfig / updated still. I can submit a patch moving CONFIG_DM_74X164 from include/confiinclude/configs/mx6ul_14x14_evk.h to defconfig. OK, please do. In fact, uh, there's a good bit of confusion around that line in the Makefile. The test on 'CONFIG_$(SPL_TPL_)GPIO' will never be true as there is only 'DM_GPIO' (and SPL/TPL variants) and 'SPL/TPL_GPIO_SUPPORT' and no 'GPIO' itself. So everyone using 74x164_gpio.o is broken right now. Yes, that's the reason I came up with this patch. Do you want to take a pass at trying to unpack and fix this mess or should I? Thanks again! I am glad to fix this, but what exactly needs to be done? This patch plus another one that moves CONFIG_DM_74X164 from include/confiinclude/configs/mx6ul_14x14_evk.h to defconfig is all we need, no? Lets see. Yup, talking this all out as gotten me to seeing that yes, your patch is correct and all we need in the Makefile. Thanks! Reviewed-by: Tom Rini It works on my side : U-Boot 2020.04-rc1-00849-ge7ab1cb3f0-dirty (Jan 29 2020 - 20:15:47 +0100) CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz) CPU: Commercial temperature grade (0C to 95C) at 32C Reset cause: POR Model: Freescale i.MX7 SabreSD Board Board: i.MX7D SABRESD in secure mode DRAM: 1 GiB PMIC: PFUZE3000 DEV_ID=0x30 REV_ID=0x11 MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 Loading Environment from MMC... OK Video: 480x272x24 In: serial Out: serial Err: serial Net: Warning: ethernet@30be using MAC address from ROM eth0: ethernet@30be Hit any key to stop autoboot: 0 thanks Tested-by: Joris Offouga Best regards, Joris
Re: [PATCH 2/3] mx7dsabre: Enable DM_ETH
Hi Fabio, Le mer. 29 janv. 2020 à 15:43, Fabio Estevam a écrit : > On Mon, Jan 27, 2020 at 3:31 PM Fabio Estevam wrote: > > > Running "dm tree" says that soft_spi has not been probed: > > > > spi 0 [ ] soft_spi |-- spi4 > > > > Not sure why soft_spi does not get probed though. > > > > The IO expander is on the soft_spi bus, so we need to get soft_spi to > > get probed first. > > I managed to get Ethernet working again with this patch: > https://lists.denx.de/pipermail/u-boot/2020-January/398438.html I good catch, I will test your patch soon Best regards Joris Offouga > >
Re: [PATCH 2/3] mx7dsabre: Enable DM_ETH
Hi Fabio, Le lun. 27 janv. 2020 à 16:58, Fabio Estevam a écrit : > Hi Joris, > > On Mon, Jan 20, 2020 at 5:37 PM Fabio Estevam wrote: > > > > Hi Joris, > > > > On Mon, Jan 20, 2020 at 5:32 PM Joris Offouga > wrote: > > > > > This thread : > > > https://lists.denx.de/pipermail/u-boot/2020-January/395560.html > > > > This is an unrelated issue. wandboard support several versions and > > this issue happens with imx6dl-wandboard-revd1. > > > > Ethernet does not work because revd1 is not properly detected (this is > > the root cause). > > Just to avoid duplicate work: do you plan to fix Ethernet support on > this board after DM_ETH conversion? > I can't find a fix yet. If you find one it would be great. Best regards, Joris > > Thanks >
MMC on I.MX7/8MM break on U-Boot 2020.01-00630-gad647690b1
Hi Tom I tested latest U-Boot master and it looks like commit 1526bcce (common: add blkcache init)[1] breaks load environment in mmc on my Pico-imx7d, imx7dsabre and imx8mm-evk: see logs after: U-Boot 2020.01-00731-g40521a6c90-dirty (Jan 26 2020 - 12:12:49 +0100) CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz) CPU: Commercial temperature grade (0C to 95C) at 29C Reset cause: POR Model: TechNexion PICO-IMX7D Board and PI baseboard Board: i.MX7D PICOSOM I2C: ready DRAM: 512 MiB PMIC: PFUZE3000 DEV_ID=0x30 REV_ID=0x11 MMC: FSL_SDHC: 2, FSL_SDHC: 1, FSL_SDHC: 0 Loading Environment from MMC... data abort pc : [<9feb0d4e>] lr : [<9feab5e5>] reloc pc : [<8781ad4e>] lr : [<878155e5>] sp : 9de8ac60 ip : 0002 fp : 9fef3d1c r10: r9 : 9de95ea0 r8 : r7 : 0006 r6 : fe7f r5 : 9fefb620 r4 : fe7f r3 : efff r2 : 62168365 r1 : r0 : 0006 Flags: NzCv IRQs off FIQs off Mode SVC_32 (T) Code: 3b01 f8cb 3008 4634 (6836) e7df Resetting CPU ... resetting ... after revert it : U-Boot SPL 2020.01-00732-g80dd068886-dirty (Jan 26 2020 - 12:19:49 +0100) Trying to boot from USB SDP SDP: initialize... SDP: handle requests... Downloading file of size 482142 to 0x877fffc0... done Jumping to header at 0x877fffc0 Header Tag is not an IMX image -Boot 2020.01-00732-g80dd068886-dirty (Jan 26 2020 - 12:19:49 +0100) CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz) CPU: Commercial temperature grade (0C to 95C) at 40C Reset cause: POR Model: TechNexion PICO-IMX7D Board and PI baseboard Board: i.MX7D PICOSOM I2C: ready DRAM: 512 MiB PMIC: PFUZE3000 DEV_ID=0x30 REV_ID=0x11 MMC: FSL_SDHC: 2, FSL_SDHC: 1, FSL_SDHC: 0 Loading Environment from MMC... OK In: serial Out: serial Err: serial Net: eth0: ethernet@30be Hit any key to stop autoboot: 0 So, can you consider this commit 'not applicable' for next release ? [1] https://gitlab.denx.de/u-boot/u-boot/commit/1526bcce0f7285087621e16e6720636d01839da8 Best regards, Joris Offouga
Re: [PATCH 2/3] mx7dsabre: Enable DM_ETH
Hi Fabio, Le 20/01/2020 à 21:28, Fabio Estevam a écrit : Hi Joris, On Mon, Jan 20, 2020 at 5:26 PM Joris Offouga wrote: I think this bug is similar to the wandboard, I looked at this thread fairly quickly, did you finally fix it? Which wandboard issue are you referring to? This thread : https://lists.denx.de/pipermail/u-boot/2020-January/395560.html
Re: [PATCH 2/3] mx7dsabre: Enable DM_ETH
Hi Fabio, Le 20/01/2020 à 21:22, Fabio Estevam a écrit : Hi Joris, On Mon, Jan 20, 2020 at 5:21 PM Joris Offouga wrote: Sorry for that indeed I should have made two different commit for this, I have the idea to revert the commit and I will send it split in two No need to revert. Let's focus on getting Ethernet to work again :-) Thanks for your comprehension :-) I think this bug is similar to the wandboard, I looked at this thread fairly quickly, did you finally fix it? Thanks Thanks
Re: [PATCH 2/3] mx7dsabre: Enable DM_ETH
Hi Fabio, Le 20/01/2020 à 19:48, Fabio Estevam a écrit : Hi Joris, Has this patch been tested on the real hardware? I tested and validate it before sending it, there must have been a problem with the merge. This is what we currently see: U-Boot 2020.01-00620-g2d2f91a480 (Jan 20 2020 - 15:41:31 -0300) CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz) CPU: Commercial temperature grade (0C to 95C) at 35C Reset cause: POR Model: Freescale i.MX7 SabreSD Board Board: i.MX7D SABRESD in secure mode DRAM: 1 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 Loading Environment from MMC... OK Video: 480x272x24 In:serial Out: serial Err: serial Net: Could not get PHY for FEC0: addr 0 No ethernet found. So Ethernet is not functional at all. Do you plan to fix Ethernet on this board? On Sun, Dec 8, 2019 at 2:02 PM Joris Offouga wrote: Also sync device tree with v5.5-rc1 Signed-off-by: Joris Offouga --- arch/arm/dts/imx7d-sdb-u-boot.dtsi| 3 + arch/arm/dts/imx7d-sdb.dts| 785 -- Also, not happy that the dts sync was part of the same commit that converted to DM_ETH. Sorry for that indeed I should have made two different commit for this, I have the idea to revert the commit and I will send it split in two Best regards, Joris Thanks
[PATCH] mx7dsabre: Fix dm probe pmic
With commit mx7dsabre: Enable DM_ETH 0d52bab4
Device Tree has been update and change pfuze3000 node
Signed-off-by: Joris Offouga
---
board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c
b/board/freescale/mx7dsabresd/mx7dsabresd.c
index 835eed3316..41c620795c 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -264,7 +264,7 @@ int power_init_board(void)
struct udevice *dev;
int ret, dev_id, rev_id;
- ret = pmic_get("pfuze3000@08", );
+ ret = pmic_get("pfuze3000@8", );
if (ret == -ENODEV)
return 0;
if (ret != 0)
--
2.20.1
[PATCH V2 1/2] pico-imx7d: Disable USB_ETHER support for bl33 defconfig
For DM_ETH support , it's require to disable this config. When this config is enable, This generate a error with spl in linker script Signed-off-by: Joris Offouga --- configs/pico-imx7d_bl33_defconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig index e54f3b12d4..a32b4d680f 100644 --- a/configs/pico-imx7d_bl33_defconfig +++ b/configs/pico-imx7d_bl33_defconfig @@ -64,9 +64,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_USB_ETHER=y -CONFIG_USB_ETH_CDC=y -CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_DM_VIDEO=y CONFIG_VIDEO_BPP8=y CONFIG_VIDEO_BPP16=y -- 2.20.1
[PATCH V2 2/2] pico-imx7d: Convert to DM_ETH
Signed-off-by: Joris Offouga
---
Change v1 -> v2
Disable usb ethernet support with patch : pico-imx7d: Disable USB_ETHER
support for bl33
board/technexion/pico-imx7d/pico-imx7d.c | 46
configs/pico-dwarf-imx7d_defconfig | 5 +++
configs/pico-hobbit-imx7d_defconfig | 5 +++
configs/pico-imx7d_bl33_defconfig| 5 +++
configs/pico-imx7d_defconfig | 5 +++
configs/pico-nymph-imx7d_defconfig | 5 +++
configs/pico-pi-imx7d_defconfig | 5 +++
include/configs/pico-imx7d.h | 11 --
8 files changed, 30 insertions(+), 57 deletions(-)
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index bcfc7d361e..b7ca2e1315 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
#include "../../freescale/common/pfuze.h"
@@ -26,11 +25,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \
PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
-#define ENET_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
-#define ENET_PAD_CTRL_MII (PAD_CTL_DSE_3P3V_32OHM)
-
-#define ENET_RX_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
-
#define I2C_PAD_CTRL(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
@@ -123,44 +117,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
};
#ifdef CONFIG_FEC_MXC
-static iomux_v3_cfg_t const fec1_pads[] = {
- MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
- MX7D_PAD_SD2_WP__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
- MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL |
MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_SD3_STROBE__GPIO6_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
- MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-#define FEC1_RST_GPIO IMX_GPIO_NR(6, 11)
-
-static void setup_iomux_fec(void)
-{
- imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
- gpio_request(FEC1_RST_GPIO, "phy_rst");
- gpio_direction_output(FEC1_RST_GPIO, 0);
- udelay(500);
- gpio_set_value(FEC1_RST_GPIO, 1);
-}
-
-int board_eth_init(bd_t *bis)
-{
- setup_iomux_fec();
-
- return fecmxc_initialize_multi(bis, 0,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
-}
-
static int setup_fec(void)
{
struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs
@@ -235,9 +191,7 @@ int board_init(void)
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
#ifdef CONFIG_DM_VIDEO
-
setup_lcd();
-
#endif
#ifdef CONFIG_FEC_MXC
setup_fec();
diff --git a/configs/pico-dwarf-imx7d_defconfig
b/configs/pico-dwarf-imx7d_defconfig
index 5416b4581b..f328b41b8f 100644
--- a/configs/pico-dwarf-imx7d_defconfig
+++ b/configs/pico-dwarf-imx7d_defconfig
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_USDHC=y
CONFIG_MTD=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
CONFIG_MII=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
index 57b64c632f..ea127069e9 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_USDHC=y
CONFIG_MTD=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
CONFIG_MII=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-imx7d_bl33_defconfig
b/configs/pico-imx7d_bl33_defconfig
index a32b4d680f..db9daf9d69 100644
--- a/configs/pico-imx7d_bl33_defconfig
+++ b/configs/pico-imx7d_bl33_defconfig
@@ -50,6 +50,11 @@ CONFIG_DM_MMC=y
CONFIG_FSL_USDHC=y
CONFIG_MTD=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
C
Re: [PATCH] pico-imx7d: Convert to DM_ETH
Hi Stefano,
Sorry for the delay,
Le 28/12/2019 à 12:31, Stefano Babic a écrit :
Hi Joris,
On 08/12/19 18:02, Joris Offouga wrote:
Signed-off-by: Joris Offouga
---
board/technexion/pico-imx7d/pico-imx7d.c | 46
configs/pico-dwarf-imx7d_defconfig | 5 +++
configs/pico-hobbit-imx7d_defconfig | 5 +++
configs/pico-imx7d_bl33_defconfig| 5 +++
configs/pico-imx7d_defconfig | 5 +++
configs/pico-nymph-imx7d_defconfig | 5 +++
configs/pico-pi-imx7d_defconfig | 5 +++
include/configs/pico-imx7d.h | 11 --
8 files changed, 30 insertions(+), 57 deletions(-)
I get build errors with pico-imx7d_bl33.
https://travis-ci.org/sbabic/u-boot-imx/jobs/630056283
Could you take a look, please ?
I tried to correct the compilation error but I did not find good ways to
do it, I suggest you remove the usb ethernet support from the
configuration :
-CONFIG_USB_ETHER=y
-CONFIG_USB_ETH_CDC=y
-CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
If you agree I send V2
Best regards,
Joris
Best regards,
Stefano
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index bcfc7d361e..b7ca2e1315 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
#include "../../freescale/common/pfuze.h"
@@ -26,11 +25,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \
PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
-#define ENET_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
-#define ENET_PAD_CTRL_MII (PAD_CTL_DSE_3P3V_32OHM)
-
-#define ENET_RX_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
-
#define I2C_PAD_CTRL(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
@@ -123,44 +117,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
};
#ifdef CONFIG_FEC_MXC
-static iomux_v3_cfg_t const fec1_pads[] = {
- MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
- MX7D_PAD_SD2_WP__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
- MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL |
MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_SD3_STROBE__GPIO6_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
- MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-#define FEC1_RST_GPIO IMX_GPIO_NR(6, 11)
-
-static void setup_iomux_fec(void)
-{
- imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
- gpio_request(FEC1_RST_GPIO, "phy_rst");
- gpio_direction_output(FEC1_RST_GPIO, 0);
- udelay(500);
- gpio_set_value(FEC1_RST_GPIO, 1);
-}
-
-int board_eth_init(bd_t *bis)
-{
- setup_iomux_fec();
-
- return fecmxc_initialize_multi(bis, 0,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
-}
-
static int setup_fec(void)
{
struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs
@@ -235,9 +191,7 @@ int board_init(void)
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
#ifdef CONFIG_DM_VIDEO
-
setup_lcd();
-
#endif
#ifdef CONFIG_FEC_MXC
setup_fec();
diff --git a/configs/pico-dwarf-imx7d_defconfig
b/configs/pico-dwarf-imx7d_defconfig
index 94d73ee051..2437a64dd0 100644
--- a/configs/pico-dwarf-imx7d_defconfig
+++ b/configs/pico-dwarf-imx7d_defconfig
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_USDHC=y
CONFIG_MTD=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
CONFIG_MII=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
index ef86b0cd66..3467d4c2e4 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_USDHC=y
CONFIG_MTD=y
C
[PATCH 2/3] mx7dsabre: Enable DM_ETH
Also sync device tree with v5.5-rc1
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7d-sdb-u-boot.dtsi| 3 +
arch/arm/dts/imx7d-sdb.dts| 785 --
board/freescale/mx7dsabresd/mx7dsabresd.c | 62 --
configs/mx7dsabresd_defconfig | 6 +
configs/mx7dsabresd_qspi_defconfig| 6 +
include/configs/mx7dsabresd.h | 10 -
6 files changed, 589 insertions(+), 283 deletions(-)
create mode 100644 arch/arm/dts/imx7d-sdb-u-boot.dtsi
diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
new file mode 100644
index 00..05dd74eee1
--- /dev/null
+++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
@@ -0,0 +1,3 @@
+ {
+ status = "disable";
+};
diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts
index 76aa69a35b..8191ac7c33 100644
--- a/arch/arm/dts/imx7d-sdb.dts
+++ b/arch/arm/dts/imx7d-sdb.dts
@@ -11,253 +11,244 @@
model = "Freescale i.MX7 SabreSD Board";
compatible = "fsl,imx7d-sdb", "fsl,imx7d";
- aliases {
- spi5 = _spi;
+ chosen {
+ stdout-path =
};
- memory {
+ memory@8000 {
+ device_type = "memory";
reg = <0x8000 0x8000>;
};
- soft_spi: soft-spi {
+ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <_gpio_keys>;
+
+ volume-up {
+ label = "Volume Up";
+ gpios = < 11 GPIO_ACTIVE_LOW>;
+ linux,code = ;
+ wakeup-source;
+ };
+
+ volume-down {
+ label = "Volume Down";
+ gpios = < 10 GPIO_ACTIVE_LOW>;
+ linux,code = ;
+ wakeup-source;
+ };
+ };
+
+ spi4 {
compatible = "spi-gpio";
pinctrl-names = "default";
- pinctrl-0 = <_spi1>;
- status = "okay";
- gpio-sck = < 13 0>;
- gpio-mosi = < 9 0>;
- cs-gpios = < 12 0>;
+ pinctrl-0 = <_spi4>;
+ gpio-sck = < 13 GPIO_ACTIVE_LOW>;
+ gpio-mosi = < 9 GPIO_ACTIVE_LOW>;
+ cs-gpios = < 12 GPIO_ACTIVE_LOW>;
num-chipselects = <1>;
#address-cells = <1>;
#size-cells = <0>;
- gpio_spi: gpio_spi@0 {
+ extended_io: gpio-expander@0 {
compatible = "fairchild,74hc595";
gpio-controller;
#gpio-cells = <2>;
reg = <0>;
registers-number = <1>;
- registers-default = /bits/ 8 <0x74>; /* Enable
PERI_3V3, SENSOR_RST_B and HDMI_RST*/
spi-max-frequency = <10>;
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
+ reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb_otg1_vbus";
+ regulator-min-microvolt = <500>;
+ regulator-max-microvolt = <500>;
+ gpio = < 5 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
- reg_usb_otg1_vbus: regulator@0 {
- compatible = "regulator-fixed";
- reg = <0>;
- regulator-name = "usb_otg1_vbus";
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- gpio = < 5 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
+ reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb_otg2_vbus";
+ pinctrl-names = "default";
+ pinctrl-0 = <_usb_otg2_vbus_reg>;
+ regulator-min-microvolt = <500>;
+ regulator-max-microvolt = <500>;
+ gpio = < 7 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
- reg_usb_otg2_vbus: regulator@1 {
- compatible = "regulator-fixed";
- reg = <1>;
-
[PATCH] pico-imx7d: Convert to DM_ETH
Signed-off-by: Joris Offouga
---
board/technexion/pico-imx7d/pico-imx7d.c | 46
configs/pico-dwarf-imx7d_defconfig | 5 +++
configs/pico-hobbit-imx7d_defconfig | 5 +++
configs/pico-imx7d_bl33_defconfig| 5 +++
configs/pico-imx7d_defconfig | 5 +++
configs/pico-nymph-imx7d_defconfig | 5 +++
configs/pico-pi-imx7d_defconfig | 5 +++
include/configs/pico-imx7d.h | 11 --
8 files changed, 30 insertions(+), 57 deletions(-)
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index bcfc7d361e..b7ca2e1315 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
#include "../../freescale/common/pfuze.h"
@@ -26,11 +25,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \
PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
-#define ENET_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
-#define ENET_PAD_CTRL_MII (PAD_CTL_DSE_3P3V_32OHM)
-
-#define ENET_RX_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
-
#define I2C_PAD_CTRL(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
@@ -123,44 +117,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
};
#ifdef CONFIG_FEC_MXC
-static iomux_v3_cfg_t const fec1_pads[] = {
- MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
- MX7D_PAD_SD2_WP__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
- MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL |
MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL |
MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
- MX7D_PAD_SD3_STROBE__GPIO6_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
- MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-#define FEC1_RST_GPIO IMX_GPIO_NR(6, 11)
-
-static void setup_iomux_fec(void)
-{
- imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
- gpio_request(FEC1_RST_GPIO, "phy_rst");
- gpio_direction_output(FEC1_RST_GPIO, 0);
- udelay(500);
- gpio_set_value(FEC1_RST_GPIO, 1);
-}
-
-int board_eth_init(bd_t *bis)
-{
- setup_iomux_fec();
-
- return fecmxc_initialize_multi(bis, 0,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
-}
-
static int setup_fec(void)
{
struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs
@@ -235,9 +191,7 @@ int board_init(void)
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
#ifdef CONFIG_DM_VIDEO
-
setup_lcd();
-
#endif
#ifdef CONFIG_FEC_MXC
setup_fec();
diff --git a/configs/pico-dwarf-imx7d_defconfig
b/configs/pico-dwarf-imx7d_defconfig
index 94d73ee051..2437a64dd0 100644
--- a/configs/pico-dwarf-imx7d_defconfig
+++ b/configs/pico-dwarf-imx7d_defconfig
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_USDHC=y
CONFIG_MTD=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
CONFIG_MII=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
index ef86b0cd66..3467d4c2e4 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_USDHC=y
CONFIG_MTD=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
CONFIG_MII=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-imx7d_bl33_defconfig
b/configs/pico-imx7d_bl33_defconfig
index 51d3514072..49a4e1b0c1 100644
--- a/configs/pico-imx7d_bl33_defconfig
+++ b/configs/pico-imx7d_bl33_defconfig
@@ -50,6 +50,11 @@ CONFIG_DM_MMC=y
CONFIG_FSL_USDHC=y
CONFIG_MTD=y
CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
CONFIG_MII=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_
[PATCH 3/3] mx7dsabre: Convert to distroboot support
Signed-off-by: Joris Offouga
---
configs/mx7dsabresd_defconfig | 13 ++---
configs/mx7dsabresd_qspi_defconfig | 14 ++---
include/configs/mx7dsabresd.h | 84 ++
3 files changed, 25 insertions(+), 86 deletions(-)
diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 48aa15a199..d15de386fc 100644
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -9,13 +9,13 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
# CONFIG_ARMV7_VIRT is not set
CONFIG_IMX_RDC=y
CONFIG_IMX_BOOTAUX=y
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
+CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_BOUNCE_BUFFER=y
-CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BOOTD is not set
-CONFIG_CMD_BOOTZ=y
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_BOOTM_PLAN9 is not set
# CONFIG_BOOTM_RTEMS is not set
@@ -30,17 +30,13 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
CONFIG_CMD_BMP=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
+# CONFIG_ISO_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -78,7 +74,6 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_MXC_USB_OTG_HACTIVE=y
-CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="FSL"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
diff --git a/configs/mx7dsabresd_qspi_defconfig
b/configs/mx7dsabresd_qspi_defconfig
index c105560305..b2d5dc1c22 100644
--- a/configs/mx7dsabresd_qspi_defconfig
+++ b/configs/mx7dsabresd_qspi_defconfig
@@ -4,17 +4,18 @@ CONFIG_SYS_TEXT_BASE=0x8780
CONFIG_TARGET_MX7DSABRESD=y
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xC
+CONFIG_NR_DRAM_BANKS=1
CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
# CONFIG_ARMV7_VIRT is not set
CONFIG_IMX_RDC=y
CONFIG_IMX_BOOTAUX=y
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
+CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_BOUNCE_BUFFER=y
-CONFIG_HUSH_PARSER=y
# CONFIG_CMD_BOOTD is not set
-CONFIG_CMD_BOOTZ=y
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_BOOTM_PLAN9 is not set
# CONFIG_BOOTM_RTEMS is not set
@@ -29,17 +30,13 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
CONFIG_CMD_BMP=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
+# CONFIG_ISO_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb-qspi"
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -84,7 +81,6 @@ CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_MXC_USB_OTG_HACTIVE=y
-CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="FSL"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index f574669644..b1726b1d88 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -74,76 +74,25 @@
"image=zImage\0" \
"console=ttymxc0\0" \
"fdt_high=0x\0" \
+ "finduuid=part uuid mmc 0:1 uuid\0" \
"initrd_high=0x\0" \
- "fdt_file=imx7d-sdb.dtb\0" \
+ "fdtfile=imx7d-sdb.dtb\0" \
"fdt_addr=0x8300\0" \
- "boot_fdt=try\0" \
- "ip_dyn=yes\0" \
+ "fdt_addr_r=0x8300\0" \
+ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+ "ramdisk_addr_r=0x8300\0" \
+ "ramdiskaddr=0x8300\0" \
+ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
"videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0"
\
- "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
- "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
- "mmcautodetect=yes\0" \
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
- "root=${mmcroot}\0" \
- "loadbootscript=" \
- "
[PATCH 1/3] mx7dsabre: Remove warning about DM_SPI_FLASH
This defconfig doesn't need it. Signed-off-by: Joris Offouga --- configs/mx7dsabresd_defconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 2a9fdac338..3dac7136d2 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -55,9 +55,6 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_FSL_USDHC=y -CONFIG_MTD=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_EON=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PINCTRL=y -- 2.20.1
Re: [PATCH 1/1] arm: -march=armv5t for ARM11
HI Heinrich
I test on my Raspberry Pi Zero W
You can see raw log :
U-Boot 2020.01-rc4-00123-g067f56dac4 (Dec 07 2019 - 11:52:01 +0100)
DRAM: 448 MiB
RPI Zero W (0x9000c1)
MMC: mmc@7e202000: 0, sdhci@7e30: 1
Loading Environment from FAT... *** Warning - bad CRC, using default
environment
In: serial
Out: vidconsole
Err: vidconsole
Net: No ethernet found.
starting USB...
Bus usb@7e98: scanning bus usb@7e98 for devices... 1 USB
Device(s) found
scanning usb for storage devices... 0 Storage Device(s) found
Hit any key to stop autoboot: 0
U-Boot>
Tested-by: Joris Offouga
Best Regards,
Joris
Le 07/12/2019 à 09:14, Heinrich Schuchardt a écrit :
In GCC 9 support for the Armv5 and Armv5E architectures (which have no
known implementations) has been removed, cf.
https://gcc.gnu.org/gcc-9/changes.html
Commit 16540d07fd62 ("arm: fix -march for ARM11") changed the value of the
compiler flag from -march=armv5 and -march=armv5t into -march=armv6 for
ARM11.
The values prior to this patch were:
arch-$(CONFIG_CPU_ARM1136) =-march=armv5
arch-$(CONFIG_CPU_ARM1176) =-march=armv5t
The change lead to a regression with the Raspberry Pi Zero W not booting
anymore.
Use -march=armv5t both for ARM1136 and ARM1176.
Fixes: 16540d07fd62 ("arm: fix -march for ARM11")
Signed-off-by: Heinrich Schuchardt
---
I do not possess an ARM1136 board for testing. It would be great, if
anybody could test on real hardware.
---
arch/arm/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 60af7e3199..856f2d8608 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -12,8 +12,8 @@ arch-$(CONFIG_CPU_ARM926EJS) =-march=armv5te
arch-$(CONFIG_CPU_ARM946ES) =-march=armv5te
arch-$(CONFIG_CPU_SA1100) =-march=armv4
arch-$(CONFIG_CPU_PXA)=
-arch-$(CONFIG_CPU_ARM1136) =-march=armv6
-arch-$(CONFIG_CPU_ARM1176) =-march=armv6
+arch-$(CONFIG_CPU_ARM1136) =-march=armv5t
+arch-$(CONFIG_CPU_ARM1176) =-march=armv5t
arch-$(CONFIG_CPU_V7A)=$(call cc-option, -march=armv7-a, \
$(call cc-option, -march=armv7))
arch-$(CONFIG_CPU_V7M)=-march=armv7-m
--
2.24.0
[U-Boot] Pico-imx7d and imx7d sabre Break on 2020.01-rc3
Anatolij, Fabio I just compiled a fresh U-Boot with U-Boot master and It looks like commit f0b54d (video: mxsfb: Configure the clock after eLCDIF reset") [1] breaks my Pico-imx7d and imx7d-Sabre. see logs after: U-Boot 2020.01-rc3-00489-g47b48fe186 (Nov 24 2019 - 15:18:23 +0100) CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz) CPU: Commercial temperature grade (0C to 95C) at 36C Reset cause: POR Model: Freescale i.MX7 SabreSD Board Board: i.MX7D SABRESD in secure mode DRAM: 1 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 Loading Environment from MMC... OK Video: 480x272x24 After revert it : U-Boot 2020.01-rc3-00490-g6bebc83c0a (Nov 24 2019 - 15:51:16 +0100) CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz) CPU: Commercial temperature grade (0C to 95C) at 36C Reset cause: POR Model: Freescale i.MX7 SabreSD Board Board: i.MX7D SABRESD in secure mode DRAM: 1 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 Loading Environment from MMC... OK Video: 480x272x24 In: serial Out: serial Err: serial Net: FEC0 Hit any key to stop autoboot: 0 So, can you consider this commit 'not applicable' for next release ? [1]- https://gitlab.denx.de/u-boot/u-boot/commit/ec3dcea7447031463643c33143b3a5f027f0b54d Best Regards, Joris ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] warp7: Remove CONFIG_SYS_FSL_ESDHC_ADDR
Hi Fabio, Le 23/10/2019 à 16:20, Fabio Estevam a écrit : warp7 uses the driver model and it retrieves the ESDHC base address from device tree. Remove the unneeded CONFIG_SYS_FSL_ESDHC_ADDR definition. Signed-off-by: Fabio Estevam --- include/configs/warp7.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 73541fe176..9c6ee6997f 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_MALLOC_LEN (35 * SZ_1M) /* MMC Config*/ -#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 Reviewed-by: Joris Offouga Tested-by: Joris Offouga Best regards, Joris Offouga ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] warp7: Remove duplicate "mmc dev" command
Hi Fabio,
Le 23/10/2019 à 16:20, Fabio Estevam a écrit :
The "mmc dev" command is being called twice.
Remove the extra call.
Signed-off-by: Fabio Estevam
---
include/configs/warp7.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 9c6ee6997f..f1fc6c714f 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -94,7 +94,6 @@
"fi;\0" \
#define CONFIG_BOOTCOMMAND \
- "mmc dev ${mmcdev};" \
"mmc dev ${mmcdev}; if mmc rescan; then " \
"run do_bootscript_hab;" \
"if run loadbootscript; then " \
Reviewed-by: Joris Offouga
Best regards,
Joris Offouga
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] warp7: Fix U-Boot corruption after saving the environment
Hi Fabio, Pierre-Jean
Le 21/10/2019 à 19:12, Pierre-Jean Texier a écrit :
Fabio,
Le 21/10/2019 à 18:50, Fabio Estevam a écrit :
Hi Pierre-Jean,
On Mon, Oct 21, 2019 at 1:43 PM Pierre-Jean Texier
wrote:
On top-of master 32ded50 ("spl: mmc: make eMMC HW boot
partition configuration optional ")
I am not able to reproduce the described behavior.
I used u-boot-imx tree and this is what I get:
ls -al u-boot-dtb.imx
-rw-r--r-- 1 fabio fabio 547840 out 21 13:45 u-boot-dtb.imx
Same for me, but I can't reproduce this issue :/
Same for me
Original CONFIG_ENV_OFFSET is:
#define CONFIG_ENV_OFFSET (8 * SZ_64K)
CONFIG_ENV_OFFSET = 8 * 64 * 1024 = 524288
So the u-boot-dtb.imx is overlapping the env region.
Indeed.
Maybe your compiler is producing a smaller binary and you are not
getting the issue.
Anyway, it is safer to increase CONFIG_ENV_OFFSET and use
CONFIG_BOARD_SIZE_LIMIT to detect such problem in build-time.
You're right, I agree with that ;)
I agree with you ;)
So,
Acked-by: Pierre-Jean Texier
Tested-by: Pierre-Jean Texier
Acked-by: Joris Offouga
Tested-by: Joris Offouga
Best regards,
Joris
Thanks !
Regards
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2] pico-imx7d: Remove specific code for fitImage
This implementation is a specific utilisation with CONFIG_FIT.
This feature use script for boot. With distrobootcmd is possible
to load script.
Signed-off-by: Joris Offouga
Reviewed-by: Otavio Salvador
---
Changes v1 -> v2
- Remove missing endif
include/configs/pico-imx7d.h | 32
1 file changed, 32 deletions(-)
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 5abf80a292..572febdd7a 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -45,21 +45,6 @@
"/boot/imx7d-pico-pi.dtb ext4 0 1;" \
"rootfs part 0 1\0" \
-/* When booting with FIT specify the node entry containing boot.scr */
-#if defined(CONFIG_FIT)
-#define PICO_BOOT_ENV \
- "bootscr_fitimage_name=bootscr\0" \
- "bootscriptaddr=0x8320\0" \
- "fdtovaddr=0x8310\0" \
- "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
- "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
- "rootwait rw;\0" \
- "loadbootscript=" \
- "load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr} ${script};\0" \
- "bootscript=echo Running bootscript from mmc ...; " \
- "source ${bootscriptaddr}:${bootscr_fitimage_name}\0"
-#else
#define PICO_BOOT_ENV \
"bootmenu_0=Boot using PICO-Hobbit baseboard=" \
"setenv fdtfile imx7d-pico-hobbit.dtb\0" \
@@ -70,8 +55,6 @@
"bootmenu_3=Boot using PICO-Pi baseboard=" \
"setenv fdtfile imx7d-pico-pi.dtb\0" \
BOOTENV
-#endif
-
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
@@ -105,21 +88,6 @@
"setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \
PICO_BOOT_ENV
-#if defined(CONFIG_FIT)
-#define CONFIG_BOOTCOMMAND \
- "mmc dev ${mmcdev};" \
- "mmc dev ${mmcdev}; if mmc rescan; then " \
- "if run loadbootscript; then " \
- "iminfo ${bootscriptaddr};" \
- "if test $? -eq 1; then hab_failsafe; fi;" \
- "run bootscript; " \
- "else " \
- "echo Fail to load fitImage with boot script;" \
- "hab_failsafe;" \
- "fi; " \
- "fi"
-#endif
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(USB, usb, 0) \
--
2.17.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] pico-imx7d: Remove specific code for fitImage
This implementation is a specific utilisation with CONFIG_FIT.
This feature use script for boot. With distrobootcmd is possible
to load script.
Signed-off-by: Joris Offouga
---
include/configs/pico-imx7d.h | 30 --
1 file changed, 30 deletions(-)
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 5abf80a292..26eef59393 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -45,21 +45,6 @@
"/boot/imx7d-pico-pi.dtb ext4 0 1;" \
"rootfs part 0 1\0" \
-/* When booting with FIT specify the node entry containing boot.scr */
-#if defined(CONFIG_FIT)
-#define PICO_BOOT_ENV \
- "bootscr_fitimage_name=bootscr\0" \
- "bootscriptaddr=0x8320\0" \
- "fdtovaddr=0x8310\0" \
- "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
- "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
- "mmcargs=setenv bootargs console=${console},${baudrate} " \
- "rootwait rw;\0" \
- "loadbootscript=" \
- "load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr} ${script};\0" \
- "bootscript=echo Running bootscript from mmc ...; " \
- "source ${bootscriptaddr}:${bootscr_fitimage_name}\0"
-#else
#define PICO_BOOT_ENV \
"bootmenu_0=Boot using PICO-Hobbit baseboard=" \
"setenv fdtfile imx7d-pico-hobbit.dtb\0" \
@@ -70,8 +55,6 @@
"bootmenu_3=Boot using PICO-Pi baseboard=" \
"setenv fdtfile imx7d-pico-pi.dtb\0" \
BOOTENV
-#endif
-
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
@@ -105,19 +88,6 @@
"setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \
PICO_BOOT_ENV
-#if defined(CONFIG_FIT)
-#define CONFIG_BOOTCOMMAND \
- "mmc dev ${mmcdev};" \
- "mmc dev ${mmcdev}; if mmc rescan; then " \
- "if run loadbootscript; then " \
- "iminfo ${bootscriptaddr};" \
- "if test $? -eq 1; then hab_failsafe; fi;" \
- "run bootscript; " \
- "else " \
- "echo Fail to load fitImage with boot script;" \
- "hab_failsafe;" \
- "fi; " \
- "fi"
#endif
#define BOOT_TARGET_DEVICES(func) \
--
2.17.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] Pico-imx7d break
Hi Stefano, I try to build pico-pi_imx7d_defconfig in your next branch but build failed. You apply my series but V1 version not V2. See patchwork: https://patchwork.ozlabs.org/project/uboot/list/?series=132098 Best regards, Joris Offouga ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [GIT PULL] Pull request: u-boot-imx u-boot-imx-20190923
Hi Tom and Stefano I send patch series for fix build for pico-imx7d Best regards, Joris Offouga Le 23/09/2019 à 14:51, Tom Rini a écrit : On Mon, Sep 23, 2019 at 11:05:31AM +0200, Stefano Babic wrote: Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 87d5b225585f341ea8e926a2c26fb72585fc9d0c: MAINTAINERS: Change fsl-qoriq, mpc86xx, mpc85xx maintainers (2019-09-13 10:14:45 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20190923 for you to fetch changes up to 322a967cdf470640cb8cb6b68b6721e63b8c3104: Merge branch 'for-imx' of https://github.com/OSSystems/u-boot (2019-09-22 15:19:49 +0200) Sorry, with the video PR from last night now pico-imx7d_bl33 pico-hobbit-imx7d pico-nymph-imx7d mx6ul_9x9_evk pico-imx7d mx6ul_14x14_evk pico-dwarf-imx7d pico-pi-imx7d fail to link. Also, at this point in the release cycle are all of these changes still things we really want to bring in? Thanks! ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 2/2] pico-imx7d: Remove dead code for dm_video
Since convert dm_video, unused code introduced, so remove this
Signed-off-by: Joris Offouga
Reviewed-by: Otavio Salvador
---
Changes v2:
Add missing remove port and imx_iomux_v3_setup_multiple_pads
Add Reviewed-by
arch/arm/dts/imx7d-pico-u-boot.dtsi | 37
board/technexion/pico-imx7d/pico-imx7d.c | 12
2 files changed, 49 deletions(-)
diff --git a/arch/arm/dts/imx7d-pico-u-boot.dtsi
b/arch/arm/dts/imx7d-pico-u-boot.dtsi
index ef19de2b30..7307fbaf68 100644
--- a/arch/arm/dts/imx7d-pico-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-pico-u-boot.dtsi
@@ -4,37 +4,6 @@
usb0 =
display0 =
};
-
- backlight: backlight {
- compatible = "pwm-backlight";
- pinctrl-names = "default";
- pinctrl-0 = <_backlight>;
- pwms = < 0 5 0>;
- brightness-levels = <0 36 72 108 144 180 216 255>;
- default-brightness-level = <6>;
- status = "okay";
- };
-
- reg_lcd_3v3: regulator-lcd-3v3 {
- compatible = "regulator-fixed";
- regulator-name = "lcd-3v3";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- gpio = < 6 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
-
- panel {
- compatible = "vxt,vl050-8048nt-c01";
- backlight = <>;
- power-supply = <_lcd_3v3>;
-
- port {
- panel_in: endpoint {
- remote-endpoint = <_out>;
- };
- };
- };
};
{
@@ -48,12 +17,6 @@
display = <>;
u-boot,dm-pre-reloc;
- port {
- display_out: endpoint {
- remote-endpoint = <_in>;
- };
- };
-
display0: display {
bits-per-pixel = <16>;
bus-width = <24>;
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index 32b04b8fd6..bfa3c3c87f 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -33,13 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define I2C_PAD_CTRL(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
-
-#define LCD_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
-PAD_CTL_DSE_3P3V_49OHM)
-
-#define LCD_SYNC_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
- PAD_CTL_DSE_3P3V_196OHM)
-
#ifdef CONFIG_SYS_I2C_MXC
#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
@@ -224,13 +217,8 @@ int board_early_init_f(void)
}
#ifdef CONFIG_DM_VIDEO
-static iomux_v3_cfg_t const lcd_pads[] = {
- MX7D_PAD_GPIO1_IO11__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
void setup_lcd(void)
{
- imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
gpio_request(IMX_GPIO_NR(1, 11), "lcd_brightness");
gpio_request(IMX_GPIO_NR(1, 6), "lcd_enable");
/* Set Brightness to high */
--
2.20.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 1/2] pico-imx7d: fix splash logo drawing
Signed-off-by: Joris Offouga Reviewed-by: Otavio Salvador --- Changes v2: Add Reviewed by board/technexion/pico-imx7d/pico-imx7d.c | 13 - configs/pico-dwarf-imx7d_defconfig | 2 ++ configs/pico-hobbit-imx7d_defconfig | 2 ++ configs/pico-imx7d_bl33_defconfig| 2 ++ configs/pico-imx7d_defconfig | 2 ++ configs/pico-nymph-imx7d_defconfig | 2 ++ configs/pico-pi-imx7d_defconfig | 2 ++ include/configs/pico-imx7d.h | 1 + 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c index 916220516e..32b04b8fd6 100644 --- a/board/technexion/pico-imx7d/pico-imx7d.c +++ b/board/technexion/pico-imx7d/pico-imx7d.c @@ -19,10 +19,6 @@ #include #include #include "../../freescale/common/pfuze.h" -#ifdef CONFIG_DM_VIDEO -#include -#include -#endif DECLARE_GLOBAL_DATA_PTR; @@ -250,18 +246,9 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; #ifdef CONFIG_DM_VIDEO - struct udevice *dev; - int ret; - - ret = uclass_get_device(UCLASS_VIDEO, 0, ); - if (ret) - return ret; setup_lcd(); - ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, 0, 0, true); - if (ret) - return ret; #endif #ifdef CONFIG_FEC_MXC setup_fec(); diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig index 97de873e7c..5ddf8d9001 100644 --- a/configs/pico-dwarf-imx7d_defconfig +++ b/configs/pico-dwarf-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig index f3ed298087..8628ba4275 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig index ba347d2507..d7752446cd 100644 --- a/configs/pico-imx7d_bl33_defconfig +++ b/configs/pico-imx7d_bl33_defconfig @@ -20,6 +20,7 @@ CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set +CONFIG_CMD_BMP=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_SPL=y CONFIG_CMD_SPL_WRITE_SIZE=0x2 @@ -63,4 +64,5 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index bad34555fa..56c64e2604 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig index 97de873e7c..5ddf8d9001 100644 --- a/configs/pico-nymph-imx7d_defconfig +++ b/configs/pico-nymph-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index c44bc778ca..f9069d9b08 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 956c383a31..5c4b90a8a1 10
Re: [U-Boot] [PATCH v2 0/4] env: fix build error for envtools
Hi Tom, Can you consider the series of Pierre-Jean that fixes the build of envtools Gentle ping for this series: - http://patchwork.ozlabs.org/patch/1153103/ - http://patchwork.ozlabs.org/patch/1153106/ - http://patchwork.ozlabs.org/patch/1153105/ - http://patchwork.ozlabs.org/patch/1153104/ Best Regards, Joris Offouga Le 16/09/2019 à 21:09, Pierre-Jean Texier a écrit : Hello Tom, Le 26/08/2019 à 13:06, Pierre-Jean Texier a écrit : Here is a set of patches that fixes envtools breakage introduced after v2019.10-rc2. This serie also adds envtools to travis CI and gitlab-ci. This was tested on WaRP7. Before this serie: - https://travis-ci.com/texierp/u-boot/jobs/227669967 After this serie: - https://travis-ci.com/texierp/u-boot/jobs/227761236 Pierre-Jean Texier (4): fw_env: remove duplicated definitions fw_env: fix build error env: add missing header file ci: add envtools support .gitlab-ci.yml | 7 +++ .travis.yml | 4 include/env.h | 1 + tools/env/fw_env.c | 10 ++ 4 files changed, 14 insertions(+), 8 deletions(-) Gentle ping for this series: - http://patchwork.ozlabs.org/patch/1153103/ - http://patchwork.ozlabs.org/patch/1153106/ - http://patchwork.ozlabs.org/patch/1153105/ - http://patchwork.ozlabs.org/patch/1153104/ With this, envtools compiles again. Thanks, Pierre-Jean ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 0/2] Fix pico-imx7d
After merge master imx and U-Boot master. Pico imx7d build break. common/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:46 : définitions multiples de « bmp_logo_bitmap » board/technexion/pico-imx7d/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:46 : défini pour la première fois ici common/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:12 : définitions multiples de « bmp_logo_palette » board/technexion/pico-imx7d/built-in.o:/home/jun/u-boot/include/bmp_logo_data.h:12 : défini pour la première fois ici Makefile:1610: recipe for target 'u-boot' failed make: *** [u-boot] Error 1 So fix with according Anatolij Gustschin U-Boot video merge. See fix branch : https://github.com/jorisoffouga/u-boot/commits/fix/pico-imx7d Joris Offouga (2): pico-imx7d: fix splash logo drawing pico-imx7d: Remove dead code for dm_video arch/arm/dts/imx7d-pico-u-boot.dtsi | 31 board/technexion/pico-imx7d/pico-imx7d.c | 24 -- configs/pico-dwarf-imx7d_defconfig | 2 ++ configs/pico-hobbit-imx7d_defconfig | 2 ++ configs/pico-imx7d_bl33_defconfig| 2 ++ configs/pico-imx7d_defconfig | 2 ++ configs/pico-nymph-imx7d_defconfig | 2 ++ configs/pico-pi-imx7d_defconfig | 2 ++ include/configs/pico-imx7d.h | 1 + 9 files changed, 13 insertions(+), 55 deletions(-) -- 2.17.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 2/2] pico-imx7d: Remove dead code for dm_video
Since convert dm_video, unused code introduced, so remove this
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7d-pico-u-boot.dtsi | 31
board/technexion/pico-imx7d/pico-imx7d.c | 11 -
2 files changed, 42 deletions(-)
diff --git a/arch/arm/dts/imx7d-pico-u-boot.dtsi
b/arch/arm/dts/imx7d-pico-u-boot.dtsi
index ef19de2b30..cc50f38fd6 100644
--- a/arch/arm/dts/imx7d-pico-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-pico-u-boot.dtsi
@@ -4,37 +4,6 @@
usb0 =
display0 =
};
-
- backlight: backlight {
- compatible = "pwm-backlight";
- pinctrl-names = "default";
- pinctrl-0 = <_backlight>;
- pwms = < 0 5 0>;
- brightness-levels = <0 36 72 108 144 180 216 255>;
- default-brightness-level = <6>;
- status = "okay";
- };
-
- reg_lcd_3v3: regulator-lcd-3v3 {
- compatible = "regulator-fixed";
- regulator-name = "lcd-3v3";
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- gpio = < 6 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
-
- panel {
- compatible = "vxt,vl050-8048nt-c01";
- backlight = <>;
- power-supply = <_lcd_3v3>;
-
- port {
- panel_in: endpoint {
- remote-endpoint = <_out>;
- };
- };
- };
};
{
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index 32b04b8fd6..ebfe769547 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -33,13 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define I2C_PAD_CTRL(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
-
-#define LCD_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
-PAD_CTL_DSE_3P3V_49OHM)
-
-#define LCD_SYNC_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
- PAD_CTL_DSE_3P3V_196OHM)
-
#ifdef CONFIG_SYS_I2C_MXC
#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
@@ -224,10 +217,6 @@ int board_early_init_f(void)
}
#ifdef CONFIG_DM_VIDEO
-static iomux_v3_cfg_t const lcd_pads[] = {
- MX7D_PAD_GPIO1_IO11__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
void setup_lcd(void)
{
imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
--
2.17.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 1/2] pico-imx7d: fix splash logo drawing
Signed-off-by: Joris Offouga --- board/technexion/pico-imx7d/pico-imx7d.c | 13 - configs/pico-dwarf-imx7d_defconfig | 2 ++ configs/pico-hobbit-imx7d_defconfig | 2 ++ configs/pico-imx7d_bl33_defconfig| 2 ++ configs/pico-imx7d_defconfig | 2 ++ configs/pico-nymph-imx7d_defconfig | 2 ++ configs/pico-pi-imx7d_defconfig | 2 ++ include/configs/pico-imx7d.h | 1 + 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c index 916220516e..32b04b8fd6 100644 --- a/board/technexion/pico-imx7d/pico-imx7d.c +++ b/board/technexion/pico-imx7d/pico-imx7d.c @@ -19,10 +19,6 @@ #include #include #include "../../freescale/common/pfuze.h" -#ifdef CONFIG_DM_VIDEO -#include -#include -#endif DECLARE_GLOBAL_DATA_PTR; @@ -250,18 +246,9 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; #ifdef CONFIG_DM_VIDEO - struct udevice *dev; - int ret; - - ret = uclass_get_device(UCLASS_VIDEO, 0, ); - if (ret) - return ret; setup_lcd(); - ret = video_bmp_display(dev, (ulong)bmp_logo_bitmap, 0, 0, true); - if (ret) - return ret; #endif #ifdef CONFIG_FEC_MXC setup_fec(); diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig index 97de873e7c..5ddf8d9001 100644 --- a/configs/pico-dwarf-imx7d_defconfig +++ b/configs/pico-dwarf-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig index f3ed298087..8628ba4275 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig index ba347d2507..d7752446cd 100644 --- a/configs/pico-imx7d_bl33_defconfig +++ b/configs/pico-imx7d_bl33_defconfig @@ -20,6 +20,7 @@ CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set +CONFIG_CMD_BMP=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_SPL=y CONFIG_CMD_SPL_WRITE_SIZE=0x2 @@ -63,4 +64,5 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index bad34555fa..56c64e2604 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig index 97de873e7c..5ddf8d9001 100644 --- a/configs/pico-nymph-imx7d_defconfig +++ b/configs/pico-nymph-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index c44bc778ca..f9069d9b08 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MII is not set +CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y @@ -67,3 +68,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 956c383a31..5c4b90a8a1 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/p
Re: [U-Boot] [GIT PULL] Pull request: u-boot-imx u-boot-imx-20190916
I build with success dwarf board and nymph board and i update my patch with your master branch : https://github.com/jorisoffouga/u-boot/commits/pico-imx7/dmvideo also I noticed that dwarf cards and nymph cards do not have dm_usb, this is done for pi and hobbit Best regards, Joris Offouga Le 16/09/2019 à 10:48, Stefano Babic a écrit : On 16/09/19 10:43, Joris OFFOUGA wrote: Hi Stefano, Thanks, I have a separate branch for my "next" master and your patches break the dwarf /nymph boards: arm: + pico-nymph-imx7d +drivers/built-in.o: In function `cfg_video_init': +drivers/video/cfb_console.c:2024: undefined reference to `video_hw_init' +arm-poky-linux-gnueabi-ld.bfd: BFD (GNU Binutils) 2.28.0.20170307 assertion fail ../../bfd/elf32-arm.c:9512 +make[1]: *** [u-boot] Error 1 +make: *** [sub-make] Error 2 arm: + pico-dwarf-imx7d +drivers/built-in.o: In function `cfg_video_init': +drivers/video/cfb_console.c:2024: undefined reference to `video_hw_init' +arm-poky-linux-gnueabi-ld.bfd: BFD (GNU Binutils) 2.28.0.20170307 assertion fail ../../bfd/elf32-arm.c:9512 +make[1]: *** [u-boot] Error 1 +make: *** [sub-make] Error 2 Can you take a lookt at it ? Regards, Stefano Regards, Joris Offouga Le lun. 16 sept. 2019 à 10:39, Stefano Babic mailto:sba...@denx.de>> a écrit : On 16/09/19 10:16, Joris OFFOUGA wrote: > Hi Stefano, > > You don't apply my series in your PR? > No, I am applying them on top of it and then I send a new PR. Regards, Stefano > Best Regards, > Joris Offouga > > Le lun. 16 sept. 2019 à 10:13, Stefano Babic mailto:sba...@denx.de> > <mailto:sba...@denx.de <mailto:sba...@denx.de>>> a écrit : > > Hi Tom, > > please pull from u-boot-imx, thanks. > > There is still a broken board (imx6dl_mamoj) - it will be fixed later. > > The following changes since commit > 5ba8b1254311d00e2bdd9e227b78bdb7e89e69dd: > > Merge tag 'u-boot-rockchip-20190912' of > https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip (2019-09-11 > 23:08:34 -0400) > > are available in the Git repository at: > > https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git > tags/u-boot-imx-20190916 > > for you to fetch changes up to a49022353fb9a1a9705b0d6b9a31e13b20824ef6: > > imx: fix missing MAINTAINERS pico boards (2019-09-16 09:39:57 +0200) > > > u-boot-imx-20190916 > --- > > - Technexion boards > - fix in HABv4 > - MX8 container file > - Fix for Toradex boards > - i.MX7ULP fixes > > > Anatolij Gustschin (1): > imx: sksimx6_defconfig: remove SPL misc option to fix build error > > Bai Ping (2): > i.MX7ULP: Fix system reset after a7 rtc alarm expired. > i.MX7ULP: Correct the clock index > > Breno Matheus Lima (4): > Kconfig: Migrate CONFIG_CSF_SIZE to Kconfig > imx6: spl: Reduce SPL limit size in case CONFIG_SECURE_BOOT is > enabled > imx: configs: Cleanup CONFIG_SECURE_BOOT comments > habv4: tools: Avoid hardcoded CSF size for SPL targets > > Fabio Berton (1): > pico-imx7d: Sync pico-hobbit-imx7d_defconfig > > Fabio Estevam (9): > mx6sabresd: Reduce overall SPL size > pico-imx6ul: Increase the CONFIG_ENV_OFFSET size > pico-imx6ul: Add LCD support > pico-imx6ul: Update the Falcon mode instructions > pico-imx6ul: Provide a way to escape the Falcon mode > pico-imx7d: Add instructions for booting in Falcon mode > pico-imx7d: Provide a way to escape the Falcon mode > logos: Add the TechNexion's logo > pico: Convert to CONFIG_FSL_USDHC > > Heinrich Schuchardt (8): > efi_loader: EFI_FILE_PROTOCOL.Write() check args > efi_loader: eliminate inline function ascii2unicode() > efi_loader: correct reading of directories > efi_loader: file size checks > efi_loader: EFI_FILE_PROTOCOL rev 2 stub > efi_loader: volume name in EFI_FILE_PROTOCOL.GetInfo() > efi_loader: check parameters EFI_FILE_PROTOCOL.GetIn
Re: [U-Boot] [GIT PULL] Pull request: u-boot-imx u-boot-imx-20190916
Hi Stefano, Thanks, Regards, Joris Offouga Le lun. 16 sept. 2019 à 10:39, Stefano Babic a écrit : > On 16/09/19 10:16, Joris OFFOUGA wrote: > > Hi Stefano, > > > > You don't apply my series in your PR? > > > > No, I am applying them on top of it and then I send a new PR. > > Regards, > Stefano > > > Best Regards, > > Joris Offouga > > > > Le lun. 16 sept. 2019 à 10:13, Stefano Babic > <mailto:sba...@denx.de>> a écrit : > > > > Hi Tom, > > > > please pull from u-boot-imx, thanks. > > > > There is still a broken board (imx6dl_mamoj) - it will be fixed > later. > > > > The following changes since commit > > 5ba8b1254311d00e2bdd9e227b78bdb7e89e69dd: > > > > Merge tag 'u-boot-rockchip-20190912' of > > https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip (2019-09-11 > > 23:08:34 -0400) > > > > are available in the Git repository at: > > > > https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git > > tags/u-boot-imx-20190916 > > > > for you to fetch changes up to > a49022353fb9a1a9705b0d6b9a31e13b20824ef6: > > > > imx: fix missing MAINTAINERS pico boards (2019-09-16 09:39:57 > +0200) > > > > > > u-boot-imx-20190916 > > --- > > > > - Technexion boards > > - fix in HABv4 > > - MX8 container file > > - Fix for Toradex boards > > - i.MX7ULP fixes > > > > > > Anatolij Gustschin (1): > > imx: sksimx6_defconfig: remove SPL misc option to fix build > error > > > > Bai Ping (2): > > i.MX7ULP: Fix system reset after a7 rtc alarm expired. > > i.MX7ULP: Correct the clock index > > > > Breno Matheus Lima (4): > > Kconfig: Migrate CONFIG_CSF_SIZE to Kconfig > > imx6: spl: Reduce SPL limit size in case CONFIG_SECURE_BOOT is > > enabled > > imx: configs: Cleanup CONFIG_SECURE_BOOT comments > > habv4: tools: Avoid hardcoded CSF size for SPL targets > > > > Fabio Berton (1): > > pico-imx7d: Sync pico-hobbit-imx7d_defconfig > > > > Fabio Estevam (9): > > mx6sabresd: Reduce overall SPL size > > pico-imx6ul: Increase the CONFIG_ENV_OFFSET size > > pico-imx6ul: Add LCD support > > pico-imx6ul: Update the Falcon mode instructions > > pico-imx6ul: Provide a way to escape the Falcon mode > > pico-imx7d: Add instructions for booting in Falcon mode > > pico-imx7d: Provide a way to escape the Falcon mode > > logos: Add the TechNexion's logo > > pico: Convert to CONFIG_FSL_USDHC > > > > Heinrich Schuchardt (8): > > efi_loader: EFI_FILE_PROTOCOL.Write() check args > > efi_loader: eliminate inline function ascii2unicode() > > efi_loader: correct reading of directories > > efi_loader: file size checks > > efi_loader: EFI_FILE_PROTOCOL rev 2 stub > > efi_loader: volume name in EFI_FILE_PROTOCOL.GetInfo() > > efi_loader: check parameters EFI_FILE_PROTOCOL.GetInfo() > > efi_loader: parameter checks EFI_FILE_PROTOCOL.SetInfo() > > > > Otavio Salvador (3): > > pico-imx6ul: Add DWARF baseboard support > > pico-imx7d: Add DWARF baseboard support > > pico-imx7d: Add NYMPH baseboard support > > > > Peng Fan (39): > > arm: dts: sync dts for i.MX6UL > > arm: dts: sync dts for i.MX6ULL > > arm: dts: import dts for i.MX6ULZ > > imx: add i.MX6ULZ cpu type > > imx: add i.MX6ULZ board > > imx: mx6ul_14x14_evk: Fix SPL boot > > imx: mx6ul_14x14_evk: convert to DM_VIDEO > > imx: mx6slevk: enable DM_SPI and DM_SPI_FLASH > > pinctrl: imx: use devfdt_get_addr_size_index > > tools: imx8mimage: fix HDMI/FIT parsing > > serial: Kconfig: make MXC_UART usable for MX7 and IMX8M > > spl: pass args to board_return_to_bootrom > > arm: dts: imx: fsl-imx8qm.dtsi: add gpio aliases to fix gpio > > command > > imx: i.MX7ULP: add get_boot_device > > i.MX7ULP: evk: Modify FDT file to disable SD3.0 for usb boot > >
Re: [U-Boot] [GIT PULL] Pull request: u-boot-imx u-boot-imx-20190916
Hi Stefano, You don't apply my series in your PR? Best Regards, Joris Offouga Le lun. 16 sept. 2019 à 10:13, Stefano Babic a écrit : > Hi Tom, > > please pull from u-boot-imx, thanks. > > There is still a broken board (imx6dl_mamoj) - it will be fixed later. > > The following changes since commit > 5ba8b1254311d00e2bdd9e227b78bdb7e89e69dd: > > Merge tag 'u-boot-rockchip-20190912' of > https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip (2019-09-11 > 23:08:34 -0400) > > are available in the Git repository at: > > https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git > tags/u-boot-imx-20190916 > > for you to fetch changes up to a49022353fb9a1a9705b0d6b9a31e13b20824ef6: > > imx: fix missing MAINTAINERS pico boards (2019-09-16 09:39:57 +0200) > > > u-boot-imx-20190916 > --- > > - Technexion boards > - fix in HABv4 > - MX8 container file > - Fix for Toradex boards > - i.MX7ULP fixes > > > Anatolij Gustschin (1): > imx: sksimx6_defconfig: remove SPL misc option to fix build error > > Bai Ping (2): > i.MX7ULP: Fix system reset after a7 rtc alarm expired. > i.MX7ULP: Correct the clock index > > Breno Matheus Lima (4): > Kconfig: Migrate CONFIG_CSF_SIZE to Kconfig > imx6: spl: Reduce SPL limit size in case CONFIG_SECURE_BOOT is > enabled > imx: configs: Cleanup CONFIG_SECURE_BOOT comments > habv4: tools: Avoid hardcoded CSF size for SPL targets > > Fabio Berton (1): > pico-imx7d: Sync pico-hobbit-imx7d_defconfig > > Fabio Estevam (9): > mx6sabresd: Reduce overall SPL size > pico-imx6ul: Increase the CONFIG_ENV_OFFSET size > pico-imx6ul: Add LCD support > pico-imx6ul: Update the Falcon mode instructions > pico-imx6ul: Provide a way to escape the Falcon mode > pico-imx7d: Add instructions for booting in Falcon mode > pico-imx7d: Provide a way to escape the Falcon mode > logos: Add the TechNexion's logo > pico: Convert to CONFIG_FSL_USDHC > > Heinrich Schuchardt (8): > efi_loader: EFI_FILE_PROTOCOL.Write() check args > efi_loader: eliminate inline function ascii2unicode() > efi_loader: correct reading of directories > efi_loader: file size checks > efi_loader: EFI_FILE_PROTOCOL rev 2 stub > efi_loader: volume name in EFI_FILE_PROTOCOL.GetInfo() > efi_loader: check parameters EFI_FILE_PROTOCOL.GetInfo() > efi_loader: parameter checks EFI_FILE_PROTOCOL.SetInfo() > > Otavio Salvador (3): > pico-imx6ul: Add DWARF baseboard support > pico-imx7d: Add DWARF baseboard support > pico-imx7d: Add NYMPH baseboard support > > Peng Fan (39): > arm: dts: sync dts for i.MX6UL > arm: dts: sync dts for i.MX6ULL > arm: dts: import dts for i.MX6ULZ > imx: add i.MX6ULZ cpu type > imx: add i.MX6ULZ board > imx: mx6ul_14x14_evk: Fix SPL boot > imx: mx6ul_14x14_evk: convert to DM_VIDEO > imx: mx6slevk: enable DM_SPI and DM_SPI_FLASH > pinctrl: imx: use devfdt_get_addr_size_index > tools: imx8mimage: fix HDMI/FIT parsing > serial: Kconfig: make MXC_UART usable for MX7 and IMX8M > spl: pass args to board_return_to_bootrom > arm: dts: imx: fsl-imx8qm.dtsi: add gpio aliases to fix gpio command > imx: i.MX7ULP: add get_boot_device > i.MX7ULP: evk: Modify FDT file to disable SD3.0 for usb boot > misc: Kconfig: make i.MX7ULP could use MXC_OCOTP > i.MX7ULP: evk: Enable fuse comamnd > i.MX7ULP: Add CPU revision check for B0 > imx: mx6sabresd: fix usb start when DM enabled > imx: imx6qdl: dtsi: move U-Boot specific change to u-boot.dtsi > imx: imx8qxp_mek: fix CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR > imx8: support parsing i.MX8 Container file > spl: mmc: support loading i.MX container format file > imx: add container target > imx8qxp_mek: switch to use container image > imx8qm_mek: switch to use container image > doc: imx: mkimage: introduce i.MX8 image format > imx: sys_proto: add is_imx8qm helper > imx8qm: power up SMMU > imx8qm: correct fdt_file > imx8: disable node when the resource is not owned > configs: imx8qm/qxp_mek: enable CONFIG_OF_SYSTEM_SETUP > imx: scu_api: add sc_rm_set_master_sid > imx8: fdt: configure sid for masters > imx8: save args passed from ATF > imx8: fdt: add optee node > imx: scu_api: add sc_pm_is_partition_started > imx8: mo
Re: [U-Boot] Please pull pico-imx7d-2019.10-1 from https://github.com/OSSystems/u-boot
Hi Stefano, Thanks Best regards, Joris Le 14/09/2019 à 13:20, Stefano Babic a écrit : Hi Joris, I am pulling all patches for the release, I wil ltake care of yours, too. Regards, Stefano On 14/09/19 12:01, Joris Offouga wrote: +Stefano Babic Le 14/09/2019 à 11:56, Joris Offouga a écrit : Hi Otavio, I adjust my repo with your PR, you can find commits here: https://github.com/jorisoffouga/u-boot/commits/pico-imx7-2019.10-2 Best Regards, Joris Offouga Le 13/09/2019 à 16:36, Otavio Salvador a écrit : On Thu, Sep 12, 2019 at 6:27 PM Joris Offouga wrote: Just put CONFIG_DM_VIDEO in the defconfig Please adjust your PR and let me know; so I test it here. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Please pull pico-imx7d-2019.10-1 from https://github.com/OSSystems/u-boot
+Stefano Babic Le 14/09/2019 à 11:56, Joris Offouga a écrit : Hi Otavio, I adjust my repo with your PR, you can find commits here: https://github.com/jorisoffouga/u-boot/commits/pico-imx7-2019.10-2 Best Regards, Joris Offouga Le 13/09/2019 à 16:36, Otavio Salvador a écrit : On Thu, Sep 12, 2019 at 6:27 PM Joris Offouga wrote: Just put CONFIG_DM_VIDEO in the defconfig Please adjust your PR and let me know; so I test it here. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Please pull pico-imx7d-2019.10-1 from https://github.com/OSSystems/u-boot
Hi Otavio, I adjust my repo with your PR, you can find commits here: https://github.com/jorisoffouga/u-boot/commits/pico-imx7-2019.10-2 Best Regards, Joris Offouga Le 13/09/2019 à 16:36, Otavio Salvador a écrit : On Thu, Sep 12, 2019 at 6:27 PM Joris Offouga wrote: Just put CONFIG_DM_VIDEO in the defconfig Please adjust your PR and let me know; so I test it here. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Please pull pico-imx7d-2019.10-1 from https://github.com/OSSystems/u-boot
Hello, Just put CONFIG_DM_VIDEO in the defconfig Best regards, Joris Offouga Le 12/09/2019 à 23:18, Otavio Salvador a écrit : Hello, On Thu, Sep 12, 2019 at 5:20 PM Joris Offouga wrote: Can you test and apply my series in your pull request ? % grep CONFIG_VIDEO configs/pico-*7d* :( configs/pico-dwarf-imx7d_defconfig:CONFIG_VIDEO=y configs/pico-nymph-imx7d_defconfig:CONFIG_VIDEO=y Those also need update. Please check and let me know when done so I make a new PR. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Please pull pico-imx7d-2019.10-1 from https://github.com/OSSystems/u-boot
Hi Otavio, Can you test and apply my series in your pull request ? https://patchwork.ozlabs.org/patch/1155917/ https://patchwork.ozlabs.org/patch/1155916/ https://patchwork.ozlabs.org/patch/1155914/ Best Regards, Joris Offouga Le jeu. 12 sept. 2019 à 21:38, Otavio Salvador <mailto:otavio.salva...@ossystems.com.br>> a écrit : Hello Stefano, The same patches I sent before are also online. See: The following changes since commit 333027284f9a591747ec469ede2b13b3fb8df65a: Merge branch 'nxp-imx-8-13' of https://github.com/MrVan/u-boot (2019-08-18 12:10:11 +0200) are available in the Git repository at: https://github.com/OSSystems/u-boot pico-imx7d-2019.10-1 for you to fetch changes up to 697cc0eaa7104950a52425786c2c830879b044d4: logos: Add the TechNexion's logo (2019-09-12 16:35:59 -0300) Fabio Berton (1): pico-imx7d: Sync pico-hobbit-imx7d_defconfig Fabio Estevam (3): pico-imx7d: Add instructions for booting in Falcon mode pico-imx7d: Provide a way to escape the Falcon mode logos: Add the TechNexion's logo Otavio Salvador (2): pico-imx7d: Add DWARF baseboard support pico-imx7d: Add NYMPH baseboard support board/technexion/pico-imx7d/README | 91 board/technexion/pico-imx7d/spl.c | 4 ++ configs/pico-dwarf-imx7d_defconfig | 68 +++ configs/pico-hobbit-imx7d_defconfig | 2 +- configs/pico-nymph-imx7d_defconfig | 68 +++ include/configs/pico-imx7d.h | 6 ++- tools/logos/technexion.bmp | Bin 0 -> 22390 bytes 7 files changed, 237 insertions(+), 2 deletions(-) create mode 100644 configs/pico-dwarf-imx7d_defconfig create mode 100644 configs/pico-nymph-imx7d_defconfig create mode 100644 tools/logos/technexion.bmp -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 ___ U-Boot mailing list U-Boot@lists.denx.de <mailto:U-Boot@lists.denx.de> https://lists.denx.de/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 2/3] ARM: dts: pico-imx7d: sync device tree with v5.3-rc6
Synchronize device tree with v5.3-rc6 label Signed-off-by: Joris Offouga --- arch/arm/dts/imx7d-pico.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi index 33b308ac24..57391fc052 100644 --- a/arch/arm/dts/imx7d-pico.dtsi +++ b/arch/arm/dts/imx7d-pico.dtsi @@ -93,7 +93,7 @@ < IMX7D_ENET1_TIME_ROOT_CLK>; assigned-clock-parents = < IMX7D_PLL_ENET_MAIN_100M_CLK>; assigned-clock-rates = <0>, <1>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <>; fsl,magic-packet; phy-reset-gpios = < 11 GPIO_ACTIVE_LOW>; -- 2.17.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 3/3] configs: pico-imx7d: Convert to DM_VIDEO
This commit convert all pico-imx7d to DM_VIDEO
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7d-pico-u-boot.dtsi | 113 +++
board/technexion/pico-imx7d/pico-imx7d.c | 48 --
configs/pico-hobbit-imx7d_defconfig | 2 +-
configs/pico-imx7d_bl33_defconfig| 2 +-
configs/pico-imx7d_defconfig | 2 +-
configs/pico-pi-imx7d_defconfig | 2 +-
include/configs/pico-imx7d.h | 2 +-
7 files changed, 135 insertions(+), 36 deletions(-)
diff --git a/arch/arm/dts/imx7d-pico-u-boot.dtsi
b/arch/arm/dts/imx7d-pico-u-boot.dtsi
index 1bd7f4f102..ef19de2b30 100644
--- a/arch/arm/dts/imx7d-pico-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-pico-u-boot.dtsi
@@ -2,10 +2,123 @@
aliases {
mmc0 =
usb0 =
+display0 =
};
+
+ backlight: backlight {
+ compatible = "pwm-backlight";
+ pinctrl-names = "default";
+ pinctrl-0 = <_backlight>;
+ pwms = < 0 5 0>;
+ brightness-levels = <0 36 72 108 144 180 216 255>;
+ default-brightness-level = <6>;
+ status = "okay";
+ };
+
+ reg_lcd_3v3: regulator-lcd-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "lcd-3v3";
+ regulator-min-microvolt = <330>;
+ regulator-max-microvolt = <330>;
+ gpio = < 6 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ panel {
+ compatible = "vxt,vl050-8048nt-c01";
+ backlight = <>;
+ power-supply = <_lcd_3v3>;
+
+ port {
+ panel_in: endpoint {
+ remote-endpoint = <_out>;
+ };
+ };
+ };
};
{
dr_mode = "peripheral";
};
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_lcdif>;
+ status = "okay";
+ display = <>;
+ u-boot,dm-pre-reloc;
+
+ port {
+ display_out: endpoint {
+ remote-endpoint = <_in>;
+ };
+ };
+
+ display0: display {
+ bits-per-pixel = <16>;
+ bus-width = <24>;
+
+ display-timings {
+ native-mode = <>;
+ timing0: timing0 {
+ clock-frequency = <3326>;
+ hactive = <800>;
+ vactive = <480>;
+ hback-porch = <11>;
+ hfront-porch = <11>;
+ vback-porch = <12>;
+ vfront-porch = <11>;
+ hsync-len = <46>;
+ vsync-len = <210>;
+ hsync-active = <0>;
+ vsync-active = <0>;
+ de-active = <1>;
+ pixelclk-active = <1>;
+ interlaced = <0>;
+ };
+ };
+ };
+};
+
+ {
+ pinctrl_backlight: backlight {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO11__PWM4_OUT 0x0
+ >;
+ };
+
+ pinctrl_lcdif: lcdifgrp {
+ 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 0
[U-Boot] [PATCH V2 1/3] ARM: dts: pico-imx7d: Add u-boot.dtsi for uboot specific dts change
This commit introduce u-boot.dtsi
Signed-off-by: Joris Offouga
Suggested-by: Peng Fan
---
arch/arm/dts/imx7d-pico-u-boot.dtsi | 11 +++
arch/arm/dts/imx7d-pico.dtsi| 8 +---
2 files changed, 12 insertions(+), 7 deletions(-)
create mode 100644 arch/arm/dts/imx7d-pico-u-boot.dtsi
diff --git a/arch/arm/dts/imx7d-pico-u-boot.dtsi
b/arch/arm/dts/imx7d-pico-u-boot.dtsi
new file mode 100644
index 00..1bd7f4f102
--- /dev/null
+++ b/arch/arm/dts/imx7d-pico-u-boot.dtsi
@@ -0,0 +1,11 @@
+/{
+aliases {
+mmc0 =
+usb0 =
+};
+};
+
+ {
+ dr_mode = "peripheral";
+ };
+
diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi
index 7cd8be24c8..33b308ac24 100644
--- a/arch/arm/dts/imx7d-pico.dtsi
+++ b/arch/arm/dts/imx7d-pico.dtsi
@@ -5,14 +5,9 @@
/dts-v1/;
#include "imx7d.dtsi"
-
+#include "imx7d-pico-u-boot.dtsi"
/ {
- aliases {
- mmc0 =
- usb0 =
- };
-
/* Will be filled by the bootloader */
memory@8000 {
device_type = "memory";
@@ -297,7 +292,6 @@
{
vbus-supply = <_usb_otg1_vbus>;
- dr_mode = "peripheral";
status = "okay";
};
--
2.17.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] pico-imx7d: Convert to DM_VIDEO
HI Peng,
I send v2 with your suggest
Best Regards,
Joris Offouga
Le 29/08/2019 à 11:35, Peng Fan a écrit :
Subject: [PATCH] pico-imx7d: Convert to DM_VIDEO
Please write something here.
And use x-u-boot.dtsi for uboot specific dts change.
Regards,
Peng.
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7d-pico.dtsi | 113
++-
board/technexion/pico-imx7d/pico-imx7d.c | 48 --
configs/pico-hobbit-imx7d_defconfig | 2 +-
configs/pico-imx7d_bl33_defconfig| 2 +-
configs/pico-imx7d_defconfig | 2 +-
configs/pico-pi-imx7d_defconfig | 2 +-
include/configs/pico-imx7d.h | 2 +-
7 files changed, 134 insertions(+), 37 deletions(-)
diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi
index 7cd8be24c8..ac72baf347 100644
--- a/arch/arm/dts/imx7d-pico.dtsi
+++ b/arch/arm/dts/imx7d-pico.dtsi
@@ -11,6 +11,7 @@
aliases {
mmc0 =
usb0 =
+ display0 =
};
/* Will be filled by the bootloader */ @@ -75,6 +76,37 @@
clocks = < IMX7D_CLKO2_ROOT_DIV>;
clock-names = "ext_clock";
};
+
+ backlight: backlight {
+ compatible = "pwm-backlight";
+ pinctrl-names = "default";
+ pinctrl-0 = <_backlight>;
+ pwms = < 0 5 0>;
+ brightness-levels = <0 36 72 108 144 180 216 255>;
+ default-brightness-level = <6>;
+ status = "okay";
+ };
+
+ reg_lcd_3v3: regulator-lcd-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "lcd-3v3";
+ regulator-min-microvolt = <330>;
+ regulator-max-microvolt = <330>;
+ gpio = < 6 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ panel {
+ compatible = "vxt,vl050-8048nt-c01";
+ backlight = <>;
+ power-supply = <_lcd_3v3>;
+
+ port {
+ panel_in: endpoint {
+ remote-endpoint = <_out>;
+ };
+ };
+ };
};
{
@@ -98,7 +130,7 @@
< IMX7D_ENET1_TIME_ROOT_CLK>;
assigned-clock-parents = < IMX7D_PLL_ENET_MAIN_100M_CLK>;
assigned-clock-rates = <0>, <1>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-id";
phy-handle = <>;
fsl,magic-packet;
phy-reset-gpios = < 11 GPIO_ACTIVE_LOW>; @@ -236,6 +268,45
@@
};
};
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_lcdif>;
+ status = "okay";
+ display = <>;
+ u-boot,dm-pre-reloc;
+
+ port {
+ display_out: endpoint {
+ remote-endpoint = <_in>;
+ };
+ };
+
+ display0: display {
+ bits-per-pixel = <16>;
+ bus-width = <24>;
+
+ display-timings {
+ native-mode = <>;
+ timing0: timing0 {
+ clock-frequency = <3326>;
+ hactive = <800>;
+ vactive = <480>;
+ hback-porch = <11>;
+ hfront-porch = <11>;
+ vback-porch = <12>;
+ vfront-porch = <11>;
+ hsync-len = <46>;
+ vsync-len = <210>;
+ hsync-active = <0>;
+ vsync-active = <0>;
+ de-active = <1>;
+ pixelclk-active = <1>;
+ interlaced = <0>;
+ };
+ };
+ };
+};
+
{
pinctrl-names = "default";
pinctrl-0 = <_sai1>;
@@ -356,6 +427,12 @@
};
{
+ pinctrl_backlight: backlight {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO11__PWM4_OUT 0x0
+ >;
+ };
+
pinctrl_ecspi3: ecspi3grp {
fsl,pins = <
MX7D_PAD_I2C1_SCL__ECSPI3_MISO 0x2
@@ -420,6 +497,40 @@
>;
};
+ pinctrl_lcdif: lcdifgrp {
+ fsl,pins = <
+ MX7D_PAD_LCD_DATA00__LCD_DATA0 0x79
+ MX7D_PAD_LCD_DATA01__LCD_DATA1 0x79
+ MX7D_PAD_LCD
[U-Boot] [PATCH] pico-imx7d: Convert to DM_VIDEO
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7d-pico.dtsi | 113 ++-
board/technexion/pico-imx7d/pico-imx7d.c | 48 --
configs/pico-hobbit-imx7d_defconfig | 2 +-
configs/pico-imx7d_bl33_defconfig| 2 +-
configs/pico-imx7d_defconfig | 2 +-
configs/pico-pi-imx7d_defconfig | 2 +-
include/configs/pico-imx7d.h | 2 +-
7 files changed, 134 insertions(+), 37 deletions(-)
diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi
index 7cd8be24c8..ac72baf347 100644
--- a/arch/arm/dts/imx7d-pico.dtsi
+++ b/arch/arm/dts/imx7d-pico.dtsi
@@ -11,6 +11,7 @@
aliases {
mmc0 =
usb0 =
+ display0 =
};
/* Will be filled by the bootloader */
@@ -75,6 +76,37 @@
clocks = < IMX7D_CLKO2_ROOT_DIV>;
clock-names = "ext_clock";
};
+
+ backlight: backlight {
+ compatible = "pwm-backlight";
+ pinctrl-names = "default";
+ pinctrl-0 = <_backlight>;
+ pwms = < 0 5 0>;
+ brightness-levels = <0 36 72 108 144 180 216 255>;
+ default-brightness-level = <6>;
+ status = "okay";
+ };
+
+ reg_lcd_3v3: regulator-lcd-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "lcd-3v3";
+ regulator-min-microvolt = <330>;
+ regulator-max-microvolt = <330>;
+ gpio = < 6 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
+ panel {
+ compatible = "vxt,vl050-8048nt-c01";
+ backlight = <>;
+ power-supply = <_lcd_3v3>;
+
+ port {
+ panel_in: endpoint {
+ remote-endpoint = <_out>;
+ };
+ };
+ };
};
{
@@ -98,7 +130,7 @@
< IMX7D_ENET1_TIME_ROOT_CLK>;
assigned-clock-parents = < IMX7D_PLL_ENET_MAIN_100M_CLK>;
assigned-clock-rates = <0>, <1>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-id";
phy-handle = <>;
fsl,magic-packet;
phy-reset-gpios = < 11 GPIO_ACTIVE_LOW>;
@@ -236,6 +268,45 @@
};
};
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_lcdif>;
+ status = "okay";
+ display = <>;
+ u-boot,dm-pre-reloc;
+
+ port {
+ display_out: endpoint {
+ remote-endpoint = <_in>;
+ };
+ };
+
+ display0: display {
+ bits-per-pixel = <16>;
+ bus-width = <24>;
+
+ display-timings {
+ native-mode = <>;
+ timing0: timing0 {
+ clock-frequency = <3326>;
+ hactive = <800>;
+ vactive = <480>;
+ hback-porch = <11>;
+ hfront-porch = <11>;
+ vback-porch = <12>;
+ vfront-porch = <11>;
+ hsync-len = <46>;
+ vsync-len = <210>;
+ hsync-active = <0>;
+ vsync-active = <0>;
+ de-active = <1>;
+ pixelclk-active = <1>;
+ interlaced = <0>;
+ };
+ };
+ };
+};
+
{
pinctrl-names = "default";
pinctrl-0 = <_sai1>;
@@ -356,6 +427,12 @@
};
{
+ pinctrl_backlight: backlight {
+ fsl,pins = <
+ MX7D_PAD_GPIO1_IO11__PWM4_OUT 0x0
+ >;
+ };
+
pinctrl_ecspi3: ecspi3grp {
fsl,pins = <
MX7D_PAD_I2C1_SCL__ECSPI3_MISO 0x2
@@ -420,6 +497,40 @@
>;
};
+ pinctrl_lcdif: lcdifgrp {
+ 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_
Re: [U-Boot] [PATCH 3/4] env: add missing header file
Hi Pierre-Jean
It's work on my side.
Tested-by Joris Offouga
Best Regards,
Joris Offouga
Le ven. 23 août 2019 à 23:05, Pierre-Jean Texier a
écrit :
> Since commit af95f20 ("env: Create a new file for environment functions"),
> a new header file exists.
>
> So, this commit add a missing header file.
>
> Fixes:
>
> include/env.h:158:1: error: unknown type name ‘ulong’; did you mean ‘long’?
> ulong env_get_ulong(const char *name, int base, ulong default_val);
> ^
> long
> include/env.h:158:49: error: unknown type name ‘ulong’; did you mean
> ‘long’?
> ulong env_get_ulong(const char *name, int base, ulong default_val);
>
> Signed-off-by: Pierre-Jean Texier
> ---
> include/env.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/env.h b/include/env.h
> index a74a261..b72239f 100644
> --- a/include/env.h
> +++ b/include/env.h
> @@ -9,6 +9,7 @@
> #ifndef __ENV_H
> #define __ENV_H
>
> +#include
> #include
> #include
>
> --
> 2.7.4
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] fw_env: remove duplicated definitions
Hi Pierre-Jean
It's work on my side.
Tested-by Joris Offouga
Best Regards,
Joris Offouga
Le ven. 23 août 2019 à 23:04, Pierre-Jean Texier a
écrit :
> Since commit d3716dd ("env: Rename the redundancy flags"), the
> definitions of ENV_REDUND_OBSOLETE & ENV_REDUND_ACTIVE was moved
> to env.h.
>
> Fixes:
>
> tools/env/fw_env.c:122:22: error: ‘ENV_REDUND_ACTIVE’ redeclared as
> different kind of symbol
> static unsigned char ENV_REDUND_ACTIVE = 1;
> ^
> In file included from tools/env/fw_env.c:13:
> include/env.h:63:2: note: previous definition of ‘ENV_REDUND_ACTIVE’ was
> here
> ENV_REDUND_ACTIVE = 1,
> ^
> tools/env/fw_env.c:127:22: error: ‘ENV_REDUND_OBSOLETE’ redeclared as
> different kind of symbol
> static unsigned char ENV_REDUND_OBSOLETE;
> ^~~
> In file included from tools/env/fw_env.c:13:
> include/env.h:62:2: note: previous definition of ‘ENV_REDUND_OBSOLETE’ was
> here
> ENV_REDUND_OBSOLETE = 0,
>
> Signed-off-by: Pierre-Jean Texier
> ---
> tools/env/fw_env.c | 7 ---
> 1 file changed, 7 deletions(-)
>
> diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
> index 95c9984..876bf2b 100644
> --- a/tools/env/fw_env.c
> +++ b/tools/env/fw_env.c
> @@ -119,13 +119,6 @@ static struct environment environment = {
>
> static int have_redund_env;
>
> -static unsigned char ENV_REDUND_ACTIVE = 1;
> -/*
> - * ENV_REDUND_OBSOLETE must be 0 to efficiently set it on NOR flash
> without
> - * erasing
> - */
> -static unsigned char ENV_REDUND_OBSOLETE;
> -
> #define DEFAULT_ENV_INSTANCE_STATIC
> #include
>
> --
> 2.7.4
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/4] fw_env: fix build error
Hi Pierre-Jean
It's work on my side.
Tested-by Joris Offouga
Best Regards,
Joris Offouga
Le ven. 23 août 2019 à 23:04, Pierre-Jean Texier a
écrit :
> The following error appears:
>
> tools/env/fw_env.c:1149:25: error: lvalue required as unary ‘&’ operand
> rc = write(fd, _REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE));
>
> Fixes: d3716dd ("env: Rename the redundancy flags")
>
> Signed-off-by: Pierre-Jean Texier
> ---
> tools/env/fw_env.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
> index 876bf2b..b8b936f 100644
> --- a/tools/env/fw_env.c
> +++ b/tools/env/fw_env.c
> @@ -1146,7 +1146,7 @@ static int flash_flag_obsolete(int dev, int fd,
> off_t offset)
> return rc;
> }
> ioctl(fd, MEMUNLOCK, );
> - rc = write(fd, _REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE));
> + rc = write(fd, ENV_REDUND_OBSOLETE, sizeof(ENV_REDUND_OBSOLETE));
> ioctl(fd, MEMLOCK, );
> if (rc < 0)
> perror("Could not set obsolete flag");
> --
> 2.7.4
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] pico-imx7d: Support distro boot for FIT image case
Hi Jun,
Le mar. 16 juil. 2019 à 09:48, Jun Nie a écrit :
> Support distro boot for pico imx7d in FIT image case.
>
> Signed-off-by: Jun Nie
> ---
> include/configs/pico-imx7d.h | 37 +++--
> 1 file changed, 11 insertions(+), 26 deletions(-)
>
> diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
> index 9101540..7b2bd00 100644
> --- a/include/configs/pico-imx7d.h
> +++ b/include/configs/pico-imx7d.h
> @@ -55,17 +55,17 @@
> /* When booting with FIT specify the node entry containing boot.scr */
> #if defined(CONFIG_FIT)
> #define PICO_BOOT_ENV \
> - "bootscr_fitimage_name=bootscr\0" \
> - "bootscriptaddr=0x8320\0" \
> - "fdtovaddr=0x8310\0" \
> - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> - "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
> - "mmcargs=setenv bootargs console=${console},${baudrate} " \
> - "rootwait rw;\0" \
> - "loadbootscript=" \
> - "load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr}
> ${script};\0" \
> - "bootscript=echo Running bootscript from mmc ...; " \
> - "source ${bootscriptaddr}:${bootscr_fitimage_name}\0"
> + BOOTENV \
> + "fdtovaddr=0x8310\0"\
> + "scriptaddr=0x8320\0" \
> + "mmcargs=setenv bootargs console=${console},${baudrate} " \
> + "rootwait rw\0" \
> + "boot_a_script="\
> + "load ${devtype} ${devnum}:${distro_bootpart} " \
> + "${scriptaddr} ${prefix}${script}; "\
> + "iminfo ${scriptaddr};" \
> + "if test $? -eq 1; then hab_failsafe; fi;" \
> + "source ${scriptaddr}:bootscr\0"
> #else
> #define PICO_BOOT_ENV \
> "bootmenu_0=Boot using PICO-Hobbit baseboard=" \
> @@ -107,21 +107,6 @@
> "setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \
> PICO_BOOT_ENV
>
> -#if defined(CONFIG_FIT)
> -#define CONFIG_BOOTCOMMAND \
> - "mmc dev ${mmcdev};" \
> - "mmc dev ${mmcdev}; if mmc rescan; then " \
> - "if run loadbootscript; then " \
> - "iminfo ${bootscriptaddr};" \
> - "if test $? -eq 1; then hab_failsafe; fi;" \
> - "run bootscript; " \
> - "else " \
> - "echo Fail to load fitImage with boot script;" \
> - "hab_failsafe;" \
> - "fi; " \
> - "fi"
> -#endif
> -
> #define BOOT_TARGET_DEVICES(func) \
> func(MMC, mmc, 0) \
> func(USB, usb, 0) \
> --
> 2.7.4
>
> It's work from my side
for my setup i disable iminfo and hab_failsafe
See log:
run bootcmd
switch to partitions #0, OK
mmc0(part 0) is current device
Scanning mmc 0:1...
Found U-Boot script /boot.scr
245 bytes read in 8 ms (29.3 KiB/s)
Unknown command 'iminfo' - try 'help'
Unknown command 'hab_failsafe' - try 'help'
## Executing script at 8320
8961308 bytes read in 217 ms (39.4 MiB/s)
## Loading kernel from FIT Image at 8600 ...
Using 'c...@imx7d-pico-pi.dtb' configuration
Trying 'kernel@1' kernel subimage
Description: Linux kernel
Type: Kernel Image
Compression: uncompressed
Data Start: 0x86000114
Data Size:8925040 Bytes = 8.5 MiB
Architecture: ARM
OS: Linux
Load Address: 0x80008000
Entry Point: 0x80008000
Hash algo:sha1
Hash value: 7d8af1016b4cf8ea90fa1a767bfbeda052043f6c
Verifying Hash Integrity ... sha1+ OK
## Loading fdt from FIT Image at 8600 ...
Using 'c...@imx7d-pico-pi.dtb' configuration
Trying 'f...@imx7d-pico-pi.dtb' fdt subimage
Description: Flattened Device Tree blob
Type: Flat Device Tree
Compression: uncompressed
Data Start: 0x86883188
Data Size:34325 Bytes = 33.5 KiB
Architecture: ARM
Hash algo:sha1
Hash value: 75c81556e9bb9681cd14c96c4627da04205b2583
Verifying Hash Integrity ... sha1+ OK
Booting using the fdt blob at 0x86883188
Loading Kernel Image ... OK
Using Device Tree in place at 86883188, end 8688e79c
Starting kernel ...
Tested-by: Joris Offouga
Best Regards,
Joris Offouga
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 1/1] pico-imx7d: Enable DM_USB
This patch enable usb support with device-tree
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7d-pico.dtsi | 2 ++
board/technexion/pico-imx7d/pico-imx7d.c | 13 -
configs/pico-hobbit-imx7d_defconfig | 1 +
configs/pico-imx7d_bl33_defconfig| 1 +
configs/pico-imx7d_defconfig | 1 +
configs/pico-pi-imx7d_defconfig | 1 +
6 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi
index 9f1fe683db..7cd8be24c8 100644
--- a/arch/arm/dts/imx7d-pico.dtsi
+++ b/arch/arm/dts/imx7d-pico.dtsi
@@ -10,6 +10,7 @@
/ {
aliases {
mmc0 =
+ usb0 =
};
/* Will be filled by the bootloader */
@@ -296,6 +297,7 @@
{
vbus-supply = <_usb_otg1_vbus>;
+ dr_mode = "peripheral";
status = "okay";
};
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index e3d75e549a..216475c8de 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -16,7 +16,6 @@
#include
#include
#include
-#include
#include
#include
#include "../../freescale/common/pfuze.h"
@@ -328,15 +327,3 @@ int board_ehci_hcd_init(int port)
return 0;
}
-int board_usb_phy_mode(int port)
-{
- switch (port) {
- case 0:
- return USB_INIT_DEVICE;
- case 1:
- return USB_INIT_HOST;
- default:
- return -EINVAL;
- }
- return 0;
-}
diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
index 9545d6bbd6..16859d7592 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -51,6 +51,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_DM_USB=y
CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
diff --git a/configs/pico-imx7d_bl33_defconfig
b/configs/pico-imx7d_bl33_defconfig
index 932ed4c489..0d28fd9600 100644
--- a/configs/pico-imx7d_bl33_defconfig
+++ b/configs/pico-imx7d_bl33_defconfig
@@ -43,6 +43,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DFU_MMC=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_DM_USB=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
CONFIG_MII=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index 92ab9c5a50..05c3704d92 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -51,6 +51,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_DM_USB=y
CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index 042affe01b..ffb02a7677 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -51,6 +51,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
+CONFIG_DM_USB=y
CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_FSL_ESDHC=y
CONFIG_PHYLIB=y
--
2.17.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] imx: Use a convenient default value for SYS_MALLOC_F_LEN
Hi Fabio,
Tested-by Joris Offouga
BR,
Joris
Le ven. 3 mai 2019 à 19:20, Pierre-Jean Texier a
écrit :
> Hi Fabio,
>
> Le 03/05/2019 à 19:05, Fabio Estevam a écrit :
> > Commit 3a7c45f6a772 ("simple-bus: add DM_FLAG_PRE_RELOC flag to
> > simple-bus driver") causes some i.MX boards that were converted
> > to DM, such as warp7, to fail to boot.
> >
> > As explained by Lukas Auer:
> >
> > "With the patch, U-Boot probes the drivers for devices under simple-bus
> > device tree nodes in the pre-relocation device model. The default value
> > of CONFIG_SYS_MALLOC_F_LEN (0x400) leaves U-Boot with not enough memory
> to
> > do this, causing it to hang."
> >
> > Fix this problem by providing a convenient default value for
> > CONFIG_SYS_MALLOC_F_LEN.
> >
> > Reported-by: Pierre-Jean Texier
> > Suggested-by: Lukas Auer
> > Signed-off-by: Fabio Estevam
> > ---
> > Changes since v1:
> > - Move the default setting to the main Kconfig and make it depend
> > on i.MX
> >
> > Kconfig | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/Kconfig b/Kconfig
> > index 7a5491bd67..fd4ff42c17 100644
> > --- a/Kconfig
> > +++ b/Kconfig
> > @@ -138,6 +138,8 @@ config SYS_MALLOC_F_LEN
> > depends on SYS_MALLOC_F
> > default 0x1000 if AM33XX
> > default 0x2800 if SANDBOX
> > + default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
> > +ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5)
> > default 0x400
> > help
> > Before relocation, memory is very limited on many platforms.
> Still,
>
>
> Tested-by: Pierre-Jean Texier
>
>
> Thanks
>
> Pierre-Jean
>
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] imx: Use a convenient default value for SYS_MALLOC_F_LEN
Hi Fabio
Tested-by Joris Offouga
BR
Joris
Le ven. 3 mai 2019 à 19:05, Fabio Estevam a écrit :
> Commit 3a7c45f6a772 ("simple-bus: add DM_FLAG_PRE_RELOC flag to
> simple-bus driver") causes some i.MX boards that were converted
> to DM, such as warp7, to fail to boot.
>
> As explained by Lukas Auer:
>
> "With the patch, U-Boot probes the drivers for devices under simple-bus
> device tree nodes in the pre-relocation device model. The default value
> of CONFIG_SYS_MALLOC_F_LEN (0x400) leaves U-Boot with not enough memory to
> do this, causing it to hang."
>
> Fix this problem by providing a convenient default value for
> CONFIG_SYS_MALLOC_F_LEN.
>
> Reported-by: Pierre-Jean Texier
> Suggested-by: Lukas Auer
> Signed-off-by: Fabio Estevam
> ---
> Changes since v1:
> - Move the default setting to the main Kconfig and make it depend
> on i.MX
>
> Kconfig | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Kconfig b/Kconfig
> index 7a5491bd67..fd4ff42c17 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -138,6 +138,8 @@ config SYS_MALLOC_F_LEN
> depends on SYS_MALLOC_F
> default 0x1000 if AM33XX
> default 0x2800 if SANDBOX
> + default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
> + ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5)
> default 0x400
> help
> Before relocation, memory is very limited on many platforms.
> Still,
> --
> 2.17.1
>
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] imx: Use a convenient default value for SYS_MALLOC_F_LEN
Tested-by: Joris Offouga
Le 03/05/2019 à 14:25, Fabio Estevam a écrit :
Commit 3a7c45f6a772 ("simple-bus: add DM_FLAG_PRE_RELOC flag to
simple-bus driver") causes some i.MX boards that were converted
to DM, such as warp7, to fail to boot.
As explained by Lukas Auer:
"With the patch, U-Boot probes the drivers for devices under simple-bus
device tree nodes in the pre-relocation device model. The default value
of CONFIG_SYS_MALLOC_F_LEN (0x400) leaves U-Boot with not enough memory to
do this, causing it to hang."
Fix this problem by providing a convenient default value for
CONFIG_SYS_MALLOC_F_LEN.
Reported-by: Pierre-Jean Texier
Suggested-by: Lukas Auer
Signed-off-by: Fabio Estevam
---
arch/arm/mach-imx/Kconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index ec09ef240f..a7a7d84b7a 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -90,3 +90,6 @@ config DDRMC_VF610_CALIBRATION
NXP does NOT recommend to perform this calibration at each boot. One
shall perform it on a new PCB and then use those values to program
the ddrmc_cr_setting on relevant board file.
+
+config SYS_MALLOC_F_LEN
+ default 0x2000
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] pico-imx7d: README: Adjust the binary name after DM conversion
Le 26/04/2019 à 14:36, Fabio Estevam a écrit : After the conversion to DM the U-Boot binary is called u-boot-dtb.imx, so fix the README file accordingly. Signed-off-by: Fabio Estevam --- board/technexion/pico-imx7d/README | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/board/technexion/pico-imx7d/README b/board/technexion/pico-imx7d/README index f21d8301cb..6aa0d25af5 100644 --- a/board/technexion/pico-imx7d/README +++ b/board/technexion/pico-imx7d/README @@ -11,7 +11,7 @@ $ make mrproper $ make pico-imx7d_defconfig $ make -This generates the SPL and u-boot.img binaries. +This generates the SPL and u-boot-dtb.img binaries. 1. Loading U-Boot via USB Serial Download Protocol @@ -32,15 +32,15 @@ to use an externally powered USB hub between the board and the host computer. Open a terminal program such as minicom. -Copy SPL and u-boot.img to the imx_usb_loader folder. +Copy SPL and u-boot-dtb.img to the imx_usb_loader folder. Load the SPL binary via USB: $ sudo ./imx_usb SPL -Load the u-boot.img binary via USB: +Load the u-boot-dtb.img binary via USB: -$ sudo ./imx_usb u-boot.img +$ sudo ./imx_usb u-boot-dtb.img Then U-Boot starts and its messages appear in the console program. @@ -55,11 +55,11 @@ Run the DFU agent so we can flash the new images using dfu-util tool: => dfu 0 mmc 0 -Flash SPL and u-boot.img into the eMMC running the following commands on a PC: +Flash SPL and u-boot-dtb.img into the eMMC running the following commands on a PC: $ sudo dfu-util -D SPL -a spl -$ sudo dfu-util -D u-boot.img -a u-boot +$ sudo dfu-util -D u-boot-dtb.img -a u-boot Remove power from the pico board. Acked-by: Joris Offouga ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks
Le 25/04/2019 à 12:28, Stefano Babic a écrit : On 25/04/19 11:57, Joris Offouga wrote: Le 25/04/2019 à 11:26, Stefano Babic a écrit : On 25/04/19 11:18, Joris OFFOUGA wrote: Le jeu. 25 avr. 2019 à 11:12, Stefano Babic mailto:sba...@denx.de>> a écrit : On 25/04/19 11:00, Stefano Babic wrote: > On 04/04/19 14:00, Joris Offouga wrote: >> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards >> >> Signed-off-by: Joris Offouga mailto:offougajo...@gmail.com>> >> --- >> configs/pico-hobbit-imx7d_defconfig | 3 ++- >> configs/pico-imx7d_defconfig | 3 ++- >> configs/pico-pi-imx7d_defconfig | 3 ++- >> 3 files changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig >> index f58d517..75eab28 100644 >> --- a/configs/pico-hobbit-imx7d_defconfig >> +++ b/configs/pico-hobbit-imx7d_defconfig >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1 >> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" >> CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" >> CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" >> +CONFIG_OF_CONTROL=y >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit" > ^--- two much "o" > > I fix this myself by merging. > > However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I missing something ? No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE Best regards, I suppose this, but then something in the build is broken, If I run buildman, a pico-imx7d board is searched. In fact, there is a configs/pico-imx7d_defconfig. If this is just SOM, this file has no reason to exist. For pico_imx7d_defconfig, i set CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi.dtb" This is not what I see in your patch http://patchwork.ozlabs.org/patch/1077223/: +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico" I fix myself in the defconfig. Sorry for the mistake and thanks. You have to ask Fabio and Otavio I did not grow on it when I did the dm conversion, they asked me to convert everything even som Just SOM it is quite weird if there is not an evaluation board to support it. Anyway, I fix the name, thanks. Thanks Stefano Best regards, Stefano Babic Best regards, Joris Offouga ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks
Le 25/04/2019 à 11:26, Stefano Babic a écrit :
On 25/04/19 11:18, Joris OFFOUGA wrote:
Le jeu. 25 avr. 2019 à 11:12, Stefano Babic mailto:sba...@denx.de>> a écrit :
On 25/04/19 11:00, Stefano Babic wrote:
> On 04/04/19 14:00, Joris Offouga wrote:
>> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
>>
>> Signed-off-by: Joris Offouga mailto:offougajo...@gmail.com>>
>> ---
>> configs/pico-hobbit-imx7d_defconfig | 3 ++-
>> configs/pico-imx7d_defconfig | 3 ++-
>> configs/pico-pi-imx7d_defconfig | 3 ++-
>> 3 files changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
>> index f58d517..75eab28 100644
>> --- a/configs/pico-hobbit-imx7d_defconfig
>> +++ b/configs/pico-hobbit-imx7d_defconfig
>> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>> CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
>> CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>> +CONFIG_OF_CONTROL=y
>> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
> ^--- two much "o"
>
> I fix this myself by merging.
>
>
However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there
is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
missing something ?
No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
Best regards,
I suppose this, but then something in the build is broken, If I run
buildman, a pico-imx7d board is searched. In fact, there is a
configs/pico-imx7d_defconfig. If this is just SOM, this file has no
reason to exist.
For pico_imx7d_defconfig, i set
CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi.dtb"
You have to ask Fabio and Otavio I did not grow on it when I did the dm
conversion, they asked me to convert everything even som
Best Regards,
Joris Offouga
Best regards,
Stefano Babic
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks
Le jeu. 25 avr. 2019 à 11:12, Stefano Babic a écrit : > On 25/04/19 11:00, Stefano Babic wrote: > > On 04/04/19 14:00, Joris Offouga wrote: > >> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards > >> > >> Signed-off-by: Joris Offouga > >> --- > >> configs/pico-hobbit-imx7d_defconfig | 3 ++- > >> configs/pico-imx7d_defconfig| 3 ++- > >> configs/pico-pi-imx7d_defconfig | 3 ++- > >> 3 files changed, 6 insertions(+), 3 deletions(-) > >> > >> diff --git a/configs/pico-hobbit-imx7d_defconfig > b/configs/pico-hobbit-imx7d_defconfig > >> index f58d517..75eab28 100644 > >> --- a/configs/pico-hobbit-imx7d_defconfig > >> +++ b/configs/pico-hobbit-imx7d_defconfig > >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1 > >> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" > >> CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" > >> CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" > >> +CONFIG_OF_CONTROL=y > >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit" > > ^--- two much "o" > > > > I fix this myself by merging. > > > > > > However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there > is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I > missing something ? > No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE Best regards, Joris Offouga > > 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: sba...@denx.de > = > ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks
Le jeu. 25 avr. 2019 à 11:00, Stefano Babic a écrit : > On 04/04/19 14:00, Joris Offouga wrote: > > This patch adds DT file hooks for Pico i.MX7D SOM and variant boards > > > > Signed-off-by: Joris Offouga > > --- > > configs/pico-hobbit-imx7d_defconfig | 3 ++- > > configs/pico-imx7d_defconfig| 3 ++- > > configs/pico-pi-imx7d_defconfig | 3 ++- > > 3 files changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/configs/pico-hobbit-imx7d_defconfig > b/configs/pico-hobbit-imx7d_defconfig > > index f58d517..75eab28 100644 > > --- a/configs/pico-hobbit-imx7d_defconfig > > +++ b/configs/pico-hobbit-imx7d_defconfig > > @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1 > > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" > > CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" > > CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" > > +CONFIG_OF_CONTROL=y > > +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit" > ^--- two much "o" > > I fix this myself by merging. > 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: sba...@denx.de > = > ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] warp7: defconfig: Switch to DM for USB and SERIAL
Hi Fabio,
Le 13/04/2019 à 18:31, Fabio Estevam a écrit :
Hi Pierre-Jean,
On Sat, Apr 13, 2019 at 11:38 AM Pierre-Jean Texier
wrote:
-int board_usb_phy_mode(int port)
-{
- return USB_INIT_DEVICE;
-}
-
It seems that #include can also be removed now.
I still see uart related code in the warp7.c board file.
Can they also be removed?
If we remove uart related code in warp7.c, the log of the u-boot appears
late here is a log
PMIC: PFUZE3000 DEV_ID=0x30 REV_ID=0x11
MMC: FSL_SDHC: 1, FSL_SDHC: 0
Loading Environment from MMC... OK
In: serial@3086
Out: serial@3086
Err: serial@3086
SEC0: RNG instantiated
Net: usb_ether
Hit any key to stop autoboot: 0
=>
Could #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR be removed from
include/configs/warp7.h?
Yes it can be deleted
Best Regards,
Joris
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] warp7: Fix dfu_alt_info setting after DM conversion
Acked-by: Joris Offouga Le 12/04/2019 à 22:36, Pierre-Jean Texier a écrit : After DM conversion, U-Boot is larger than 512 KiB, so we need to increase the "size" of the dfu_alt_info setting. Signed-off-by: Pierre-Jean Texier --- include/configs/warp7.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 043f286..4947597 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -39,7 +39,7 @@ #define CONFIG_SERIAL_TAG #define CONFIG_DFU_ENV_SETTINGS \ - "dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \ + "dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_DFU_ENV_SETTINGS \ ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM
Le ven. 5 avr. 2019 à 15:07, Fabio Estevam a écrit : > Hi Joris, > Hi Fabio, > On Thu, Apr 4, 2019 at 9:01 AM Joris Offouga > wrote: > > > > This series convert Pico i.MX7 and variant board to DM. > > The following options have been enabled: > > -CONFIG_DM_GPIO > > -CONFIG_DM_EMMC > > > > Signed-off-by: Joris Offouga > > --- > > > > Change in v2: > > - add missing dtb in Makefile > > Thanks for working on this series. > It was a pleasure I learned a lot > > My previous Tested-by tag still applies here as well :-) > > For the entire series: > > Tested-by: Fabio Estevam > Thanks Fabio, ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 1/5] Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM
This patch imports the Linux kernel base board imx7d-pico.dtsi,
pi board imx7d-pico-pi.dts and hobbit board imx7d-pico-hobbit.dts
from Linux v5.1-rc1.
Signed-off-by: Joris Offouga
---
arch/arm/dts/Makefile | 5 +-
arch/arm/dts/imx7d-pico-hobbit.dts | 105 +++
arch/arm/dts/imx7d-pico-pi.dts | 93 ++
arch/arm/dts/imx7d-pico.dtsi | 586 +
4 files changed, 788 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/imx7d-pico-hobbit.dts
create mode 100644 arch/arm/dts/imx7d-pico-pi.dts
create mode 100644 arch/arm/dts/imx7d-pico.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 0e2ffdb..e30c57b 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -544,7 +544,10 @@ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \
imx7d-sdb-qspi.dtb \
imx7-colibri-emmc.dtb \
imx7-colibri-rawnand.dtb \
- imx7s-warp.dtb
+ imx7s-warp.dtb \
+ imx7d-pico-pi.dtb \
+ imx7d-pico-hobbit.dtb
+
dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb
diff --git a/arch/arm/dts/imx7d-pico-hobbit.dts
b/arch/arm/dts/imx7d-pico-hobbit.dts
new file mode 100644
index 000..98604f0
--- /dev/null
+++ b/arch/arm/dts/imx7d-pico-hobbit.dts
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+//
+// Copyright 2017 NXP
+
+#include "imx7d-pico.dtsi"
+
+/ {
+ model = "TechNexion PICO-IMX7D Board using Hobbit baseboard";
+ compatible = "technexion,imx7d-pico-hobbit", "fsl,imx7d";
+
+ leds {
+ compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <_gpio_leds>;
+
+ led {
+ label = "gpio-led";
+ gpios = < 13 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "imx7-sgtl5000";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,bitclock-master = <_master>;
+ simple-audio-card,frame-master = <_master>;
+ simple-audio-card,cpu {
+ sound-dai = <>;
+ };
+
+ dailink_master: simple-audio-card,codec {
+ sound-dai = <>;
+ clocks = < IMX7D_AUDIO_MCLK_ROOT_CLK>;
+ };
+ };
+};
+
+ {
+ sgtl5000: codec@a {
+ #sound-dai-cells = <0>;
+ reg = <0x0a>;
+ compatible = "fsl,sgtl5000";
+ clocks = < IMX7D_AUDIO_MCLK_ROOT_CLK>;
+ VDDA-supply = <_2p5v>;
+ VDDIO-supply = <_vref_1v8>;
+ };
+};
+
+ {
+ status = "okay";
+
+ adc081c: adc@50 {
+ compatible = "ti,adc081c";
+ reg = <0x50>;
+ vref-supply = <_3p3v>;
+ };
+};
+
+ {
+ ads7846@0 {
+ reg = <0>;
+ compatible = "ti,ads7846";
+ interrupt-parent = <>;
+ interrupts = <7 0>;
+ spi-max-frequency = <100>;
+ pendown-gpio = < 7 0>;
+ vcc-supply = <_3p3v>;
+ ti,x-min = /bits/ 16 <0>;
+ ti,x-max = /bits/ 16 <4095>;
+ ti,y-min = /bits/ 16 <0>;
+ ti,y-max = /bits/ 16 <4095>;
+ ti,pressure-max = /bits/ 16 <1024>;
+ ti,x-plate-ohms = /bits/ 16 <90>;
+ ti,y-plate-ohms = /bits/ 16 <90>;
+ ti,debounce-max = /bits/ 16 <70>;
+ ti,debounce-tol = /bits/ 16 <3>;
+ ti,debounce-rep = /bits/ 16 <2>;
+ ti,settle-delay-usec = /bits/ 16 <150>;
+ wakeup-source;
+ };
+};
+
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_hog>;
+
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
+ MX7D_PAD_EPDC_DATA00__GPIO2_IO0 0x14
+ MX7D_PAD_EPDC_DATA01__GPIO2_IO1 0x14
+ MX7D_PAD_EPDC_DATA02__GPIO2_IO2 0x14
+ MX7D_PAD_EPDC_DATA03__GPIO2_IO3 0x14
+ MX7D_PAD_EPDC_DATA05__GPIO2_IO5 0x14
+ MX7D_PAD_EPDC_DATA12__GPIO2_IO120x14
+ MX7D_PAD_EPDC_DATA07__GPIO2_IO7 0x14
+ >;
+ };
+
+ pinctrl_gpio_leds: gpioledsgrp {
+ fsl,pins = <
+ MX7D_PAD_EPDC_DATA13__GPIO2_IO130x14
+ >;
+ };
+};
\ No newline at end of file
diff --
[U-Boot] [PATCH V2 3/5] pico-imx7d: defconfig Enable DM gpio pinctrl and pinctrl_imx7
This patch is necessary for convert this board to dm driver model
DM GPIO requires gpio_request() to be called explicitly before
doing any gpio operation
Signed-off-by: Joris Offouga
---
board/technexion/pico-imx7d/pico-imx7d.c | 4 +++-
configs/pico-hobbit-imx7d_defconfig | 3 +++
configs/pico-imx7d_defconfig | 3 +++
configs/pico-pi-imx7d_defconfig | 3 +++
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index 767d13d..3b9be45 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -165,7 +165,7 @@ static iomux_v3_cfg_t const fec1_pads[] = {
static void setup_iomux_fec(void)
{
imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
-
+ gpio_request(FEC1_RST_GPIO, "phy_rst");
gpio_direction_output(FEC1_RST_GPIO, 0);
udelay(500);
gpio_set_value(FEC1_RST_GPIO, 1);
@@ -291,6 +291,8 @@ static iomux_v3_cfg_t const lcd_pads[] = {
void setup_lcd(void)
{
imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
+ gpio_request(IMX_GPIO_NR(1, 11), "lcd_brightness");
+ gpio_request(IMX_GPIO_NR(1, 6), "lcd_enable");
/* Set Brightness to high */
gpio_direction_output(IMX_GPIO_NR(1, 11) , 1);
/* Set LCD enable to high */
diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
index 75eab28..a830aa8 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -27,6 +27,9 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_CMD_BOOTMENU=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_XIMG is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX7=y
+CONFIG_DM_GPIO=y
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_WRITE_SIZE=0x2
CONFIG_CMD_DFU=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index beee839..ec7faf9 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -27,6 +27,9 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_CMD_BOOTMENU=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_XIMG is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX7=y
+CONFIG_DM_GPIO=y
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_WRITE_SIZE=0x2
CONFIG_CMD_DFU=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index 05d5fe5..662492a 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -27,6 +27,9 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_CMD_BOOTMENU=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_XIMG is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX7=y
+CONFIG_DM_GPIO=y
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_WRITE_SIZE=0x2
CONFIG_CMD_DFU=y
--
2.7.4
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM
This series convert Pico i.MX7 and variant board to DM. The following options have been enabled: -CONFIG_DM_GPIO -CONFIG_DM_EMMC Signed-off-by: Joris Offouga --- Change in v2: - add missing dtb in Makefile Joris Offouga (5): Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM pico-imx7d: defconfig: Add DT file hooks pico-imx7d: defconfig Enable DM gpio pinctrl and pinctrl_imx7 pico-imx7d: Convert DM MMC pico-imx7d: Increase u-boot size for dfu request arch/arm/dts/Makefile| 5 +- arch/arm/dts/imx7d-pico-hobbit.dts | 105 ++ arch/arm/dts/imx7d-pico-pi.dts | 93 + arch/arm/dts/imx7d-pico.dtsi | 590 +++ board/technexion/pico-imx7d/pico-imx7d.c | 42 +-- board/technexion/pico-imx7d/spl.c| 38 ++ configs/pico-hobbit-imx7d_defconfig | 7 +- configs/pico-imx7d_defconfig | 7 +- configs/pico-pi-imx7d_defconfig | 7 +- include/configs/pico-imx7d.h | 2 +- 10 files changed, 852 insertions(+), 44 deletions(-) create mode 100644 arch/arm/dts/imx7d-pico-hobbit.dts create mode 100644 arch/arm/dts/imx7d-pico-pi.dts create mode 100644 arch/arm/dts/imx7d-pico.dtsi -- 2.7.4 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks
This patch adds DT file hooks for Pico i.MX7D SOM and variant boards Signed-off-by: Joris Offouga --- configs/pico-hobbit-imx7d_defconfig | 3 ++- configs/pico-imx7d_defconfig| 3 ++- configs/pico-pi-imx7d_defconfig | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig index f58d517..75eab28 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit" CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y @@ -58,4 +60,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y -CONFIG_OF_LIBFDT=y diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index 7e13923..beee839 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="ask" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico" CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y @@ -58,4 +60,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y -CONFIG_OF_LIBFDT=y diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index c8ac2ff..05d5fe5 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi" CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y @@ -58,4 +60,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y -CONFIG_OF_LIBFDT=y -- 2.7.4 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 5/5] pico-imx7d: Increase u-boot size for dfu request
After DM conversion, the size of U-Boot binary to increase. Previous size is 480K after DM Conversion the new size is 557K So it's necessary to increase the dfu request for store u-boot-dtb.img in eMMC. Signed-off-by: Joris Offouga --- include/configs/pico-imx7d.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 0f6d6b7..04d316f 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -46,7 +46,7 @@ #define CONFIG_DFU_ENV_SETTINGS \ "dfu_alt_info=" \ "spl raw 0x2 0x400;" \ - "u-boot raw 0x8a 0x400;" \ + "u-boot raw 0x8a 0x1000;" \ "/boot/zImage ext4 0 1;" \ "/boot/imx7d-pico-hobbit.dtb ext4 0 1;" \ "/boot/imx7d-pico-pi.dtb ext4 0 1;" \ -- 2.7.4 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2 4/5] pico-imx7d: Convert DM MMC
This patch enable convert DM MMC for imx7d-pico board and variant.
Before the DM conversion only usdhc3 was enabled and therefore it appeared
as MMC 0 to u-boot. After enabling MMC DM though usdhc3 defaults to MMC 2,
which left unattended would drive changes to existing pico-pi bootscripts and
environment variables that rely on mmc 0.
Setup the alias of mmc0 and usdhc3 so that existing pico-imx7d boot code will
work unmodified.
When converting to DM_MMC it is necessary that SPL initializes eMMC
by itself, so move the original eMMC initialization from U-Boot
proper to SPL.
Signed-off-by: Joris Offouga
Signed-off-by: Fabio Estevam
---
arch/arm/dts/imx7d-pico.dtsi | 4
board/technexion/pico-imx7d/pico-imx7d.c | 38
board/technexion/pico-imx7d/spl.c| 38
configs/pico-hobbit-imx7d_defconfig | 1 +
configs/pico-imx7d_defconfig | 1 +
configs/pico-pi-imx7d_defconfig | 1 +
6 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi
index d1a4079..9f1fe68 100644
--- a/arch/arm/dts/imx7d-pico.dtsi
+++ b/arch/arm/dts/imx7d-pico.dtsi
@@ -8,6 +8,10 @@
/ {
+ aliases {
+ mmc0 =
+ };
+
/* Will be filled by the bootloader */
memory@8000 {
device_type = "memory";
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index 3b9be45..e63b19d 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -13,10 +13,8 @@
#include
#include
#include
-#include
#include
#include
-#include
#include
#include
#include
@@ -28,9 +26,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \
PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
-#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
- PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM)
-
#define ENET_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
#define ENET_PAD_CTRL_MII (PAD_CTL_DSE_3P3V_32OHM)
@@ -126,20 +121,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
MX7D_PAD_I2C4_SDA__UART5_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
};
-static iomux_v3_cfg_t const usdhc3_emmc_pads[] = {
- MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_GPIO1_IO14__GPIO1_IO14 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-};
-
#ifdef CONFIG_FEC_MXC
static iomux_v3_cfg_t const fec1_pads[] = {
MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
@@ -224,25 +205,6 @@ static void setup_iomux_uart(void)
imx_iomux_v3_setup_multiple_pads(uart5_pads, ARRAY_SIZE(uart5_pads));
}
-static struct fsl_esdhc_cfg usdhc_cfg[1] = {
- {USDHC3_BASE_ADDR},
-};
-
-int board_mmc_getcd(struct mmc *mmc)
-{
- /* Assume uSDHC3 emmc is always present */
- return 1;
-}
-
-int board_mmc_init(bd_t *bis)
-{
- imx_iomux_v3_setup_multiple_pads(
- usdhc3_emmc_pads, ARRAY_SIZE(usdhc3_emmc_pads));
- usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-
- return fsl_esdhc_initialize(bis, _cfg[0]);
-}
-
int board_early_init_f(void)
{
setup_iomux_uart();
diff --git a/board/technexion/pico-imx7d/spl.c
b/board/technexion/pico-imx7d/spl.c
index 8c34438..92a4646 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -5,11 +5,15 @@
* Author: Richard Hu
*/
+#include
#include
#include
+#include
#include
#include
+#include
#include
+#include
#include
#if defined(CONFIG_SPL_BUILD)
@@ -119,4 +123,38 @@ void board_init_f(ulong dummy)
void reset_cpu(ulong addr)
{
}
+
+#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
+ PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM)
+
+static iomux_v3_cfg_t const usdhc3_pads[] = {
+ MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_DATA3__SD3_DATA3 | MU
Re: [U-Boot] [PATCH 1/5] Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM
Le 04/04/2019 à 10:28, Joris Offouga a écrit : Le 03/04/2019 à 22:40, Otavio Salvador a écrit : On Mon, Mar 25, 2019 at 10:42 AM Fabio Estevam wrote: On Mon, Mar 25, 2019 at 9:52 AM Joris Offouga wrote: This patch imports the Linux kernel base board imx7d-pico.dtsi, pi board imx7d-pico-pi.dts and hobbit board imx7d-pico-hobbit.dts from Linux v5.1-rc1. Signed-off-by: Joris Offouga Tested-by: Fabio Estevam The dtb files are not included on the Makefile, so if we try to build the image it fails. This is not necessary since we are using the CONFIG_DEFAULT_FDT_FILE. Sorry indeed it must be added I will send a v2 with this change Best Regards, Joris ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/5] Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM
Le 03/04/2019 à 22:40, Otavio Salvador a écrit : On Mon, Mar 25, 2019 at 10:42 AM Fabio Estevam wrote: On Mon, Mar 25, 2019 at 9:52 AM Joris Offouga wrote: This patch imports the Linux kernel base board imx7d-pico.dtsi, pi board imx7d-pico-pi.dts and hobbit board imx7d-pico-hobbit.dts from Linux v5.1-rc1. Signed-off-by: Joris Offouga Tested-by: Fabio Estevam The dtb files are not included on the Makefile, so if we try to build the image it fails. This is not necessary since we are using the CONFIG_DEFAULT_FDT_FILE. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 0/5] Convert Pico i.MX7 to DM
This series introduce DM Conversion for Pico i.MX7 Som and variant boards Joris Offouga (5): Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM pico-imx7d: defconfig: Add DT file hooks pico-imx7d: defconfig Enable DM gpio pinctrl and pinctrl_imx7 pico-imx7d: Convert DM MMC pico-imx7d: Increase u-boot size for dfu request arch/arm/dts/imx7d-pico-hobbit.dts | 105 arch/arm/dts/imx7d-pico-pi.dts | 93 arch/arm/dts/imx7d-pico.dtsi | 590 +++ board/technexion/pico-imx7d/pico-imx7d.c | 42 +- board/technexion/pico-imx7d/spl.c| 38 ++ configs/pico-hobbit-imx7d_defconfig | 7 +- configs/pico-imx7d_defconfig | 7 +- configs/pico-pi-imx7d_defconfig | 7 +- include/configs/pico-imx7d.h | 2 +- 9 files changed, 848 insertions(+), 43 deletions(-) create mode 100644 arch/arm/dts/imx7d-pico-hobbit.dts create mode 100644 arch/arm/dts/imx7d-pico-pi.dts create mode 100644 arch/arm/dts/imx7d-pico.dtsi -- 2.17.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 5/5] pico-imx7d: Increase u-boot size for dfu request
After DM conversion, the size of U-Boot binary to increase. Previous size is 480K after DM Conversion the new size is 557K So it's necessary to increase the dfu request for store u-boot-dtb.img in eMMC. Signed-off-by: Joris Offouga --- include/configs/pico-imx7d.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 0f6d6b7894..04d316f113 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -46,7 +46,7 @@ #define CONFIG_DFU_ENV_SETTINGS \ "dfu_alt_info=" \ "spl raw 0x2 0x400;" \ - "u-boot raw 0x8a 0x400;" \ + "u-boot raw 0x8a 0x1000;" \ "/boot/zImage ext4 0 1;" \ "/boot/imx7d-pico-hobbit.dtb ext4 0 1;" \ "/boot/imx7d-pico-pi.dtb ext4 0 1;" \ -- 2.17.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 4/5] pico-imx7d: Convert DM MMC
This patch enable convert DM MMC for imx7d-pico board and variant.
Before the DM conversion only usdhc3 was enabled and therefore it appeared
as MMC 0 to u-boot. After enabling MMC DM though usdhc3 defaults to MMC 2,
which left unattended would drive changes to existing pico-pi bootscripts and
environment variables that rely on mmc 0.
Setup the alias of mmc0 and usdhc3 so that existing pico-imx7d boot code will
work unmodified.
When converting to DM_MMC it is necessary that SPL initializes eMMC
by itself, so move the original eMMC initialization from U-Boot
proper to SPL.
Signed-off-by: Joris Offouga
Signed-off-by: Fabio Estevam
---
arch/arm/dts/imx7d-pico.dtsi | 4 +++
board/technexion/pico-imx7d/pico-imx7d.c | 38
board/technexion/pico-imx7d/spl.c| 38
configs/pico-hobbit-imx7d_defconfig | 1 +
configs/pico-imx7d_defconfig | 1 +
configs/pico-pi-imx7d_defconfig | 1 +
6 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi
index d1a4079570..9f1fe683db 100644
--- a/arch/arm/dts/imx7d-pico.dtsi
+++ b/arch/arm/dts/imx7d-pico.dtsi
@@ -8,6 +8,10 @@
/ {
+ aliases {
+ mmc0 =
+ };
+
/* Will be filled by the bootloader */
memory@8000 {
device_type = "memory";
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index 3b9be45587..e63b19df6e 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -13,10 +13,8 @@
#include
#include
#include
-#include
#include
#include
-#include
#include
#include
#include
@@ -28,9 +26,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \
PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
-#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
- PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM)
-
#define ENET_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
#define ENET_PAD_CTRL_MII (PAD_CTL_DSE_3P3V_32OHM)
@@ -126,20 +121,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
MX7D_PAD_I2C4_SDA__UART5_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
};
-static iomux_v3_cfg_t const usdhc3_emmc_pads[] = {
- MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_SD3_DATA7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
- MX7D_PAD_GPIO1_IO14__GPIO1_IO14 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-};
-
#ifdef CONFIG_FEC_MXC
static iomux_v3_cfg_t const fec1_pads[] = {
MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
@@ -224,25 +205,6 @@ static void setup_iomux_uart(void)
imx_iomux_v3_setup_multiple_pads(uart5_pads, ARRAY_SIZE(uart5_pads));
}
-static struct fsl_esdhc_cfg usdhc_cfg[1] = {
- {USDHC3_BASE_ADDR},
-};
-
-int board_mmc_getcd(struct mmc *mmc)
-{
- /* Assume uSDHC3 emmc is always present */
- return 1;
-}
-
-int board_mmc_init(bd_t *bis)
-{
- imx_iomux_v3_setup_multiple_pads(
- usdhc3_emmc_pads, ARRAY_SIZE(usdhc3_emmc_pads));
- usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-
- return fsl_esdhc_initialize(bis, _cfg[0]);
-}
-
int board_early_init_f(void)
{
setup_iomux_uart();
diff --git a/board/technexion/pico-imx7d/spl.c
b/board/technexion/pico-imx7d/spl.c
index 8c3443875d..92a46463db 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -5,11 +5,15 @@
* Author: Richard Hu
*/
+#include
#include
#include
+#include
#include
#include
+#include
#include
+#include
#include
#if defined(CONFIG_SPL_BUILD)
@@ -119,4 +123,38 @@ void board_init_f(ulong dummy)
void reset_cpu(ulong addr)
{
}
+
+#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
+ PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM)
+
+static iomux_v3_cfg_t const usdhc3_pads[] = {
+ MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+ MX7D_PAD_SD3_DATA3__SD3_DATA3 | MU
[U-Boot] [PATCH 1/5] Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM
This patch imports the Linux kernel base board imx7d-pico.dtsi,
pi board imx7d-pico-pi.dts and hobbit board imx7d-pico-hobbit.dts
from Linux v5.1-rc1.
Signed-off-by: Joris Offouga
---
arch/arm/dts/imx7d-pico-hobbit.dts | 105 ++
arch/arm/dts/imx7d-pico-pi.dts | 93 +
arch/arm/dts/imx7d-pico.dtsi | 586 +
3 files changed, 784 insertions(+)
create mode 100644 arch/arm/dts/imx7d-pico-hobbit.dts
create mode 100644 arch/arm/dts/imx7d-pico-pi.dts
create mode 100644 arch/arm/dts/imx7d-pico.dtsi
diff --git a/arch/arm/dts/imx7d-pico-hobbit.dts
b/arch/arm/dts/imx7d-pico-hobbit.dts
new file mode 100644
index 00..98604f0fa6
--- /dev/null
+++ b/arch/arm/dts/imx7d-pico-hobbit.dts
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+//
+// Copyright 2017 NXP
+
+#include "imx7d-pico.dtsi"
+
+/ {
+ model = "TechNexion PICO-IMX7D Board using Hobbit baseboard";
+ compatible = "technexion,imx7d-pico-hobbit", "fsl,imx7d";
+
+ leds {
+ compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <_gpio_leds>;
+
+ led {
+ label = "gpio-led";
+ gpios = < 13 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "imx7-sgtl5000";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,bitclock-master = <_master>;
+ simple-audio-card,frame-master = <_master>;
+ simple-audio-card,cpu {
+ sound-dai = <>;
+ };
+
+ dailink_master: simple-audio-card,codec {
+ sound-dai = <>;
+ clocks = < IMX7D_AUDIO_MCLK_ROOT_CLK>;
+ };
+ };
+};
+
+ {
+ sgtl5000: codec@a {
+ #sound-dai-cells = <0>;
+ reg = <0x0a>;
+ compatible = "fsl,sgtl5000";
+ clocks = < IMX7D_AUDIO_MCLK_ROOT_CLK>;
+ VDDA-supply = <_2p5v>;
+ VDDIO-supply = <_vref_1v8>;
+ };
+};
+
+ {
+ status = "okay";
+
+ adc081c: adc@50 {
+ compatible = "ti,adc081c";
+ reg = <0x50>;
+ vref-supply = <_3p3v>;
+ };
+};
+
+ {
+ ads7846@0 {
+ reg = <0>;
+ compatible = "ti,ads7846";
+ interrupt-parent = <>;
+ interrupts = <7 0>;
+ spi-max-frequency = <100>;
+ pendown-gpio = < 7 0>;
+ vcc-supply = <_3p3v>;
+ ti,x-min = /bits/ 16 <0>;
+ ti,x-max = /bits/ 16 <4095>;
+ ti,y-min = /bits/ 16 <0>;
+ ti,y-max = /bits/ 16 <4095>;
+ ti,pressure-max = /bits/ 16 <1024>;
+ ti,x-plate-ohms = /bits/ 16 <90>;
+ ti,y-plate-ohms = /bits/ 16 <90>;
+ ti,debounce-max = /bits/ 16 <70>;
+ ti,debounce-tol = /bits/ 16 <3>;
+ ti,debounce-rep = /bits/ 16 <2>;
+ ti,settle-delay-usec = /bits/ 16 <150>;
+ wakeup-source;
+ };
+};
+
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_hog>;
+
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
+ MX7D_PAD_EPDC_DATA00__GPIO2_IO0 0x14
+ MX7D_PAD_EPDC_DATA01__GPIO2_IO1 0x14
+ MX7D_PAD_EPDC_DATA02__GPIO2_IO2 0x14
+ MX7D_PAD_EPDC_DATA03__GPIO2_IO3 0x14
+ MX7D_PAD_EPDC_DATA05__GPIO2_IO5 0x14
+ MX7D_PAD_EPDC_DATA12__GPIO2_IO120x14
+ MX7D_PAD_EPDC_DATA07__GPIO2_IO7 0x14
+ >;
+ };
+
+ pinctrl_gpio_leds: gpioledsgrp {
+ fsl,pins = <
+ MX7D_PAD_EPDC_DATA13__GPIO2_IO130x14
+ >;
+ };
+};
\ No newline at end of file
diff --git a/arch/arm/dts/imx7d-pico-pi.dts b/arch/arm/dts/imx7d-pico-pi.dts
new file mode 100644
index 00..66ca59045f
--- /dev/null
+++ b/arch/arm/dts/imx7d-pico-pi.dts
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+//
+// Copyright 2017 NXP
+
+#include "imx7d-pico.dtsi"
+
+/ {
+ model = "TechNexion PICO-IMX7D Board and PI baseboard";
+ compatible = "technexion,imx7d-pico-pi", "fsl,imx7d";
+
+ leds {
+ compatible = "gpio-leds";
[U-Boot] [PATCH 3/5] pico-imx7d: defconfig Enable DM gpio pinctrl and pinctrl_imx7
This patch is necessary for convert this board to dm driver model
DM GPIO requires gpio_request() to be called explicitly before
doing any gpio operation
Signed-off-by: Joris Offouga
---
board/technexion/pico-imx7d/pico-imx7d.c | 4 +++-
configs/pico-hobbit-imx7d_defconfig | 3 +++
configs/pico-imx7d_defconfig | 3 +++
configs/pico-pi-imx7d_defconfig | 3 +++
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index 767d13dfe5..3b9be45587 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -165,7 +165,7 @@ static iomux_v3_cfg_t const fec1_pads[] = {
static void setup_iomux_fec(void)
{
imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
-
+ gpio_request(FEC1_RST_GPIO, "phy_rst");
gpio_direction_output(FEC1_RST_GPIO, 0);
udelay(500);
gpio_set_value(FEC1_RST_GPIO, 1);
@@ -291,6 +291,8 @@ static iomux_v3_cfg_t const lcd_pads[] = {
void setup_lcd(void)
{
imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
+ gpio_request(IMX_GPIO_NR(1, 11), "lcd_brightness");
+ gpio_request(IMX_GPIO_NR(1, 6), "lcd_enable");
/* Set Brightness to high */
gpio_direction_output(IMX_GPIO_NR(1, 11) , 1);
/* Set LCD enable to high */
diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
index 75eab28aba..a830aa85a2 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -27,6 +27,9 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_CMD_BOOTMENU=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_XIMG is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX7=y
+CONFIG_DM_GPIO=y
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_WRITE_SIZE=0x2
CONFIG_CMD_DFU=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index 13704941cf..54d7da8768 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -27,6 +27,9 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_CMD_BOOTMENU=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_XIMG is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX7=y
+CONFIG_DM_GPIO=y
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_WRITE_SIZE=0x2
CONFIG_CMD_DFU=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index 05d5fe5175..662492aae1 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -27,6 +27,9 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
CONFIG_CMD_BOOTMENU=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_XIMG is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX7=y
+CONFIG_DM_GPIO=y
CONFIG_CMD_SPL=y
CONFIG_CMD_SPL_WRITE_SIZE=0x2
CONFIG_CMD_DFU=y
--
2.17.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 2/5] pico-imx7d: defconfig: Add DT file hooks
This patch adds DT file hooks for Pico i.MX7D SOM and variant boards Signed-off-by: Joris Offouga --- configs/pico-hobbit-imx7d_defconfig | 3 ++- configs/pico-imx7d_defconfig| 3 ++- configs/pico-pi-imx7d_defconfig | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig index f58d5171ba..75eab28aba 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit" CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y @@ -58,4 +60,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y -CONFIG_OF_LIBFDT=y diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index 7e13923cb4..13704941cf 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="ask" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi" CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y @@ -58,4 +60,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y -CONFIG_OF_LIBFDT=y diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index c8ac2ffd5f..05d5fe5175 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb" +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi" CONFIG_BOUNCE_BUFFER=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_USB_HOST_SUPPORT=y @@ -58,4 +60,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_VIDEO=y -CONFIG_OF_LIBFDT=y -- 2.17.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 0/5] Convert Pico i.MX7 to DM
From: Joris Offouga This series introduce DM Conversion for Pico i.MX7 Som and variant boards Joris Offouga (5): Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM pico-imx7d: defconfig: Add DT file hooks pico-imx7d: defconfig Enable DM gpio pinctrl and pinctrl_imx7 pico-imx7d: Convert DM MMC pico-imx7d: Increase u-boot size for dfu request arch/arm/dts/imx7d-pico-hobbit.dts | 105 arch/arm/dts/imx7d-pico-pi.dts | 93 arch/arm/dts/imx7d-pico.dtsi | 590 +++ board/technexion/pico-imx7d/pico-imx7d.c | 42 +- board/technexion/pico-imx7d/spl.c| 38 ++ configs/pico-hobbit-imx7d_defconfig | 7 +- configs/pico-imx7d_defconfig | 7 +- configs/pico-pi-imx7d_defconfig | 7 +- include/configs/pico-imx7d.h | 2 +- 9 files changed, 848 insertions(+), 43 deletions(-) create mode 100644 arch/arm/dts/imx7d-pico-hobbit.dts create mode 100644 arch/arm/dts/imx7d-pico-pi.dts create mode 100644 arch/arm/dts/imx7d-pico.dtsi -- 2.17.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] pico-imx7: Disable video support
Le sam. 23 mars 2019 à 14:53, Fabio Estevam a écrit :
> Since commit 9e3c0174da842 ("pico-imx7d: Add LCD support") loading U-Boot
> via USB download mode causes the following hang:
>
> SDP: initialize...
> SDP: handle requests...
> Downloading file of size 527088 to 0x877fffc0... done
> Jumping to header at 0x877fffc0
> Header Tag is not an IMX image
>
> U-Boot 2019.04-rc4-00047-gcfb3e102c4 (Mar 23 2019 - 10:45:10 -0300)
>
> CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz)
> CPU: Commercial temperature grade (0C to 95C) at 40C
> Reset cause: POR
> Board: i.MX7D PICOSOM
> I2C: ready
> DRAM: 512 MiB
>
> (Hangs here)
>
> When booting from eMMC such hang does not happen and currently
> we don't have a proper fix for this. Also, this hang in USB
> download mode only happens with the older version of the
> board that has 512MB of memory.
>
> As a temporary workaround, remove video support so that users
> do not have a negative experience in case they brick their board
> and want to recover from USB.
>
> We can re-add video support later when a proper fix is in place.
>
> Signed-off-by: Fabio Estevam
> ---
> configs/pico-hobbit-imx7d_defconfig | 1 -
> configs/pico-pi-imx7d_defconfig | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/configs/pico-hobbit-imx7d_defconfig
> b/configs/pico-hobbit-imx7d_defconfig
> index f58d5171ba..cb4a6bf0bb 100644
> --- a/configs/pico-hobbit-imx7d_defconfig
> +++ b/configs/pico-hobbit-imx7d_defconfig
> @@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/pico-pi-imx7d_defconfig
> b/configs/pico-pi-imx7d_defconfig
> index c8ac2ffd5f..8e48ba71be 100644
> --- a/configs/pico-pi-imx7d_defconfig
> +++ b/configs/pico-pi-imx7d_defconfig
> @@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL"
> CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> -CONFIG_VIDEO=y
> CONFIG_OF_LIBFDT=y
> --
> 2.17.1
>
Tested-by: Joris Offouga
>
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH V2] Revert "pico-imx7d: Add LCD support"
This reverts commit 9e3c0174da842dd88f5feaffbf843ba332233897.
This commit breaks U-Boot when is load with imx-usb-loader.
Signed-off-by: Joris Offouga
---
Changes for v2:
- Add missing signed-off
---
board/technexion/pico-imx7d/pico-imx7d.c | 55
configs/pico-hobbit-imx7d_defconfig | 1 -
configs/pico-imx7d_defconfig | 1 -
configs/pico-pi-imx7d_defconfig | 1 -
include/configs/pico-imx7d.h | 12 ---
5 files changed, 70 deletions(-)
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index 767d13d..53e1469 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -39,16 +39,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define I2C_PAD_CTRL(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
-
-#define LCD_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
-PAD_CTL_DSE_3P3V_49OHM)
-
-#define LCD_SYNC_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
- PAD_CTL_DSE_3P3V_196OHM)
-
#ifdef CONFIG_SYS_I2C_MXC
#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-
/* I2C4 for PMIC */
static struct i2c_pads_info i2c_pad_info4 = {
.scl = {
@@ -254,58 +246,11 @@ int board_early_init_f(void)
return 0;
}
-#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_SYNC_PAD_CTRL),
- MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_SYNC_PAD_CTRL),
- MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_SYNC_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),
- MX7D_PAD_LCD_DATA18__LCD_DATA18 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA19__LCD_DATA19 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA20__LCD_DATA20 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA21__LCD_DATA21 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA22__LCD_DATA22 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA23__LCD_DATA23 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_GPIO1_IO06__GPIO1_IO6 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_GPIO1_IO11__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-void setup_lcd(void)
-{
- imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
- /* Set Brightness to high */
- gpio_direction_output(IMX_GPIO_NR(1, 11) , 1);
- /* Set LCD enable to high */
- gpio_direction_output(IMX_GPIO_NR(1, 6) , 1);
-}
-#endif
-
int board_init(void)
{
/* address of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-#ifdef CONFIG_VIDEO_MXS
- setup_lcd();
-#endif
#ifdef CONFIG_FEC_MXC
setup_fec();
#endif
diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
index f58d517..cb4a6bf 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_VIDEO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index 7e13923..f90d757 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_VIDEO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index c8ac2ff..8e48ba7 100644
--- a/configs/pico-pi-imx7d_defco
Re: [U-Boot] [PATCH] Revert "pico-imx7d: Add LCD support"
Le 11/03/2019 à 20:04, Fabio Estevam a écrit : Hi Joris, On Mon, Mar 11, 2019 at 3:27 PM Joris Offouga wrote: I agree with you, but I have not managed to find the bug, Fabio also searched and did not find. If I can get help of course I will look for more, being a junior I wait for advice and help if possible. I haven't had a chance to debug this issue yet. Since this affects only when using serial download mode, let's keep this commit and we can debug it. Let's focus on the conversion of this board to DM for now. Okay thanks, the last error to be able to send the serie of the dm, it is the SPL which does not find the U-Boot in emmc Thanks ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] Revert "pico-imx7d: Add LCD support"
Le 11/03/2019 à 17:52, Stefano Babic a écrit :
Hi Joris,
Hi Stephano,
On 10/03/19 19:52, Joris Offouga wrote:
This reverts commit 9e3c0174da842dd88f5feaffbf843ba332233897.
This commit causes the crash of U-Boot when loaded with imx-usb-loader
---
board/technexion/pico-imx7d/pico-imx7d.c | 55
configs/pico-hobbit-imx7d_defconfig | 1 -
configs/pico-imx7d_defconfig | 1 -
configs/pico-pi-imx7d_defconfig | 1 -
include/configs/pico-imx7d.h | 12 ---
5 files changed, 70 deletions(-)
This appears to me too simplistic - if something is not working, drop
it. Is there any known reason why it crashes when loaded from
imx-usb-loader ? It sounds like that not the whole u-boot.img is loaded
and reducing the size does not crash, but it is not a solution.
Anyway, Vanessa / Otavio are the Maintainer for these sets of boards. If
they decide this must be revert, I won't fight against.
Best regards,
Stefano Babic
I agree with you, but I have not managed to find the bug, Fabio also
searched and did not find. If I can get help of course I will look for
more, being a junior I wait for advice and help if possible.
Best Regards,
Joris Offouga
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index 767d13d..53e1469 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -39,16 +39,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define I2C_PAD_CTRL(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
-
-#define LCD_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
-PAD_CTL_DSE_3P3V_49OHM)
-
-#define LCD_SYNC_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
- PAD_CTL_DSE_3P3V_196OHM)
-
#ifdef CONFIG_SYS_I2C_MXC
#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-
/* I2C4 for PMIC */
static struct i2c_pads_info i2c_pad_info4 = {
.scl = {
@@ -254,58 +246,11 @@ int board_early_init_f(void)
return 0;
}
-#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_SYNC_PAD_CTRL),
- MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_SYNC_PAD_CTRL),
- MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_SYNC_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),
- MX7D_PAD_LCD_DATA18__LCD_DATA18 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA19__LCD_DATA19 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA20__LCD_DATA20 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA21__LCD_DATA21 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA22__LCD_DATA22 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA23__LCD_DATA23 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_GPIO1_IO06__GPIO1_IO6 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_GPIO1_IO11__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-void setup_lcd(void)
-{
- imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
- /* Set Brightness to high */
- gpio_direction_output(IMX_GPIO_NR(1, 11) , 1);
- /* Set LCD enable to high */
- gpio_direction_output(IMX_GPIO_NR(1, 6) , 1);
-}
-#endif
-
int board_init(void)
{
/* address of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-#ifdef CONFIG_VIDEO_MXS
- setup_lcd();
-#endif
#ifdef CONFIG_FEC_MXC
setup_fec();
#endif
diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
index f58d517..cb4a6bf 100644
--- a/configs/pico-hobbit-imx7d_defconfig
[U-Boot] [PATCH] Revert "pico-imx7d: Add LCD support"
This reverts commit 9e3c0174da842dd88f5feaffbf843ba332233897.
This commit causes the crash of U-Boot when loaded with imx-usb-loader
---
board/technexion/pico-imx7d/pico-imx7d.c | 55
configs/pico-hobbit-imx7d_defconfig | 1 -
configs/pico-imx7d_defconfig | 1 -
configs/pico-pi-imx7d_defconfig | 1 -
include/configs/pico-imx7d.h | 12 ---
5 files changed, 70 deletions(-)
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
b/board/technexion/pico-imx7d/pico-imx7d.c
index 767d13d..53e1469 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -39,16 +39,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define I2C_PAD_CTRL(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
-
-#define LCD_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
-PAD_CTL_DSE_3P3V_49OHM)
-
-#define LCD_SYNC_PAD_CTRL(PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
- PAD_CTL_DSE_3P3V_196OHM)
-
#ifdef CONFIG_SYS_I2C_MXC
#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-
/* I2C4 for PMIC */
static struct i2c_pads_info i2c_pad_info4 = {
.scl = {
@@ -254,58 +246,11 @@ int board_early_init_f(void)
return 0;
}
-#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_SYNC_PAD_CTRL),
- MX7D_PAD_LCD_HSYNC__LCD_HSYNC | MUX_PAD_CTRL(LCD_SYNC_PAD_CTRL),
- MX7D_PAD_LCD_VSYNC__LCD_VSYNC | MUX_PAD_CTRL(LCD_SYNC_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),
- MX7D_PAD_LCD_DATA18__LCD_DATA18 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA19__LCD_DATA19 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA20__LCD_DATA20 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA21__LCD_DATA21 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA22__LCD_DATA22 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_LCD_DATA23__LCD_DATA23 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_GPIO1_IO06__GPIO1_IO6 | MUX_PAD_CTRL(LCD_PAD_CTRL),
- MX7D_PAD_GPIO1_IO11__GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-void setup_lcd(void)
-{
- imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
- /* Set Brightness to high */
- gpio_direction_output(IMX_GPIO_NR(1, 11) , 1);
- /* Set LCD enable to high */
- gpio_direction_output(IMX_GPIO_NR(1, 6) , 1);
-}
-#endif
-
int board_init(void)
{
/* address of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-#ifdef CONFIG_VIDEO_MXS
- setup_lcd();
-#endif
#ifdef CONFIG_FEC_MXC
setup_fec();
#endif
diff --git a/configs/pico-hobbit-imx7d_defconfig
b/configs/pico-hobbit-imx7d_defconfig
index f58d517..cb4a6bf 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_VIDEO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index 7e13923..f90d757 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
-CONFIG_VIDEO=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index c8ac2ff..8e48ba7 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -57,5 +57,4 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL"
Re: [U-Boot] [RFC 0/9] Convert Pico-Pi i.MX7D to DM
Le 10/03/2019 à 15:24, Fabio Estevam a écrit : Hi Joris, On Sat, Mar 9, 2019 at 7:21 PM Offouga Joris wrote: Hi Fabio, I revert the commit about add lcd and on u-boot master and u-boot imx i have the u-boot is flashed correctly in usb and dfu. do you agree that I send the revert of the commit? Yes, please revert it for now and resubmit your series that converts pico mx7 to DM. Ok, i send revert add lcd So the only issue now is the I2C errors? No, I have not solved the problem of the spl that can not find the u-boot-dtb.img in the emmc. I think the problem comes from the dfu_alt_info we already talked about it but the solution with raw u-boot 0x45 800 does not work do you have another idea? Thanks, Joris Offouga Thanks, Fabio Estevam ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [RFC 0/9] Convert Pico-Pi i.MX7D to DM
Le 16/02/2019 à 16:25, Fabio Estevam a écrit : On Sat, Feb 16, 2019 at 1:14 PM Joris Offouga wrote: Actually on the top of u-boot-imx there is a blocking when loading u-boot-dtb.img with imx_usb_loader. Just run a "git bisect" and the problem comes from: commit 9e3c0174da842dd88f5feaffbf843ba332233897 (refs/bisect/bad) Author: Fabio Estevam Date: Tue Dec 11 16:40:38 2018 -0200 pico-imx7d: Add LCD support Add support for the VXT VL050-8048NT-C01 panel connected through the 24 bit parallel LCDIF interface. Signed-off-by: Fabio Estevam Signed-off-by: Otavio Salvador It used to work at some point as I could see the splashscreen logo in the screen. Please revert it from your tree and see if it works for you. I will need to investigate why my commit broke the boot, but for now just revert it locally so that you can continue the DM conversion. I reversed your commit but the block is still there, but even with your commit on the top of the u-boot master. I don't have the block with imx_usb_loader just when I try to boot from the emmc Thanks ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [RFC 0/9] Convert Pico-Pi i.MX7D to DM
Le 16/02/2019 à 15:54, Fabio Estevam a écrit : On Sat, Feb 16, 2019 at 12:52 PM Joris Offouga wrote: Ok, thanks for your help :). I worked new commits do you want me to update the RFC in v2? Please generate your series against the latest u-boot-imx tree. However, I observed the hang when I use the latest u-boot or u-boot-imx tree, so we will need to fix the hang problem first. Actually on the top of u-boot-imx there is a blocking when loading u-boot-dtb.img with imx_usb_loader. I show you my log: U-Boot SPL 2019.04-rc1-dirty (Feb 16 2019 - 16:10:56 +0100) Trying to boot from USB SDP SDP: initialize... SDP: handle requests... Downloading file of size 530520 to 0x877fffc0... done Jumping to header at 0x877fffc0 Header Tag is not an IMX image I will send the series with the status rfc and not patch you are from okay ? Thanks Thanks ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [RFC 0/9] Convert Pico-Pi i.MX7D to DM
Le 16/02/2019 à 15:42, Fabio Estevam a écrit : Hi Joris, Hi Fabio, On Sat, Feb 16, 2019 at 12:38 PM Joris Offouga wrote: By doing this the SPL still does not find the U-Boot binary always this same log: U-Boot SPL 2019.04-rc1-00142-g7fe4b77-dirty (Feb 16 2019 - 13:58:30 +0100) Trying to boot from MMC1 Yes, just tried it and I saw the same here. I started from scratch and used top of tree U-Boot. When I load it via USB I see a hang: CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz) CPU: Commercial temperature grade (0C to 95C) at 50C Reset cause: POR Board: i.MX7D PICOSOM I2C: ready DRAM: 512 MiB ... So this is a regression and I will try to bisect it. Ok, thanks for your help :). I worked new commits do you want me to update the RFC in v2? Best Regards, Joris ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [RFC 0/9] Convert Pico-Pi i.MX7D to DM
Le 16/02/2019 à 14:58, Fabio Estevam a écrit : On Sat, Feb 16, 2019 at 11:02 AM Joris Offouga wrote: Yes , download with dfu it's okay but after rebooting the SPL does not load. Does it boot if you flash SPL and u-boot-dtb.img via "ums 0 mmc 0" command? By doing this the SPL still does not find the U-Boot binary always this same log: U-Boot SPL 2019.04-rc1-00142-g7fe4b77-dirty (Feb 16 2019 - 13:58:30 +0100) Trying to boot from MMC1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [RFC 0/9] Convert Pico-Pi i.MX7D to DM
Le 16/02/2019 à 13:46, Fabio Estevam a écrit : On Sat, Feb 16, 2019 at 10:34 AM Joris Offouga wrote: Le 16/02/2019 à 13:17, Fabio Estevam a écrit : Hi Joris, On Sat, Feb 16, 2019 at 9:06 AM Offouga Joris wrote: Hi Fabio I followed Lukasz's advice and I increased the size of the U-Boot in the dfu_alt_info and there is no more error. However, once the SPL and U-Boot are changed and the board reboots with the jumper in Boot from emmc, the SPL can not load the U-Boot. What is the U-Boot size you used in the dfu_alt_info? "u-boot raw 0x8a 0x1000" The original setting was correct: u-boot-dtb.img needs to be flashed at the position 69kB of the eMMC. Originally we had: u-boot raw 0x8a 0x400; which means: 0x8a = 138 * 0x400 = 138 * 1024 = 138 sectors. Each sector is 512 bytes, so 138*0.5k = 69kB Could you also try: u-boot raw 0x45 0x800 Does it make any difference? Yes , download with dfu it's okay but after rebooting the SPL does not load. For u-boot, dm-spl, this does not work only if the SPL is converted to DM too, because the add-on in the uscdh3 node did not change the problem of loading the U-Boot ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [RFC 0/9] Convert Pico-Pi i.MX7D to DM
Le 16/02/2019 à 13:17, Fabio Estevam a écrit : Hi Joris, On Sat, Feb 16, 2019 at 9:06 AM Offouga Joris wrote: Hi Fabio I followed Lukasz's advice and I increased the size of the U-Boot in the dfu_alt_info and there is no more error. However, once the SPL and U-Boot are changed and the board reboots with the jumper in Boot from emmc, the SPL can not load the U-Boot. What is the U-Boot size you used in the dfu_alt_info? "u-boot raw 0x8a 0x1000" What is the error you see in SPL now? See this log : U-Boot SPL 2019.04-rc1-00142-g7fe4b77-dirty (Feb 15 2019 - 20:11:50 +0100) Trying to boot from MMC1 Thanks Thanks ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [RFC 4/9] arm: imx7d-pico-pi: Convert to DM MMC initialization
Le 15/02/2019 à 00:08, Fabio Estevam a écrit : Hi Joris, On Thu, Feb 14, 2019 at 8:46 PM Joris Offouga wrote: it is not possible to convert that i2c and do not convert the pmic. on Ok, we can skip I2C and PMIC for now. the other hand, even without pmic and usb conversion there is always the dfu error when i try to update u-boot via sudo dfu-util -D u-boot-dtb.img -a u-boot . See this error : Request would exceed designated area! #Deferred dfu_flush() failed!=> Do you only see this error after the DM conversion? Yes it's only after DM conversion I haven't tried dfu yet on your tree. Will try it tomorrow. Ok thanks ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
