> > Somehow a few lines were committed to the latest subversion > that cause a > compile error in the arm7_9_common.c file: > > 1018 <<<<<<< .mine > 1019 jtag_add_runtest(1, > jtag_get_end_state()); > 1020 ======= > 1021 > 1022 /* extra runtest added as issues > were found > with certain ARM9 cores (maybe more) - AT91SAM9260 and STR9 */ > 1023 jtag_add_runtest(1, > jtag_get_end_state()); > 1024 >>>>>>> .r2584 > > Obviously a compiler isn't going to like lines 1018 or 1024. Anybody > working on this at the moment or can I patch this? > > Thanks, > > Gary >
That looks more like a local conflict that will need resolving your end. Cheers Spen _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
