summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 6b380f0..36b0a0e 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