| Message ID | 1552243936-29753-1-git-send-email-offougajoris@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot] Revert "pico-imx7d: Add LCD support" | expand |
Hi Joris, On Sun, Mar 10, 2019 at 3:52 PM Joris Offouga <offougajoris@gmail.com> wrote: > > This reverts commit 9e3c0174da842dd88f5feaffbf843ba332233897. > This commit causes the crash of U-Boot when loaded with imx-usb-loader Your Signed-off-by line is missing.
> Le 11 mars 2019 à 14:42, Fabio Estevam <festevam@gmail.com> a écrit : > > Hi Joris, > >> On Sun, Mar 10, 2019 at 3:52 PM Joris Offouga <offougajoris@gmail.com> wrote: >> >> This reverts commit 9e3c0174da842dd88f5feaffbf843ba332233897. >> This commit causes the crash of U-Boot when loaded with imx-usb-loader > > Your Signed-off-by line is missing. Hi Fabio, i add for v2 Thanks
Hi Joris, 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 > 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" > 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/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h > index 0f6d6b7..1884c58 100644 > --- a/include/configs/pico-imx7d.h > +++ b/include/configs/pico-imx7d.h > @@ -64,12 +64,10 @@ > #define CONFIG_EXTRA_ENV_SETTINGS \ > "script=boot.scr\0" \ > "image=zImage\0" \ > - "splashpos=m,m\0" \ > "console=ttymxc4\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" \ > @@ -133,16 +131,6 @@ > #define CONFIG_POWER_PFUZE3000 > #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 > > -#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 > -#endif > - > /* FLASH and environment organization */ > #define CONFIG_ENV_SIZE SZ_8K > >
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 >> +++ 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" >> 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/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h >> index 0f6d6b7..1884c58 100644 >> --- a/include/configs/pico-imx7d.h >> +++ b/include/configs/pico-imx7d.h >> @@ -64,12 +64,10 @@ >> #define CONFIG_EXTRA_ENV_SETTINGS \ >> "script=boot.scr\0" \ >> "image=zImage\0" \ >> - "splashpos=m,m\0" \ >> "console=ttymxc4\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" \ >> @@ -133,16 +131,6 @@ >> #define CONFIG_POWER_PFUZE3000 >> #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 >> >> -#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 >> -#endif >> - >> /* FLASH and environment organization */ >> #define CONFIG_ENV_SIZE SZ_8K >> >> >
Hi Joris, On Mon, Mar 11, 2019 at 3:27 PM Joris Offouga <offougajoris@gmail.com> 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. Thanks
On Mon, Mar 11, 2019 at 4:05 PM Fabio Estevam <festevam@gmail.com> wrote: > On Mon, Mar 11, 2019 at 3:27 PM Joris Offouga <offougajoris@gmail.com> > 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. > I agreed, reverting it for now and finish the convertion so we can look at it later.
Le 11/03/2019 à 20:04, Fabio Estevam a écrit : > Hi Joris, > > On Mon, Mar 11, 2019 at 3:27 PM Joris Offouga <offougajoris@gmail.com> 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
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" 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/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 0f6d6b7..1884c58 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -64,12 +64,10 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ - "splashpos=m,m\0" \ "console=ttymxc4\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" \ @@ -133,16 +131,6 @@ #define CONFIG_POWER_PFUZE3000 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 -#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 -#endif - /* FLASH and environment organization */ #define CONFIG_ENV_SIZE SZ_8K