summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrzemyslaw Marczak <p.marczak@samsung.com>2014-01-22 11:24:19 +0100
committerMinkyu Kang <mk7.kang@samsung.com>2014-02-03 15:36:14 +0900
commitf64236a907acf852f9b0421497aa6563e10e1d37 (patch)
tree04bb6f26f3003e73c6bc15fcfd8e684abf14eee3
parent00e64ab6471e154a06d89bbfffba2bbe6e2150ad (diff)
downloadu-boot-imx-f64236a907acf852f9b0421497aa6563e10e1d37.zip
u-boot-imx-f64236a907acf852f9b0421497aa6563e10e1d37.tar.gz
u-boot-imx-f64236a907acf852f9b0421497aa6563e10e1d37.tar.bz2
trats2: add LCD download menu support
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--board/samsung/trats2/trats2.c5
-rw-r--r--include/configs/trats2.h22
-rw-r--r--include/power/pmic.h1
3 files changed, 27 insertions, 1 deletions
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index b60a2da..62e7fd2 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -28,6 +28,7 @@
#include <usb.h>
#include <usb/s3c_udc.h>
#include <usb_mass_storage.h>
+#include <samsung/misc.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -615,6 +616,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/trats2.h b/include/configs/trats2.h
index a97ecb2..095f253 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -322,6 +322,28 @@ int get_soft_i2c_sda_pin(void);
#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/max77686_pmic.h>
+
+#define KEY_PWR_PMIC_NAME "MAX77686_PMIC"
+#define KEY_PWR_STATUS_REG MAX77686_REG_PMIC_STATUS1
+#define KEY_PWR_STATUS_MASK (1 << 0)
+#define KEY_PWR_INTERRUPT_REG MAX77686_REG_PMIC_INT1
+#define KEY_PWR_INTERRUPT_MASK (1 << 1)
+
+#define KEY_VOL_UP_GPIO exynos4x12_gpio_get(2, x2, 2)
+#define KEY_VOL_DOWN_GPIO exynos4x12_gpio_get(2, x3, 3)
+#endif /* __ASSEMBLY__ */
+
+/* LCD console */
+#define LCD_BPP LCD_COLOR16
+#define CONFIG_SYS_WHITE_ON_BLACK
+
/* LCD */
#define CONFIG_EXYNOS_FB
#define CONFIG_LCD
diff --git a/include/power/pmic.h b/include/power/pmic.h
index 0e7aa31..8f282dd 100644
--- a/include/power/pmic.h
+++ b/include/power/pmic.h
@@ -8,7 +8,6 @@
#ifndef __CORE_PMIC_H_
#define __CORE_PMIC_H_
-#include <common.h>
#include <linux/list.h>
#include <i2c.h>
#include <power/power_chrg.h>