From b7b3efe75a46c3d6bff43b7b314d1fff90ca65ec Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Sat, 13 Feb 2016 11:50:03 +0100 Subject: [PATCH] ARM: zynq: Enable option to overwrite default variables Enable overwriting variables out of main config file. Signed-off-by: Michal Simek --- include/configs/zynq-common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 9d81b1d334..0a0517ceec 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -204,6 +204,7 @@ #endif /* Default environment */ +#ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "fit_image=fit.itb\0" \ "load_addr=0x2000000\0" \ @@ -226,6 +227,7 @@ "load usb 0 ${load_addr} ${fit_image} && " \ "bootm ${load_addr}; fi\0" \ DFU_ALT_INFO +#endif #define CONFIG_BOOTCOMMAND "run $modeboot" #define CONFIG_BOOTDELAY 3 /* -1 to Disable autoboot */ -- 2.25.1