[U-Boot] [PATCH v2 1/2] spl: mmc: fix switch statement
If CONFIG_SPL_LIBCOMMON_SUPPORT is not defined there is a lone case statement at the end of the switch leading to a compile error. Remove the offending case statement.
| common/spl/spl_mmc.c:339:7: error: label at end of compound statement
Signed-off-by: Max Krummenacher max.krummenacher@toradex.com Reviewed-by: Tom Rini trini@konsulko.com Acked-by: Marek Vasut marex@denx.de
---
Changes in v2: - dropped patch 'mx6: synchronize SPL to u-boot offset'. Dependent on the bootmedia that offset might change, so provide it from the board config. - added Acked and Reviewed by to 'spl: mmc: fix switch statement'
common/spl/spl_mmc.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index c674e61..367b4e4 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -342,7 +342,6 @@ static int spl_mmc_load_image(struct spl_image_info *spl_image, return err;
break; - case MMCSD_MODE_UNDEFINED: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT default: puts("spl: mmc: wrong boot mode\n");
The ipu has two display interfaces. Make the used one a parameter in struct display_info_t instead of using unconditionally DI0. DI0 is the default setting.
Signed-off-by: Max Krummenacher max.krummenacher@toradex.com
---
Changes in v2: - none
arch/arm/imx-common/video.c | 2 +- arch/arm/include/asm/imx-common/video.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c index fdc987f..549bf9d 100644 --- a/arch/arm/imx-common/video.c +++ b/arch/arm/imx-common/video.c @@ -34,7 +34,7 @@ int board_video_skip(void) }
if (i < display_count) { - ret = ipuv3_fb_init(&displays[i].mode, 0, + ret = ipuv3_fb_init(&displays[i].mode, displays[i].di ? 1 : 0, displays[i].pixfmt); if (!ret) { if (displays[i].enable) diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h index cad5f86..941a031 100644 --- a/arch/arm/include/asm/imx-common/video.h +++ b/arch/arm/include/asm/imx-common/video.h @@ -12,6 +12,7 @@ struct display_info_t { int bus; int addr; int pixfmt; + int di; int (*detect)(struct display_info_t const *dev); void (*enable)(struct display_info_t const *dev); struct fb_videomode mode;
On 11/01/2016 07:04 AM, Max Krummenacher wrote:
The ipu has two display interfaces. Make the used one a parameter in struct display_info_t instead of using unconditionally DI0. DI0 is the default setting.
Signed-off-by: Max Krummenacher max.krummenacher@toradex.com
Changes in v2:
- none
arch/arm/imx-common/video.c | 2 +- arch/arm/include/asm/imx-common/video.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c index fdc987f..549bf9d 100644 --- a/arch/arm/imx-common/video.c +++ b/arch/arm/imx-common/video.c @@ -34,7 +34,7 @@ int board_video_skip(void) }
if (i < display_count) {
ret = ipuv3_fb_init(&displays[i].mode, 0,
ret = ipuv3_fb_init(&displays[i].mode, displays[i].di ? 1 : 0, displays[i].pixfmt);diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h index cad5f86..941a031 100644 --- a/arch/arm/include/asm/imx-common/video.h +++ b/arch/arm/include/asm/imx-common/video.h @@ -12,6 +12,7 @@ struct display_info_t { int bus; int addr; int pixfmt;
- int di; int (*detect)(struct display_info_t const *dev); void (*enable)(struct display_info_t const *dev); struct fb_videomode mode;
Reviewed-by: Eric Nelson eric@nelint.com
On 01/11/2016 15:04, Max Krummenacher wrote:
The ipu has two display interfaces. Make the used one a parameter in struct display_info_t instead of using unconditionally DI0. DI0 is the default setting.
Signed-off-by: Max Krummenacher max.krummenacher@toradex.com
Applied to u-boot-imx, thanks !
Best regards, Stefano Babic
participants (3)
-
Eric Nelson -
Max Krummenacher -
Stefano Babic