Fix merge problems

[u-boot] / include / post.h

diff --git a/include/post.h b/include/post.h
index dfed24b48fa24ece301280c4b0682c3c457800a6..123623f5c85981cf465262916252303f0b47d3af 100644 (file)
--- a/include/post.h
+++ b/include/post.h
@@ -43,6 +43,7 @@
 #define POST_PREREL             0x1000  /* test runs before relocation */
 
 #define POST_CRITICAL          0x2000  /* Use failbootcmd if test failed */
+#define POST_STOP              0x4000  /* Interrupt POST sequence on fail */
 
 #define POST_MEM               (POST_RAM | POST_ROM)
 #define POST_ALWAYS            (POST_NORMAL    | \