summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoy Cho <joy.cho@hardkernel.com>2018-01-16 06:51:04 +0300
committerGerrit Code Review <gerrit@almond.hardkernel.com>2018-01-16 06:51:04 +0300
commit2e4380b16e671c2822343ad17aac318d4c6e539b (patch)
tree4a12ca6411a01fe723000f87b6bfc2b9e6e8374b
parent9dccda79460d460be77f8567861c331eb8451046 (diff)
parent54c28ea7543c84cb913d505feb5e3e1c392bddb7 (diff)
downloadu-boot-2e4380b16e671c2822343ad17aac318d4c6e539b.tar.xz
Merge "Revert "ODROID-C2: adjust showlogo logic"" into odroidc2-v2015.01s905_6.0.1_v3.7
-rw-r--r--common/cmd_showlogo.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/common/cmd_showlogo.c b/common/cmd_showlogo.c
index db8f3bdad8..0cd71f82f6 100644
--- a/common/cmd_showlogo.c
+++ b/common/cmd_showlogo.c
@@ -66,10 +66,6 @@ static int display_logo(const char* mode, const char* bmp_width, const char* bmp
for (i = 0; i < ARRAY_SIZE(c2_res_list); ++i) {
if (!strcmp(c2_res_list[i].name, mode)) {
if (!strcmp(mode, "custombuilt")) {
- if (NULL == getenv("customwidth")) {
- setenv("customwidth", "1920");
- setenv("customheight", "1080");
- }
setenv("display_width", getenv("customwidth"));
setenv("display_height", getenv("customheight"));
} else {
@@ -120,24 +116,11 @@ display_logo:
setenv("fb_width", bmp_width);
setenv("fb_height", bmp_height);
+ if (NULL == getenv("vout_mode"))
+ setenv("vout_mode", "hdmi");
+
run_command("hdmitx hpd; osd open; osd clear", 0);
- run_command("vout output ${outputmode}", 0);
- /*
- * The env parameter to switch hdmi or dvi is defined differently
- * on Ubuntu and Android.
- * To distinguish os system, an env "androidopt" will be used.
- */
- if ((NULL == getenv("vout")) && (NULL == getenv("vout_mode")))
- run_command("hdmitx mode hdmi", 0);
- else if (NULL == getenv("androidopt"))
- run_command("hdmitx mode ${vout}", 0); /* Ubuntu */
- else
- run_command("hdmitx mode ${vout_mode}", 0); /* Android */
-
- if (!strcmp(mode, "custombuilt"))
- run_command("hdmitx output 1080p60hz", 0);
- else
- run_command("hdmitx output ${outputmode}", 0);
+ run_command("vout output ${outputmode}; hdmitx mode ${vout_mode}; hdmitx output ${outputmode}", 0);
run_command("bmp display ${bootlogo_addr}", 0);
run_command("bmp scale", 0);
run_command("setenv logoopt ${display_layer},loaded,${fb_addr},${hdmimode}", 0);