* [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support
@ 2019-09-12 19:01 Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 2/5] pico-imx6ul: Increase the CONFIG_ENV_OFFSET size Otavio Salvador
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Otavio Salvador @ 2019-09-12 19:01 UTC (permalink / raw)
To: u-boot
This add the boot menu option for the DWARF baseboard as well as a
specific config file for users which wish to use it as a pre-defined
board.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
configs/pico-dwarf-imx6ul_defconfig | 64 +++++++++++++++++++++++++++++
include/configs/pico-imx6ul.h | 6 ++-
2 files changed, 68 insertions(+), 2 deletions(-)
create mode 100644 configs/pico-dwarf-imx6ul_defconfig
diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig
new file mode 100644
index 0000000000..e7af415abd
--- /dev/null
+++ b/configs/pico-dwarf-imx6ul_defconfig
@@ -0,0 +1,64 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_SYS_TEXT_BASE=0x87800000
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TARGET_PICO_IMX6UL=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
+CONFIG_BOOTDELAY=3
+CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
+CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-dwarf.dtb"
+CONFIG_BOUNCE_BUFFER=y
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_CMD_BOOTMENU=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_DFU=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_SDP=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6ul-pico-pi"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_DFU_MMC=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_SIZE=0x10000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_DM_MMC=y
+CONFIG_FSL_ESDHC=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_MICREL=y
+CONFIG_MII=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_PFUZE100=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
+CONFIG_CI_UDC=y
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index cd051bf263..39c83a8c78 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -63,9 +63,11 @@
"rootfs part 0 1\0" \
#define BOOTMENU_ENV \
- "bootmenu_0=Boot using PICO-Hobbit baseboard=" \
+ "bootmenu_0=Boot using PICO-Dwarf baseboard=" \
+ "setenv fdtfile imx6ul-pico-dwarf.dtb\0" \
+ "bootmenu_1=Boot using PICO-Hobbit baseboard=" \
"setenv fdtfile imx6ul-pico-hobbit.dtb\0" \
- "bootmenu_1=Boot using PICO-Pi baseboard=" \
+ "bootmenu_2=Boot using PICO-Pi baseboard=" \
"setenv fdtfile imx6ul-pico-pi.dtb\0" \
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
--
2.23.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 2/5] pico-imx6ul: Increase the CONFIG_ENV_OFFSET size
2019-09-12 19:01 [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
@ 2019-09-12 19:01 ` Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 3/5] pico-imx6ul: Add LCD support Otavio Salvador
` (3 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Otavio Salvador @ 2019-09-12 19:01 UTC (permalink / raw)
To: u-boot
From: Fabio Estevam <festevam@gmail.com>
U-Boot binary has grown in such a way that it goes beyond the reserved
area for the environment variables.
Running "saveenv" causes U-Boot to hang because of this overlap.
Fix this problem by increasing the CONFIG_ENV_OFFSET size.
Also, in order to prevent this same problem in the future, use
CONFIG_BOARD_SIZE_LIMIT, which will detect the overlap in build-time.
CONFIG_BOARD_SIZE_LIMIT does not accept math expressions, so declare
CONFIG_ENV_OFFSET with its direct value instead.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
include/configs/pico-imx6ul.h | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 39c83a8c78..2666e7ac52 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -134,7 +134,19 @@
/* environment organization */
#define CONFIG_ENV_SIZE SZ_8K
-#define CONFIG_ENV_OFFSET (8 * SZ_64K)
+/* Environment starts at 768k = 768 * 1024 = 786432 */
+#define CONFIG_ENV_OFFSET 786432
+/*
+ * Detect overlap between U-Boot image and environment area in build-time
+ *
+ * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.img offset
+ * CONFIG_BOARD_SIZE_LIMIT = 768k - 69k = 699k = 715776
+ *
+ * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so
+ * write the direct value here
+ */
+#define CONFIG_BOARD_SIZE_LIMIT 715776
+
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 0
--
2.23.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 3/5] pico-imx6ul: Add LCD support
2019-09-12 19:01 [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 2/5] pico-imx6ul: Increase the CONFIG_ENV_OFFSET size Otavio Salvador
@ 2019-09-12 19:01 ` Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 4/5] pico-imx6ul: Update the Falcon mode instructions Otavio Salvador
` (2 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Otavio Salvador @ 2019-09-12 19:01 UTC (permalink / raw)
To: u-boot
From: Fabio Estevam <festevam@gmail.com>
Add support for the VXT VL050-8048NT-C01 panel connected through
the 24 bit parallel LCDIF interface.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
board/technexion/pico-imx6ul/pico-imx6ul.c | 55 +++++++++++++++++++++-
configs/pico-dwarf-imx6ul_defconfig | 1 +
configs/pico-hobbit-imx6ul_defconfig | 1 +
configs/pico-imx6ul_defconfig | 1 +
configs/pico-pi-imx6ul_defconfig | 1 +
include/configs/pico-imx6ul.h | 13 +++++
6 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 95b482a602..e27a03c212 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -42,6 +42,9 @@ DECLARE_GLOBAL_DATA_PTR;
#define ENET_CLK_PAD_CTRL (PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
+#define LCD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \
+ PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
+
#define RMII_PHY_RESET IMX_GPIO_NR(1, 28)
static iomux_v3_cfg_t const fec_pads[] = {
@@ -105,6 +108,54 @@ static int setup_fec(void)
return 0;
}
+#ifdef CONFIG_VIDEO_MXS
+static iomux_v3_cfg_t const lcd_pads[] = {
+ MX6_PAD_LCD_CLK__LCDIF_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_ENABLE__LCDIF_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_HSYNC__LCDIF_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_VSYNC__LCDIF_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA00__LCDIF_DATA00 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA01__LCDIF_DATA01 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA02__LCDIF_DATA02 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA03__LCDIF_DATA03 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA04__LCDIF_DATA04 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA05__LCDIF_DATA05 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA06__LCDIF_DATA06 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA07__LCDIF_DATA07 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA08__LCDIF_DATA08 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA09__LCDIF_DATA09 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA10__LCDIF_DATA10 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA11__LCDIF_DATA11 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA12__LCDIF_DATA12 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA13__LCDIF_DATA13 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA14__LCDIF_DATA14 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA15__LCDIF_DATA15 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA16__LCDIF_DATA16 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA17__LCDIF_DATA17 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA18__LCDIF_DATA18 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA19__LCDIF_DATA19 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA20__LCDIF_DATA20 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA21__LCDIF_DATA21 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA22__LCDIF_DATA22 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ MX6_PAD_LCD_DATA23__LCDIF_DATA23 | MUX_PAD_CTRL(LCD_PAD_CTRL),
+ /* LCD_BLT_CTRL: GPIO for Brightness adjustment */
+ MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
+ /* LCD_VDD_EN: LCD enabled */
+ MX6_PAD_JTAG_TMS__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(4, 10), "lcd_brightness");
+ gpio_request(IMX_GPIO_NR(1, 11), "lcd_enable");
+ /* Set Brightness to high */
+ gpio_direction_output(IMX_GPIO_NR(4, 10) , 1);
+ /* Set LCD enable to high */
+ gpio_direction_output(IMX_GPIO_NR(1, 11) , 1);
+}
+#endif
+
int board_phy_config(struct phy_device *phydev)
{
phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x8190);
@@ -214,7 +265,9 @@ int board_init(void)
setup_fec();
setup_usb();
-
+#ifdef CONFIG_VIDEO_MXS
+ setup_lcd();
+#endif
return 0;
}
diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig
index e7af415abd..33bb70bf1f 100644
--- a/configs/pico-dwarf-imx6ul_defconfig
+++ b/configs/pico-dwarf-imx6ul_defconfig
@@ -62,3 +62,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
diff --git a/configs/pico-hobbit-imx6ul_defconfig b/configs/pico-hobbit-imx6ul_defconfig
index 7395598599..b420846aea 100644
--- a/configs/pico-hobbit-imx6ul_defconfig
+++ b/configs/pico-hobbit-imx6ul_defconfig
@@ -65,3 +65,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
diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig
index ad29af1b71..0dc7dd8fca 100644
--- a/configs/pico-imx6ul_defconfig
+++ b/configs/pico-imx6ul_defconfig
@@ -67,3 +67,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
diff --git a/configs/pico-pi-imx6ul_defconfig b/configs/pico-pi-imx6ul_defconfig
index 1a8a4541c6..74a8897280 100644
--- a/configs/pico-pi-imx6ul_defconfig
+++ b/configs/pico-pi-imx6ul_defconfig
@@ -65,3 +65,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
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 2666e7ac52..22dfac7fec 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -75,10 +75,12 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
+ "splashpos=m,m\0" \
"console=ttymxc5\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+ "videomode=video=ctfb:x:800,y:480,depth:24,mode:0,pclk:30000,le:46,ri:210,up:22,lo:23,hs:20,vs:10,sync:0,vmode:0\0" \
BOOTMENU_ENV \
"fdt_addr=0x83000000\0" \
"fdt_addr_r=0x83000000\0" \
@@ -151,4 +153,15 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 0
+#ifdef CONFIG_VIDEO
+#define CONFIG_VIDEO_MXS
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SCREEN_ALIGN
+#define CONFIG_BMP_16BPP
+#define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_VIDEO_BMP_LOGO
+#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
+#endif
+
#endif /* __PICO_IMX6UL_CONFIG_H */
--
2.23.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 4/5] pico-imx6ul: Update the Falcon mode instructions
2019-09-12 19:01 [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 2/5] pico-imx6ul: Increase the CONFIG_ENV_OFFSET size Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 3/5] pico-imx6ul: Add LCD support Otavio Salvador
@ 2019-09-12 19:01 ` Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 5/5] pico-imx6ul: Provide a way to escape the Falcon mode Otavio Salvador
2019-09-14 10:47 ` [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Anatolij Gustschin
4 siblings, 0 replies; 14+ messages in thread
From: Otavio Salvador @ 2019-09-12 19:01 UTC (permalink / raw)
To: u-boot
From: Fabio Estevam <festevam@gmail.com>
Sync the Falcon mode instructions with the ones fro pico-imx7d.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
board/technexion/pico-imx6ul/README | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/board/technexion/pico-imx6ul/README b/board/technexion/pico-imx6ul/README
index bb8ee3f463..40d4344142 100644
--- a/board/technexion/pico-imx6ul/README
+++ b/board/technexion/pico-imx6ul/README
@@ -75,7 +75,7 @@ $ make imx_v6_v7_defconfig (Using the default imx_v6_v7_defconfig configuration
just for an example. In order to boot faster the user should customize the
defconfig by only enabling the minimal required drivers).
-$ make -j4 uImage LOADADDR=0x80800000
+$ make -j4 uImage LOADADDR=0x80008000
$ cp arch/arm/boot/uImage /tftpboot
$ cp arch/arm/boot/dts/imx6ul-pico-hobbit.dtb /tftpboot
@@ -93,7 +93,7 @@ Get the kernel:
=> tftp ${loadaddr} uImage
Write the kernel at 2MB offset:
-=> mmc write ${loadaddr} 0x1000 0x4000
+=> mmc write ${loadaddr} 0x1000 0x5000
Setup the bootargs:
=> setenv bootargs 'console=ttymxc5,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rw'
@@ -104,8 +104,8 @@ Prepare args:
Image Name: Linux-4.19.0-rc2-next-20180905-0
Image Type: ARM Linux Kernel Image (uncompressed)
Data Size: 8365608 Bytes = 8 MiB
- Load Address: 80800000
- Entry Point: 80800000
+ Load Address: 80008000
+ Entry Point: 80008000
Verifying Checksum ... OK
## Flattened Device Tree blob at 83000000
Booting using the fdt blob at 0x83000000
--
2.23.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 5/5] pico-imx6ul: Provide a way to escape the Falcon mode
2019-09-12 19:01 [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
` (2 preceding siblings ...)
2019-09-12 19:01 ` [U-Boot] [PATCH 4/5] pico-imx6ul: Update the Falcon mode instructions Otavio Salvador
@ 2019-09-12 19:01 ` Otavio Salvador
2019-09-14 10:47 ` [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Anatolij Gustschin
4 siblings, 0 replies; 14+ messages in thread
From: Otavio Salvador @ 2019-09-12 19:01 UTC (permalink / raw)
To: u-boot
From: Fabio Estevam <festevam@gmail.com>
When CONFIG_SPL_OS_BOOT is selected, it is still convenient to be able
to escape from Falcon mode and boot to U-Boot proper.
Add a mechanism that allows booting in U-Boot proper when the
key 'c' is entered on console at boot time.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
board/technexion/pico-imx6ul/spl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c
index 284aa40db6..7f520beeb0 100644
--- a/board/technexion/pico-imx6ul/spl.c
+++ b/board/technexion/pico-imx6ul/spl.c
@@ -19,6 +19,10 @@
#ifdef CONFIG_SPL_OS_BOOT
int spl_start_uboot(void)
{
+ /* Break into full U-Boot on 'c' */
+ if (serial_tstc() && serial_getc() == 'c')
+ return 1;
+
return 0;
}
#endif
--
2.23.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support
2019-09-12 19:01 [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
` (3 preceding siblings ...)
2019-09-12 19:01 ` [U-Boot] [PATCH 5/5] pico-imx6ul: Provide a way to escape the Falcon mode Otavio Salvador
@ 2019-09-14 10:47 ` Anatolij Gustschin
2019-09-14 11:22 ` Stefano Babic
4 siblings, 1 reply; 14+ messages in thread
From: Anatolij Gustschin @ 2019-09-14 10:47 UTC (permalink / raw)
To: u-boot
Hi Otavio,
On Thu, 12 Sep 2019 16:01:50 -0300
Otavio Salvador otavio at ossystems.com.br wrote:
...
> configs/pico-dwarf-imx6ul_defconfig | 64 +++++++++++++++++++++++++++++
...
> +CONFIG_FSL_ESDHC=y
Please change this to CONFIG_FSL_USDHC=y
Otherwise we get build warning/error [1].
[1] https://travis-ci.org/sbabic/u-boot-imx/jobs/584781580#L1287
--
Anatolij
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support
2019-09-14 10:47 ` [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Anatolij Gustschin
@ 2019-09-14 11:22 ` Stefano Babic
2019-09-14 11:43 ` [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues Anatolij Gustschin
2019-09-14 12:16 ` [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
0 siblings, 2 replies; 14+ messages in thread
From: Stefano Babic @ 2019-09-14 11:22 UTC (permalink / raw)
To: u-boot
Hi Anatolji,
thanks, I have not sent an e-mail to Otavio after pulling his tree.
On 14/09/19 12:47, Anatolij Gustschin wrote:
> Hi Otavio,
>
> On Thu, 12 Sep 2019 16:01:50 -0300
> Otavio Salvador otavio at ossystems.com.br wrote:
> ...
>> configs/pico-dwarf-imx6ul_defconfig | 64 +++++++++++++++++++++++++++++
> ...
>> +CONFIG_FSL_ESDHC=y
>
> Please change this to CONFIG_FSL_USDHC=y
>
> Otherwise we get build warning/error [1].
>
> [1] https://travis-ci.org/sbabic/u-boot-imx/jobs/584781580#L1287
>
Otavio, I am also fine if you send a follow-up patch to fix it - your
decision.
Regards,
Stefano
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues
2019-09-14 11:22 ` Stefano Babic
@ 2019-09-14 11:43 ` Anatolij Gustschin
2019-09-14 12:14 ` Otavio Salvador
2019-09-14 12:18 ` Fabio Estevam
2019-09-14 12:16 ` [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
1 sibling, 2 replies; 14+ messages in thread
From: Anatolij Gustschin @ 2019-09-14 11:43 UTC (permalink / raw)
To: u-boot
Fixes:
board/technexion/pico-imx6ul/spl.c: In function 'board_mmc_init':
error: implicit declaration of function 'fsl_esdhc_initialize'
and a simmilar error when building pico-dwarf-imx7d.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
---
configs/pico-dwarf-imx6ul_defconfig | 2 +-
configs/pico-dwarf-imx7d_defconfig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig
index 33bb70bf1f..f1f6506868 100644
--- a/configs/pico-dwarf-imx6ul_defconfig
+++ b/configs/pico-dwarf-imx6ul_defconfig
@@ -44,7 +44,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
-CONFIG_FSL_ESDHC=y
+CONFIG_FSL_USDHC=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y
CONFIG_MII=y
diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig
index b8a5fb60ad..3ba7adcc25 100644
--- a/configs/pico-dwarf-imx7d_defconfig
+++ b/configs/pico-dwarf-imx7d_defconfig
@@ -52,7 +52,7 @@ CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
CONFIG_DM_GPIO=y
CONFIG_DM_MMC=y
CONFIG_SUPPORT_EMMC_BOOT=y
-CONFIG_FSL_ESDHC=y
+CONFIG_FSL_USDHC=y
CONFIG_PHYLIB=y
CONFIG_MII=y
CONFIG_PINCTRL=y
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues
2019-09-14 11:43 ` [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues Anatolij Gustschin
@ 2019-09-14 12:14 ` Otavio Salvador
2019-09-14 12:18 ` Fabio Estevam
1 sibling, 0 replies; 14+ messages in thread
From: Otavio Salvador @ 2019-09-14 12:14 UTC (permalink / raw)
To: u-boot
On Sat, Sep 14, 2019 at 8:43 AM Anatolij Gustschin <agust@denx.de> wrote:
>
> Fixes:
> board/technexion/pico-imx6ul/spl.c: In function 'board_mmc_init':
> error: implicit declaration of function 'fsl_esdhc_initialize'
>
> and a simmilar error when building pico-dwarf-imx7d.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
--
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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support
2019-09-14 11:22 ` Stefano Babic
2019-09-14 11:43 ` [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues Anatolij Gustschin
@ 2019-09-14 12:16 ` Otavio Salvador
2019-09-14 12:18 ` Stefano Babic
1 sibling, 1 reply; 14+ messages in thread
From: Otavio Salvador @ 2019-09-14 12:16 UTC (permalink / raw)
To: u-boot
On Sat, Sep 14, 2019 at 8:22 AM Stefano Babic <sbabic@denx.de> wrote:
...
> Otavio, I am also fine if you send a follow-up patch to fix it - your
> decision.
Anatolij sent a fix already. I acked it and copied you.
--
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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support
2019-09-14 12:16 ` [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
@ 2019-09-14 12:18 ` Stefano Babic
0 siblings, 0 replies; 14+ messages in thread
From: Stefano Babic @ 2019-09-14 12:18 UTC (permalink / raw)
To: u-boot
On 14/09/19 14:16, Otavio Salvador wrote:
> On Sat, Sep 14, 2019 at 8:22 AM Stefano Babic <sbabic@denx.de> wrote:
> ...
>> Otavio, I am also fine if you send a follow-up patch to fix it - your
>> decision.
>
> Anatolij sent a fix already. I acked it and copied you.
>
Yes, thanks - I apply it directly on top ofimx tree.
Regards,
Stefano
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues
2019-09-14 11:43 ` [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues Anatolij Gustschin
2019-09-14 12:14 ` Otavio Salvador
@ 2019-09-14 12:18 ` Fabio Estevam
2019-09-14 12:24 ` Anatolij Gustschin
2019-09-14 12:26 ` Stefano Babic
1 sibling, 2 replies; 14+ messages in thread
From: Fabio Estevam @ 2019-09-14 12:18 UTC (permalink / raw)
To: u-boot
Hi Anatolij,
On Sat, Sep 14, 2019 at 8:43 AM Anatolij Gustschin <agust@denx.de> wrote:
>
> Fixes:
> board/technexion/pico-imx6ul/spl.c: In function 'board_mmc_init':
> error: implicit declaration of function 'fsl_esdhc_initialize'
>
> and a simmilar error when building pico-dwarf-imx7d.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> ---
> configs/pico-dwarf-imx6ul_defconfig | 2 +-
> configs/pico-dwarf-imx7d_defconfig | 2 +-
It seems that configs/pico-nymph-imx7d_defconfig conversion is missing.
I haven't seen your patch earlier and also sent a fix:
https://lists.denx.de/pipermail/u-boot/2019-September/383582.html
Thanks
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues
2019-09-14 12:18 ` Fabio Estevam
@ 2019-09-14 12:24 ` Anatolij Gustschin
2019-09-14 12:26 ` Stefano Babic
1 sibling, 0 replies; 14+ messages in thread
From: Anatolij Gustschin @ 2019-09-14 12:24 UTC (permalink / raw)
To: u-boot
Hi Fabio, Stefano,
On Sat, 14 Sep 2019 09:18:22 -0300
Fabio Estevam festevam at gmail.com wrote:
...
> > configs/pico-dwarf-imx6ul_defconfig | 2 +-
> > configs/pico-dwarf-imx7d_defconfig | 2 +-
>
> It seems that configs/pico-nymph-imx7d_defconfig conversion is missing.
Yes, somehow I forgot to fix this one. Thanks for paying attention!
> I haven't seen your patch earlier and also sent a fix:
> https://lists.denx.de/pipermail/u-boot/2019-September/383582.html
OK, thanks!
--
Anatolij
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues
2019-09-14 12:18 ` Fabio Estevam
2019-09-14 12:24 ` Anatolij Gustschin
@ 2019-09-14 12:26 ` Stefano Babic
1 sibling, 0 replies; 14+ messages in thread
From: Stefano Babic @ 2019-09-14 12:26 UTC (permalink / raw)
To: u-boot
Hi Fabio, Anatolji,
thanks both.
On 14/09/19 14:18, Fabio Estevam wrote:
> Hi Anatolij,
>
> On Sat, Sep 14, 2019 at 8:43 AM Anatolij Gustschin <agust@denx.de> wrote:
>>
>> Fixes:
>> board/technexion/pico-imx6ul/spl.c: In function 'board_mmc_init':
>> error: implicit declaration of function 'fsl_esdhc_initialize'
>>
>> and a simmilar error when building pico-dwarf-imx7d.
>>
>> Signed-off-by: Anatolij Gustschin <agust@denx.de>
>> Cc: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>> configs/pico-dwarf-imx6ul_defconfig | 2 +-
>> configs/pico-dwarf-imx7d_defconfig | 2 +-
>
> It seems that configs/pico-nymph-imx7d_defconfig conversion is missing.
>
> I haven't seen your patch earlier and also sent a fix:
> https://lists.denx.de/pipermail/u-boot/2019-September/383582.html
>
> Thanks
Yes, I applied Fabio's and I am letting now Travis running.
Regards,
Stefano
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-09-14 12:26 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-12 19:01 [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 2/5] pico-imx6ul: Increase the CONFIG_ENV_OFFSET size Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 3/5] pico-imx6ul: Add LCD support Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 4/5] pico-imx6ul: Update the Falcon mode instructions Otavio Salvador
2019-09-12 19:01 ` [U-Boot] [PATCH 5/5] pico-imx6ul: Provide a way to escape the Falcon mode Otavio Salvador
2019-09-14 10:47 ` [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Anatolij Gustschin
2019-09-14 11:22 ` Stefano Babic
2019-09-14 11:43 ` [U-Boot] [PATCH] imx: fix pico-dwarf-imx6ul and pico-dwarf-imx7d build issues Anatolij Gustschin
2019-09-14 12:14 ` Otavio Salvador
2019-09-14 12:18 ` Fabio Estevam
2019-09-14 12:24 ` Anatolij Gustschin
2019-09-14 12:26 ` Stefano Babic
2019-09-14 12:16 ` [U-Boot] [PATCH 1/5] pico-imx6ul: Add DWARF baseboard support Otavio Salvador
2019-09-14 12:18 ` Stefano Babic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.