| Message ID | 1480106573-101689-1-git-send-email-sven.ebenfeld@gmail.com |
|---|---|
| State | Accepted |
| Commit | 36c0627ba5efd602d9ca8ebaae06f30d1890a41a |
| Delegated to: | Stefano Babic |
| Headers | show |
On 25/11/2016 21:42, Sven Ebenfeld wrote: > When I tried to deactivate VIDEO support for the Wandboard, it still > tried to initialize the Framebuffer and so on. That is the reason for > the added ifdefs. CONFIG_VIDEO is enabled in the configuration as default > and therefore nothing changes for the default user. > > The structs mx6dl_i2c2_pad_info and mx6q_i2c2_pad_info are only available > when CONFIG_IPUV3 are set and should not be tried to access, when that > define is not defined. > > Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> > --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index b3f3b34..2c9dc8b 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -442,11 +442,13 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; +#if defined(CONFIG_VIDEO_IPUV3) setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info); if (is_mx6dq()) setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c2_pad_info); else setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info); +#endif return 0; } diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 8c5cf33..406591c 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -74,6 +74,7 @@ #define CONFIG_PHY_ATHEROS /* Framebuffer */ +#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN @@ -85,6 +86,7 @@ #define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP +#endif #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \
When I tried to deactivate VIDEO support for the Wandboard, it still tried to initialize the Framebuffer and so on. That is the reason for the added ifdefs. CONFIG_VIDEO is enabled in the configuration as default and therefore nothing changes for the default user. The structs mx6dl_i2c2_pad_info and mx6q_i2c2_pad_info are only available when CONFIG_IPUV3 are set and should not be tried to access, when that define is not defined. Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> --- board/wandboard/wandboard.c | 2 ++ include/configs/wandboard.h | 2 ++ 2 files changed, 4 insertions(+)