Add the nand device support for cbootimage tool.

data_layout.c

 /**
  * Copyright (c) 2011 NVIDIA Corporation.  All rights reserved.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License, or (at your option) any later version.
@@ skipping 61 matching lines @@
 static void
 set_bl_data(build_image_context *context,
                         u_int32_t instance,
                         u_int32_t start_blk,
                         u_int32_t start_page,
                         u_int32_t length);
 
 static int write_bootloaders(build_image_context *context);
 
 static void find_new_journal_blk(build_image_context *context);
-static int begin_update (build_image_context *context);
 static int finish_update(build_image_context *context);
 static u_int32_t
 iceil_log2(u_int32_t a, u_int32_t b)
 {
         return (a + (1 << b) - 1) >> b;
 }
 
 static block_data *new_block(u_int32_t blk_number, u_int32_t block_size)
 {
         block_data *new_block = malloc(sizeof(block_data));
@@ skipping 771 matching lines @@
  *       - Erase the new journal block
  *       - Write the good BCT to slot 0 of the new journal block.
  *     - If the journal block is full:
  *       - Erase block 0
  *       - Write 0's to BCT slot 0.
  *       - Write the good BCT to slot 1.
  *       - Erase the journal block.
  *       - Write the good BCT to slot 0 of the journal block.
  *   - Erase block 0
  */
-static int
+int
 begin_update(build_image_context *context)
 {
         u_int32_t pages_per_bct;
         u_int32_t pages_per_blk;
         u_int32_t bct_size;
         u_int32_t hash_size;
         u_int32_t reserved_size;
         u_int32_t reserved_offset;
         int e = 0;
 
         assert(context);
 
         /* Ensure that the BCT block & page data is current. */
         if (enable_debug) {
                 u_int32_t block_size_log2;
                 u_int32_t page_size_log2;
 
                 GET_VALUE(block_size_log2, &block_size_log2);
                 GET_VALUE(page_size_log2,  &page_size_log2);
 
                 printf("begin_update(): bct data: b=%d p=%d\n",
                         block_size_log2, page_size_log2);
         }
 
+        SET_VALUE(boot_data_version, NVBOOT_BOOTDATA_VERSION(2, 1));

[robotboy, 2011/03/03 18:08:46]

Similarly here, is this just a bug fix?

         GET_VALUE(bct_size,  &bct_size);
         GET_VALUE(hash_size, &hash_size);
         GET_VALUE(reserved_size, &reserved_size);
         GET_VALUE(reserved_offset, &reserved_offset);
 
         pages_per_bct = iceil_log2(bct_size, context->page_size_log2);
         pages_per_blk = (1 << (context->block_size_log2
                 - context->page_size_log2));
 
         /* Fill the reserved data w/the padding pattern. */
@@ skipping 112 matching lines @@
                         size_t bytes = pages_to_write * context->page_size;
 
                         if (fwrite(data, 1, bytes, context->raw_file) != bytes)
                                 return -1;
                 }
         }
 
         free(empty_blk);
         return 0;
 }