From 2902a9b7a932ada96d74f56eb765f5260ced4888 Mon Sep 17 00:00:00 2001
From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 10 May 2016 13:11:19 +0200
Subject: [PATCH] microblaze: Enable option to overwrite default variables
Enable overwriting variables out of main config file.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
include/configs/microblaze-generic.h | 2 ++
1 file changed, 2 insertions(+)
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
--
2.39.5