From f5f42f39f35568ea380bb4190b4ff155cc7cb151 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 13 Jul 2017 16:57:56 -0300 Subject: [PATCH] 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 Signed-off-by: Otavio Salvador --- include/configs/mx6sabre_common.h | 9 ++------- include/configs/mx6sabresd.h | 3 --- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 61bf20dd8a..729996281c 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -61,13 +61,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 cfa85fe05f..27e767241f 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 */ -- 2.40.1