#include <netdev.h>
#include <mmc.h>
#include <mxcfb.h>
+#include <video_fb.h>
#include <linux/list.h>
#include <linux/fb.h>
#include <asm/io.h>
int board_init(void)
{
- if (ctrlc()) {
+ if (ctrlc())
printf("CTRL-C detected; safeboot enabled\n");
- return 1;
- }
/* Address of boot parameters */
#ifdef CONFIG_OF_LIBFDT
};
#ifdef CONFIG_LCD
-static ushort tx28_cmap[256];
vidinfo_t panel_info = {
/* set to max. size supported by SoC */
.vl_col = 1600,
.vl_row = 1200,
.vl_bpix = LCD_COLOR32, /* Bits per pixel, 0: 1bpp, 1: 2bpp, 2: 4bpp, 3: 8bpp ... */
- .cmap = tx28_cmap,
};
static struct fb_videomode tx28_fb_modes[] = {
{ TX28_LCD_BACKLIGHT_GPIO, GPIOFLAG_OUTPUT_INIT_HIGH, "LCD BACKLIGHT", },
};
-extern void video_hw_init(void *lcdbase);
-
void lcd_ctrl_init(void *lcdbase)
{
int color_depth = 24;
setenv("videomode", vmode);
debug("Initializing LCD controller\n");
- video_hw_init(lcdbase);
+ video_hw_init();
setenv("videomode", NULL);
} else {
debug("Skipping initialization of LCD controller\n");
} else {
printf("WARNING: Unsupported baseboard: '%s'\n",
baseboard);
- ret = -EINVAL;
+ if (!had_ctrlc())
+ ret = -EINVAL;
}
exit: