From 63b8526237faa8e32e6753ec02150df668bced16 Mon Sep 17 00:00:00 2001 From: Michel Pollet Date: Tue, 22 Dec 2009 16:21:45 +0000 Subject: [PATCH] cores: Also disable fuse macros For silly ubuntu Signed-off-by: Michel Pollet --- simavr/cores/sim_core_declare.h | 13 ++++++++++--- simavr/cores/sim_tiny13.c | 5 +++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/simavr/cores/sim_core_declare.h b/simavr/cores/sim_core_declare.h index fcbc145..0a6c83b 100644 --- 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 b4d2148..3335c10 100644 --- 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, }, -- 2.39.5