| Message ID | 1552340854-15710-1-git-send-email-offougajoris@gmail.com |
|---|---|
| State | Rejected |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot,V2] Revert "pico-imx7d: Add LCD support" | expand |
Hi On Mon, Mar 11, 2019 at 10:47 PM Joris Offouga <offougajoris@gmail.com> wrote: > > This reverts commit 9e3c0174da842dd88f5feaffbf843ba332233897. > > This commit breaks U-Boot when is load with imx-usb-loader. > > Signed-off-by: Joris Offouga <offougajoris@gmail.com> Can you try just define CONFIG_SYS_MALLOC_F_LEN=0x2000. What is the value on your platform? we found it important on some SPL boot scenario Michael > --- > 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_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 > > -- > 2.7.4 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
> Le 12/03/2019 à 19:29, Michael Nazzareno Trimarchi a écrit : > Hi Hi Michael, >> >> On Mon, Mar 11, 2019 at 10:47 PM Joris Offouga <offougajoris@gmail.com> wrote: >> This reverts commit 9e3c0174da842dd88f5feaffbf843ba332233897. >> >> This commit breaks U-Boot when is load with imx-usb-loader. >> >> Signed-off-by: Joris Offouga <offougajoris@gmail.com> > Can you try just define CONFIG_SYS_MALLOC_F_LEN=0x2000. > What is the value on your platform? we found it important on some SPL boot > scenario You were right in increasing the size of that fixed bug, the old size was 0x400 Hi Fabio, I send patch with this correctif ? Best Regards, Joris Offouga > > Michael > > >> --- >> 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_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 >> >> -- >> 2.7.4 >> >> _______________________________________________ >> U-Boot mailing list >> U-Boot@lists.denx.de >> https://lists.denx.de/listinfo/u-boot
Hi Joris, On Wed, Mar 13, 2019 at 8:35 AM jorisoffouga <offougajoris@gmail.com> wrote: > You were right in increasing the size of that fixed bug, the old size was 0x400 > > Hi Fabio, > > I send patch with this correctif ? Excellent, please send a patch that increases CONFIG_SYS_MALLOC_F_LEN. Also add the following tag to the patch: Suggested-by: Michael Trimarchi <michael@amarulasolutions.com> Also, does this help on the I2C and DFU issues in your DM conversion series? Thanks
Hi On Wed., 13 Mar. 2019, 12:39 pm Fabio Estevam, <festevam@gmail.com> wrote: > Hi Joris, > > On Wed, Mar 13, 2019 at 8:35 AM jorisoffouga <offougajoris@gmail.com> > wrote: > > > You were right in increasing the size of that fixed bug, the old size > was 0x400 > > > > Hi Fabio, > > > > I send patch with this correctif ? > > Excellent, please send a patch that increases CONFIG_SYS_MALLOC_F_LEN. > > Also add the following tag to the patch: > > Suggested-by: Michael Trimarchi <michael@amarulasolutions.com> > > Also, does this help on the I2C and DFU issues in your DM conversion > series? > Strongly suggest to increase for imx family or update all dm converted board from nxp Michael > > 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
This reverts commit 9e3c0174da842dd88f5feaffbf843ba332233897. This commit breaks U-Boot when is load with imx-usb-loader. Signed-off-by: Joris Offouga <offougajoris@gmail.com> --- 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(-)