From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Thu, 13 Jul 2017 19:57:56 +0000 (-0300)
Subject: mx6sabre_common: Place video related settings in common code
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9b412b485aa06e4eca76615b92871e24e24c0394;p=bsp%2Fu-boot.git

mx6sabre_common: Place video related settings in common code

Currently mx6sabreauto fails to find the environment variables like this:

## Error: "findfdt" not defined
switch to partitions #0, OK
mmc0 is current device
## Error: "loadbootscript" not defined
## Error: "loadimage" not defined
## Error: "netboot" not defined

Move VIDEO_ARGS/VIDEO_ARGS_SCRIPT so that they can be shared among sabresd
and sabreauto boards.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index e75e1edbfe..87a24f39ad 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -60,13 +60,8 @@
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
-#ifndef VIDEO_ARGS
-#define VIDEO_ARGS ""
-#endif
-
-#ifndef VIDEO_ARGS_SCRIPT
-#define VIDEO_ARGS_SCRIPT ""
-#endif
+#define VIDEO_ARGS        "${video_args}"
+#define VIDEO_ARGS_SCRIPT "run video_args_script; "
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 211f66260f..8c06512dc7 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -19,9 +19,6 @@
 
 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
 
-#define VIDEO_ARGS        "${video_args}"
-#define VIDEO_ARGS_SCRIPT "run video_args_script; "
-
 #include "mx6sabre_common.h"
 
 /* Falcon Mode */