#define AO_USB_DESC_STRING 3
-struct sym ao_symbols[] = {
+struct ao_elf_sym ao_symbols[] = {
- { 0, 0x08002100, "ao_romconfig_version", 1 },
+ { 0, AO_BOOT_APPLICATION_BASE + 0x100, "ao_romconfig_version", 1 },
#define AO_ROMCONFIG_VERSION (ao_symbols[0].addr)
- { 0, 0x08002102, "ao_romconfig_check", 1 },
+ { 0, AO_BOOT_APPLICATION_BASE + 0x102, "ao_romconfig_check", 1 },
#define AO_ROMCONFIG_CHECK (ao_symbols[1].addr)
- { 0, 0x08002104, "ao_serial_number", 1 },
+ { 0, AO_BOOT_APPLICATION_BASE + 0x104, "ao_serial_number", 1 },
#define AO_SERIAL_NUMBER (ao_symbols[2].addr)
- { 0, 0x08002108, "ao_radio_cal", 0 },
+ { 0, AO_BOOT_APPLICATION_BASE + 0x108, "ao_radio_cal", 0 },
#define AO_RADIO_CAL (ao_symbols[3].addr)
- { 0, 0x0800210c, "ao_usb_descriptors", 0 },
+ { 0, AO_BOOT_APPLICATION_BASE + 0x10c, "ao_usb_descriptors", 0 },
#define AO_USB_DESCRIPTORS (ao_symbols[4].addr)
};
* Edit the to-be-written memory block
*/
static int
-rewrite(struct hex_image *load, unsigned address, uint8_t *data, int length)
+rewrite(struct ao_hex_image *load, unsigned address, uint8_t *data, int length)
{
int i;
static uint16_t
get_uint16_cc(struct cc_usb *cc, uint32_t addr)
{
- struct hex_image *hex = ao_self_read(cc, addr, 2);
+ struct ao_hex_image *hex = ao_self_read(cc, addr, 2);
uint16_t v;
uint8_t *data;
static uint32_t
get_uint32_cc(struct cc_usb *cc, uint32_t addr)
{
- struct hex_image *hex = ao_self_read(cc, addr, 4);
+ struct ao_hex_image *hex = ao_self_read(cc, addr, 4);
uint32_t v;
uint8_t *data;
{ .name = "device", .has_arg = 1, .val = 'D' },
{ .name = "cal", .has_arg = 1, .val = 'c' },
{ .name = "serial", .has_arg = 1, .val = 's' },
+ { .name = "verbose", .has_arg = 0, .val = 'v' },
{ 0, 0, 0, 0},
};
static void usage(char *program)
{
- fprintf(stderr, "usage: %s [--stlink] [--device=<device>] [-tty=<tty>] [--cal=<radio-cal>] [--serial=<serial>] file.{elf,ihx}\n", program);
+ fprintf(stderr, "usage: %s [--stlink] [--verbose] [--device=<device>] [-tty=<tty>] [--cal=<radio-cal>] [--serial=<serial>] file.{elf,ihx}\n", program);
exit(1);
}
int c;
stlink_t *sl = NULL;
int was_flashed = 0;
- struct hex_image *load;
+ struct ao_hex_image *load;
int tries;
struct cc_usb *cc = NULL;
int use_stlink = 0;
char *tty = NULL;
int success;
+ int verbose = 0;
- while ((c = getopt_long(argc, argv, "T:D:c:s:S", options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "T:D:c:s:Sv", options, NULL)) != -1) {
switch (c) {
case 'T':
tty = optarg;
case 'S':
use_stlink = 1;
break;
+ case 'v':
+ verbose++;
+ break;
default:
usage(argv[0]);
break;
}
}
+ ao_self_verbose = verbose;
+
+ if (verbose > 1)
+ ccdbg_add_debug(CC_DEBUG_BITBANG);
+
filename = argv[optind];
if (filename == NULL)
usage(argv[0]);
if (ends_with (filename, ".elf")) {
- load = ao_load_elf(filename);
+ load = ao_load_elf(filename, ao_symbols, ao_num_symbols);
} else if (ends_with (filename, ".ihx")) {
int i;
- load = ccdbg_hex_load(filename);
+ load = ao_hex_load(filename);
for (i = 0; i < ao_num_symbols; i++)
ao_symbols[i].addr = ao_symbols[i].default_addr;
} else
if (is_loader)
break;
printf ("rebooting to loader\n");
- cc_usb_printf(cc, "L\n");
+ cc_usb_printf(cc, "X\n");
cc_usb_close(cc);
sleep(1);
cc = NULL;
fprintf(stderr, "Cannot switch to boot loader\n");
exit(1);
}
+#if 0
{
uint8_t check[256];
int i = 0;
- ao_self_block_read(cc, 0x08002000, check);
+ ao_self_block_read(cc, AO_BOOT_APPLICATION_BASE, check);
for (;;) {
uint8_t block[256];
putchar ('.');
i = 0;
}
fflush(stdout);
- ao_self_block_write(cc, 0x08002000, block);
- ao_self_block_read(cc, 0x08002000, block);
+ ao_self_block_write(cc, AO_BOOT_APPLICATION_BASE, block);
+ ao_self_block_read(cc, AO_BOOT_APPLICATION_BASE, block);
if (memcmp(block, check, 256) != 0) {
fprintf (stderr, "read differed\n");
exit(1);
}
}
}
+#endif
}
/* Go fetch existing config values