[U-Boot] [PATCH 12/19] samsung: board: lcd menu: check if any power framework is enabled

Przemyslaw Marczak p.marczak at samsung.com
Wed Oct 8 22:48:48 CEST 2014


The lcd menu requires pmic framework to get the power key state.
Now two pmic frameworks are available - the old one and the new
one based on a driver-model.

Signed-off-by: Przemyslaw Marczak <p.marczak at samsung.com>
---
 board/samsung/common/board.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index e4cddc2..450740a 100644
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -348,7 +348,8 @@ int misc_init_r(void)
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 	set_board_info();
 #endif
-#ifdef CONFIG_LCD_MENU
+#if defined(CONFIG_LCD_MENU) && (defined(CONFIG_POWER) || \
+				 defined(CONFIG_DM_PMIC))
 	keys_init();
 	check_boot_mode();
 #endif
-- 
1.9.1



More information about the U-Boot mailing list