1 files changed, 56 insertions, 0 deletions

diff --git a/cgpt/cgpt.c b/cgpt/cgpt.c
index a3b20d99..2851f7c5 100644
--- a/cgpt/cgpt.c
+++ b/cgpt/cgpt.c
@@ -18,6 +18,8 @@ const char* progname;
 const char* command;
 void (*uuid_generator)(uint8_t* buffer);
 
+extern struct nand_layout nand;
+
 struct {
   const char *name;
   int (*fp)(int argc, char *argv[]);
@@ -47,7 +49,40 @@ void Usage(void) {
   printf("\nFor more detailed usage, use %s COMMAND -h\n\n", progname);
 }
 
+static int is_pow2(size_t v) {
+  return v && (v & (v - 1)) == 0;
+}
 
+static int parse_nand_option(const char *arg) {
+  if ('=' != arg[0])
+    return -1;
+
+  arg++;
+  nand.bytes_per_page = atoi(arg);
+  arg = strchr(arg, ',');
+  if (!arg)
+    return -1;
+
+  arg++;
+  nand.pages_per_block = atoi(arg);
+  arg = strchr(arg, ',');
+  if (!arg)
+    return -1;
+
+  arg++;
+  nand.fts_block_offset = atoi(arg);
+  arg = strchr(arg, ',');
+  if (!arg)
+    return -1;
+
+  arg++;
+  nand.fts_block_size = atoi(arg);
+  if (nand.fts_block_size == 0 || !is_pow2(nand.pages_per_block) ||
+    !is_pow2(nand.bytes_per_page) || nand.bytes_per_page < 512) {
+    return -1;
+  }
+  return 0;
+}
 
 int main(int argc, char *argv[]) {
   int i;
@@ -62,6 +97,27 @@ int main(int argc, char *argv[]) {
   else
     progname = argv[0];
 
+
+  memset(&nand, 0, sizeof(nand));
+  for (i = 1; i < argc; ++i) {
+    if (0 == strncmp(argv[i], "-N", 2)) {
+      if (!parse_nand_option(argv[i] + 2)) {
+        int j;
+        nand.enabled = 1;
+
+        // Remove it form the list.
+        for (j = i; j < argc - 1; j++)
+          argv[j] = argv[j + 1];
+        argc--;
+        break;
+      }
+      // Bad nand config.
+      printf("Nand option must fit: -N=<bytes_per_page>,<pages_per_block>,"
+             "<block_offset_of_partition>,<block_size_of_partition>\n");
+      return CGPT_FAILED;
+    }
+  }
+
   if (argc < 2) {
     Usage();
     return CGPT_FAILED;