summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-05-10 13:11:19 +0200
committerMichal Simek <michal.simek@xilinx.com>2017-01-10 10:18:11 +0100
commit2902a9b7a932ada96d74f56eb765f5260ced4888 (patch)
treecc73d70d1c5b32991c5ca0da7eb5363257691777 /include/configs
parenta9fb35a8db0bdb8e67f4efbe95f1b8b4d275ba1b (diff)
microblaze: Enable option to overwrite default variables
Enable overwriting variables out of main config file. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/microblaze-generic.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 6b380f005e..36b0a0eb16 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -241,6 +241,7 @@
#define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv preboot;echo"
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" \
"nor0=flash-0\0"\
"mtdparts=mtdparts=flash-0:"\
@@ -250,6 +251,7 @@
"setenv stdin nc\0" \
"serial=setenv stdout serial;"\
"setenv stdin serial\0"
+#endif
#define CONFIG_CMDLINE_EDITING