Signed-off-by: Przemyslaw Marczak <p.marc...@samsung.com> Acked-by: Lukasz Majewski <l.majew...@samsung.com>
--- changes v2: - add definitions to check keys - cleanup config definitions - add acked-by Changes v3: - remove CONFIG_BOARD_NAME from include/configs/trats.h Changes v4: - none Changes v5: - none Changes v6: - trats.c : call boot menu from board file. board/samsung/trats/trats.c | 5 +++++ include/configs/trats.h | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index 32a6cee..c6664e7 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -28,6 +28,7 @@ #include <power/max17042_fg.h> #include <usb.h> #include <usb_mass_storage.h> +#include <samsung/misc.h> #include "setup.h" @@ -790,6 +791,10 @@ void init_panel_info(vidinfo_t *vid) #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { +#ifdef CONFIG_LCD_MENU + keys_init(); + check_boot_mode(); +#endif #ifdef CONFIG_CMD_BMP if (panel_info.logo_on) draw_logo(); diff --git a/include/configs/trats.h b/include/configs/trats.h index f5e796a..1de971c 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -307,6 +307,28 @@ #define CONFIG_MISC_INIT_R +/* Download menu - Samsung common */ +#define CONFIG_LCD_MENU +#define CONFIG_LCD_MENU_BOARD + +/* Download menu - definitions for check keys */ +#ifndef __ASSEMBLY__ +#include <power/max8997_pmic.h> + +#define KEY_PWR_PMIC_NAME "MAX8997_PMIC" +#define KEY_PWR_STATUS_REG MAX8997_REG_STATUS1 +#define KEY_PWR_STATUS_MASK (1 << 0) +#define KEY_PWR_INTERRUPT_REG MAX8997_REG_INT1 +#define KEY_PWR_INTERRUPT_MASK (1 << 0) + +#define KEY_VOL_UP_GPIO exynos4_gpio_get(2, x2, 0) +#define KEY_VOL_DOWN_GPIO exynos4_gpio_get(2, x2, 1) +#endif /* __ASSEMBLY__ */ + +/* LCD console */ +#define LCD_BPP LCD_COLOR16 +#define CONFIG_SYS_WHITE_ON_BLACK + /* LCD */ #define CONFIG_EXYNOS_FB #define CONFIG_LCD -- 1.7.9.5 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot