Index: boot/generic/align.h
===================================================================
--- boot/generic/align.h	(revision 85156d302a086103852bf03ded648aeb26304afa)
+++ boot/generic/align.h	(revision e662a5f4f15083bb24a483054e771e47c59e9865)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup generic
  * @{
  */
Index: boot/generic/macros.h
===================================================================
--- boot/generic/macros.h	(revision 85156d302a086103852bf03ded648aeb26304afa)
+++ boot/generic/macros.h	(revision e662a5f4f15083bb24a483054e771e47c59e9865)
@@ -36,12 +36,15 @@
 #define BOOT_MACROS_H_
 
-#define SIZE2KB(size) ((size) >> 10)
-#define SIZE2MB(size) ((size) >> 20)
+#define min(a, b)  ((a) < (b) ? (a) : (b))
+#define max(a, b)  ((a) > (b) ? (a) : (b))
 
-#define KB2SIZE(kb) ((kb) << 10)
-#define MB2SIZE(mb) ((mb) << 20)
+#define SIZE2KB(size)  ((size) >> 10)
+#define SIZE2MB(size)  ((size) >> 20)
 
-#define STRING(arg) STRING_ARG(arg)
-#define STRING_ARG(arg) #arg
+#define KB2SIZE(kb)  ((kb) << 10)
+#define MB2SIZE(mb)  ((mb) << 20)
+
+#define STRING(arg)      STRING_ARG(arg)
+#define STRING_ARG(arg)  #arg
 
 #endif