diff options
author | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
commit | c4d376fd1c2bce8d64cec0431dd3f24957b6dec4 (patch) | |
tree | de17e3a67fa4a48f3b9571bff2399cb0a24558bc /board/samsung/universal_c210/universal.c | |
parent | b1ad03c242dae3712b9be66026f5d8c6f919c00b (diff) | |
parent | 5e77a745b24d9b98aa635293972f04fd6f0c6b38 (diff) | |
download | u-boot-imx-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.zip u-boot-imx-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.tar.gz u-boot-imx-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/samsung/universal_c210/universal.c')
-rw-r--r-- | board/samsung/universal_c210/universal.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index 3feef3f..96da7e0 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -22,6 +22,7 @@ #include <usb/s3c_udc.h> #include <asm/arch/cpu.h> #include <power/max8998_pmic.h> +#include <samsung/misc.h> DECLARE_GLOBAL_DATA_PTR; @@ -446,7 +447,7 @@ vidinfo_t panel_info = { .vl_vsp = CONFIG_SYS_HIGH, .vl_dp = CONFIG_SYS_HIGH, - .vl_bpix = 5, /* Bits per pixel */ + .vl_bpix = 4, /* Bits per pixel */ /* LD9040 LCD Panel */ .vl_hspw = 2, @@ -511,3 +512,21 @@ int board_init(void) return 0; } + +#ifdef CONFIG_MISC_INIT_R +int misc_init_r(void) +{ +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + set_board_info(); +#endif +#ifdef CONFIG_LCD_MENU + keys_init(); + check_boot_mode(); +#endif +#ifdef CONFIG_CMD_BMP + if (panel_info.logo_on) + draw_logo(); +#endif + return 0; +} +#endif |