63b8526237faa8e32e6753ec02150df668bced16

For silly ubuntu

Signed-off-by: Michel Pollet <buserror@gmail.com>

diff --git a/simavr/cores/sim_core_declare.h b/simavr/cores/sim_core_declare.h
index fcbc145f9e01a33cb6b26be49ba71c3f7e2bc008..0a6c83b0edddd5861b4fdd978c6fc8c008d433ad 100644 (file)
--- a/simavr/cores/sim_core_declare.h
+++ b/simavr/cores/sim_core_declare.h
@@ -33,13 +33,20 @@
  * This declares a typical AVR core, using constants what appears
  * to be in every io*.h file...
  */
+#ifdef SIGNATURE_0
 #define DEFAULT_CORE(_vector_size) \
        .ramend = RAMEND, \
        .flashend = FLASHEND, \
        .e2end = E2END, \
        .vector_size = _vector_size, \
-       .fuse = { LFUSE_DEFAULT, HFUSE_DEFAULT, EFUSE_DEFAULT }
+       .fuse = { LFUSE_DEFAULT, HFUSE_DEFAULT, EFUSE_DEFAULT }, \
+       .signature = { SIGNATURE_0,SIGNATURE_1,SIGNATURE_2 }
+#else
 // Disable signature for now, for ubuntu, gentoo and other using old avr toolchain
-//     .signature = { SIGNATURE_0,SIGNATURE_1,SIGNATURE_2 }, 
-
+#define DEFAULT_CORE(_vector_size) \
+       .ramend = RAMEND, \
+       .flashend = FLASHEND, \
+       .e2end = E2END, \
+       .vector_size = _vector_size
+#endif
 #endif /* __SIM_CORE_DECLARE_H__ */

diff --git a/simavr/cores/sim_tiny13.c b/simavr/cores/sim_tiny13.c
index b4d2148165ad3116766a2cbee3586e23506e37be..3335c10998164c5c8e01393fa07bf3b8d9994fa3 100644 (file)
--- a/simavr/cores/sim_tiny13.c
+++ b/simavr/cores/sim_tiny13.c
@@ -52,9 +52,10 @@ static struct mcu_t {
                .e2end = E2END,
                .vector_size = 2,
 // Disable signature for now, for ubuntu, gentoo and other using old avr toolchain
-//             .signature = { SIGNATURE_0,SIGNATURE_1,SIGNATURE_2 }, 
+#ifdef SIGNATURE_0
+               .signature = { SIGNATURE_0,SIGNATURE_1,SIGNATURE_2 },
                .fuse = { LFUSE_DEFAULT, HFUSE_DEFAULT },
-
+#endif
                .init = init,
                .reset = reset,
        },