# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1584215084 0
# Node ID b4fb0c7dfdf4cece7b49e7f0eabd21b75fa0b773
# Parent  5d1c186cc3cf432ba1271dcba103e6428b8965a9
fluid-mnf: added -oC option to use cmd39.m0 for Calypso C05

diff -r 5d1c186cc3cf -r b4fb0c7dfdf4 fluid-mnf/fluid.c
--- a/fluid-mnf/fluid.c	Sat Mar 14 19:33:52 2020 +0000
+++ b/fluid-mnf/fluid.c	Sat Mar 14 19:44:44 2020 +0000
@@ -63,6 +63,7 @@
 
 int  arg_target_reset = 1;
 int  arg_rom_bootloader = 0;
+int  arg_calypso_c05 = 0;
 int  arg_boot_delay_rom = 15;
 int  arg_boot_delay_fluid = 15;
 int  arg_device_id0 = -1;
@@ -448,6 +449,7 @@
         "  -o <char>  Extra options:\n"
         "               o = Only bootstrap using ROM boot loader (Calypso devices only)\n"
         "               O = Do NOT use ROM boot loader\n"
+        "               C = use cmd39.m0 for Calypso C05\n"
         "               e = Skip erase (Require empty flash)\n"
         "               r = Reset target after download (default)\n"
         "               R = Do NOT reset target after download\n"
@@ -588,6 +590,7 @@
                 case 'r': arg_target_reset = 2; break;
                 case 'o': arg_rom_bootloader = 1; break;
                 case 'O': arg_rom_bootloader = -1; break;
+                case 'C': arg_calypso_c05 = 1; break;
                 case 'l': arg_uart_level_convert = 1; break;
                 case 'b':
                 case 'm': arg_hexfile_type = *optarg; break;
diff -r 5d1c186cc3cf -r b4fb0c7dfdf4 fluid-mnf/fluid.h
--- a/fluid-mnf/fluid.h	Sat Mar 14 19:33:52 2020 +0000
+++ b/fluid-mnf/fluid.h	Sat Mar 14 19:44:44 2020 +0000
@@ -134,6 +134,7 @@
 
 extern int  arg_target_reset;
 extern int  arg_rom_bootloader;
+extern int  arg_calypso_c05;
 extern int  arg_boot_delay_rom;
 extern int  arg_boot_delay_fluid;
 extern int  arg_device_id0;
diff -r 5d1c186cc3cf -r b4fb0c7dfdf4 fluid-mnf/machine.c
--- a/fluid-mnf/machine.c	Sat Mar 14 19:33:52 2020 +0000
+++ b/fluid-mnf/machine.c	Sat Mar 14 19:44:44 2020 +0000
@@ -411,6 +411,8 @@
     // Read the command interpreter image file.
     if (bootloader_is_secure_rom)
         target_program_size = file_read_cmd(target_program, TARGET_PROGRAM_SIZE_MAX, a_certified_cmd_file_name);
+    else if (arg_calypso_c05)
+        target_program_size = file_read_cmd(target_program, TARGET_PROGRAM_SIZE_MAX, "cmd39.m0");
     else
         target_program_size = file_read_cmd(target_program, TARGET_PROGRAM_SIZE_MAX, "cmd.m0");