Add VBDEBUG macro for debug output.

firmware/lib/cgptlib/cgptlib.c

Index: firmware/lib/cgptlib/cgptlib.c
diff --git a/firmware/lib/cgptlib/cgptlib.c b/firmware/lib/cgptlib/cgptlib.c
index 8b3b64895d6eb285b0c4c86f5618e2b6b332da10..a7f8d4e849c87db9248c2341c6530f422283bf30 100644
--- a/firmware/lib/cgptlib/cgptlib.c
+++ b/firmware/lib/cgptlib/cgptlib.c
@@ -23,7 +23,7 @@ int GptInit(GptData *gpt) {
 
   retval = GptSanityCheck(gpt);
   if (GPT_SUCCESS != retval) {
-    debug("GptInit() failed sanity check\n");
+    VBDEBUG(("GptInit() failed sanity check\n"));
     return retval;
   }
 
@@ -48,16 +48,16 @@ int GptNextKernelEntry(GptData* gpt, uint64_t* start_sector, uint64_t* size) {
       e = entries + i;
       if (!IsKernelEntry(e))
         continue;
-      debug("GptNextKernelEntry looking at same prio partition %d\n", i);
-      debug("GptNextKernelEntry s%d t%d p%d\n",
-            GetEntrySuccessful(e), GetEntryTries(e), GetEntryPriority(e));
+      VBDEBUG(("GptNextKernelEntry looking at same prio partition %d\n", i));
+      VBDEBUG(("GptNextKernelEntry s%d t%d p%d\n",
+               GetEntrySuccessful(e), GetEntryTries(e), GetEntryPriority(e)));
       if (!(GetEntrySuccessful(e) || GetEntryTries(e)))
         continue;
       if (GetEntryPriority(e) == gpt->current_priority) {
         gpt->current_kernel = i;
         *start_sector = e->starting_lba;
         *size = e->ending_lba - e->starting_lba + 1;
-        debug("GptNextKernelEntry likes that one\n");
+        VBDEBUG(("GptNextKernelEntry likes that one\n"));
         return GPT_SUCCESS;
       }
     }
@@ -69,9 +69,9 @@ int GptNextKernelEntry(GptData* gpt, uint64_t* start_sector, uint64_t* size) {
     int current_prio = GetEntryPriority(e);
     if (!IsKernelEntry(e))
       continue;
-    debug("GptNextKernelEntry looking at new prio partition %d\n", i);
-    debug("GptNextKernelEntry s%d t%d p%d\n",
-          GetEntrySuccessful(e), GetEntryTries(e), GetEntryPriority(e));
+    VBDEBUG(("GptNextKernelEntry looking at new prio partition %d\n", i));
+    VBDEBUG(("GptNextKernelEntry s%d t%d p%d\n",
+             GetEntrySuccessful(e), GetEntryTries(e), GetEntryPriority(e)));
     if (!(GetEntrySuccessful(e) || GetEntryTries(e)))
       continue;
     if (current_prio >= gpt->current_priority)
@@ -89,11 +89,11 @@ int GptNextKernelEntry(GptData* gpt, uint64_t* start_sector, uint64_t* size) {
   gpt->current_priority = new_prio;
 
   if (CGPT_KERNEL_ENTRY_NOT_FOUND == new_kernel) {
-    debug("GptNextKernelEntry no more kernels\n");
+    VBDEBUG(("GptNextKernelEntry no more kernels\n"));
     return GPT_ERROR_NO_VALID_KERNEL;
   }
 
-  debug("GptNextKernelEntry likes that one\n");
+  VBDEBUG(("GptNextKernelEntry likes that one\n"));
   e = entries + new_kernel;
   *start_sector = e->starting_lba;
   *size = e->ending_lba - e->starting_lba + 1;