Commit 16fc32f introduced an error in include/environment.h, which makes u-boot
fail to compile due to a missing #endif.
This also fixes a merge conflict remaining in include/configs/EB+MCF-EV123.h
which was caused by the same commit
Signed-off-by: Albin Tonnerre <albin.tonne...@free-electrons.com>
---
include/configs/EB+MCF-EV123.h | 7 -------
include/environment.h | 1 +
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 1333a17..a0b27a8 100644
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -63,13 +63,6 @@
#define CONFIG_ENV_ADDR 0xF003C000 /* End of 256K */
#define CONFIG_ENV_SECT_SIZE 0x4000
#define CONFIG_ENV_IS_IN_FLASH 1
-<<<<<<< HEAD:include/configs/EB+MCF-EV123.h
-=======
-/*
-#define CONFIG_ENV_ADDR_REDUND 0xF0018000
-#define CONFIG_ENV_SECT_SIZE_REDUND 0x4000
-*/
->>>>>>> unify {CONFIG_,}ENV_IS_EMBEDDED:include/configs/EB+MCF-EV123.h
#else
#define CONFIG_ENV_ADDR 0xFFE04000
#define CONFIG_ENV_SECT_SIZE 0x2000
diff --git a/include/environment.h b/include/environment.h
index 6188457..b9924fd 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -100,6 +100,7 @@
!defined(CONFIG_ENV_IS_IN_NAND) && \
!defined(CONFIG_ENV_IS_IN_ONENAND)
# error "CONFIG_ENV_IS_EMBEDDED not supported for your flash type"
+# endif
#endif
/*
--
1.6.0.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
