The zynq-common.h header file is usually included last in the board specific header file. Check if the CONFIG_EXTRA_ENV_SETTINGS variable is set before applying the default value. This makes it easier for a board to set a board specific environment.

Cc: Michal Simek michal.simek@xilinx.com Signed-off-by: Philip Balister philip@opensdr.com --- 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 9ff3df2..ea8b0b0 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -205,6 +205,7 @@ #endif

/* Default environment */ +#ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "fit_image=fit.itb\0" \ "load_addr=0x2000000\0" \ @@ -227,6 +228,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 */