]> code.ossystems Code Review - bsp/u-boot.git/commitdiff
mx6sabre_common: Place video related settings in common code
authorFabio Estevam <fabio.estevam@nxp.com>
Thu, 13 Jul 2017 19:57:56 +0000 (16:57 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Thu, 13 Jul 2017 20:14:00 +0000 (17:14 -0300)
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>
include/configs/mx6sabre_common.h
include/configs/mx6sabresd.h

index 61bf20dd8aef17fdb17a320ab02a9460ac49cd6b..729996281c7e5e532cb6cdb6f3cbdfba5bc771e0 100644 (file)
 
 #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" \
index cfa85fe05f581c7023f0b9f554dec14ccca17221..27e767241fbb91cdaf9697f81dcbc6fb72ddd1a5 100644 (file)
@@ -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 */