From: Simon Glass Date: Mon, 22 Feb 2016 04:08:53 +0000 (-0700) Subject: exynos: Allow CONFIG_MISC_COMMON to be build without an LCD X-Git-Tag: v2016.07-rc1~1^2~11 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=531a4a66424946968b28241adbb41165e78d6d26;p=oweals%2Fu-boot.git exynos: Allow CONFIG_MISC_COMMON to be build without an LCD 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 Signed-off-by: Minkyu Kang --- diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index da0d4db1f9..77d0a4e837 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)