[U-Boot] [PATCH v2 16/25] exynos: Allow CONFIG_MISC_COMMON to be build without an LCD

Simon Glass
2016-02-22T04:08:53Z

This file currently requires LCD support. Adjust it so that it can still be
built without LCD support (even thought it won't work fully).

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

board/samsung/common/misc.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index da0d4db..77d0a4e 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -147,6 +147,7 @@ static int key_pressed(int key)
return value;
}

+#ifdef CONFIG_LCD
static int check_keys(void)
{
int keys = 0;
@@ -235,9 +236,11 @@ static void display_board_info(void)

lcd_printf("\tDisplay BPP: %u\n", 1 << vid->vl_bpix);
}
+#endif

static int mode_leave_menu(int mode)
{
+#ifdef CONFIG_LCD
char *exit_option;
char *exit_reset = "reset";
char *exit_back = "back";
@@ -301,8 +304,12 @@ static int mode_leave_menu(int mode)

lcd_clear();
return leave;
+#else
+ return 0;
+#endif
}

+#ifdef CONFIG_LCD
static void display_download_menu(int mode)
{
char *selection[BOOT_MODE_EXIT + 1];
@@ -320,9 +327,11 @@ static void display_download_menu(int mode)
lcd_printf("\t%s %s - %s\n\n", selection[i],
mode_name[i][0], mode_info[i]);
}
+#endif

static void download_menu(void)
{
+#ifdef CONFIG_LCD
int mode = 0;
int last_mode = 0;
int run;
@@ -393,6 +402,7 @@ static void download_menu(void)
}

lcd_clear();
+#endif
}

void check_boot_mode(void)
--
2.7.0.rc3.207.g0ac5344