summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoy Cho <joy.cho@hardkernel.com>2016-11-08 02:41:53 +0300
committerGerrit Code Review <gerrit@almond.hardkernel.com>2016-11-08 02:41:53 +0300
commit1471870b96fefee160eee1d911ae5dc42a5f83ef (patch)
tree061823840b393c1012e3d618c5dd912c6bfbe09b
parentf7ca09ee9810300fa389747a40fd6a19882862fd (diff)
parentbeaabc7cdc08dc593fb1d3eabeb8281f26039d01 (diff)
downloadu-boot-1471870b96fefee160eee1d911ae5dc42a5f83ef.tar.xz
Merge "ODROID-C2: Adjust checking cvbs routine and remove the needless log" into odroidc2-v2015.01s905_6.0.1_v1.1s905_6.0.1_v1.0s905_5.1.1_v2.7s905_5.1.1_v2.6s905_5.1.1_v2.5
-rw-r--r--common/cmd_vout.c3
-rw-r--r--drivers/display/vout/cvbs.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_vout.c b/common/cmd_vout.c
index b9e668c186..def6d17b33 100644
--- a/common/cmd_vout.c
+++ b/common/cmd_vout.c
@@ -55,7 +55,8 @@ static int do_vout_output(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv
return CMD_RET_FAILURE;
#ifdef CONFIG_AML_CVBS
- cvbs_set_vmode(argv[1]);
+ if (!strncmp(argv[1], "576cvbs", 7) || !strncmp(argv[1], "480cvbs", 7))
+ cvbs_set_vmode(argv[1]);
#endif
#ifdef CONFIG_AML_HDMITX20
diff --git a/drivers/display/vout/cvbs.c b/drivers/display/vout/cvbs.c
index cf152853f7..5fad743461 100644
--- a/drivers/display/vout/cvbs.c
+++ b/drivers/display/vout/cvbs.c
@@ -426,8 +426,7 @@ int cvbs_set_vmode(char* vmode_name)
cvbs_config_enci(1);
cvbs_config_clock();
cvbs_set_vdac(1);
- } else
- printf("[%s] is invalid for cvbs.\n", vmode_name);
+ }
return 0;
}