From 8ee72d80ddd76532187abfc952cfbf83892f15e3 Mon Sep 17 00:00:00 2001 From: Christian Kroll Date: Tue, 11 Mar 2014 20:44:13 +0100 Subject: [PATCH] added avr51 support for 128KiB MCUs --- avr51.x | 231 +++++++++++++++++++++++++++++++++ borg_hw/borg_hw_ancient.c | 4 +- borg_hw/borg_hw_andreborg.c | 6 +- borg_hw/borg_hw_borg16.c | 6 +- borg_hw/borg_hw_borg16_hgmod.c | 6 +- borg_hw/borg_hw_gigaborg.c | 6 +- borg_hw/borg_hw_ledbrett.c | 6 +- config.in | 2 + defaults.mk | 11 +- util.c | 2 +- 10 files changed, 258 insertions(+), 22 deletions(-) create mode 100644 avr51.x diff --git a/avr51.x b/avr51.x new file mode 100644 index 0000000..a16ad36 --- /dev/null +++ b/avr51.x @@ -0,0 +1,231 @@ +/* Default linker script, for normal executables */ +OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") +OUTPUT_ARCH(avr:51) +MEMORY +{ + text (rx) : ORIGIN = 0, LENGTH = 128K + data (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0 + eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K + fuse (rw!x) : ORIGIN = 0x820000, LENGTH = 1K + lock (rw!x) : ORIGIN = 0x830000, LENGTH = 1K + signature (rw!x) : ORIGIN = 0x840000, LENGTH = 1K +} +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .rel.init : { *(.rel.init) } + .rela.init : { *(.rela.init) } + .rel.text : + { + *(.rel.text) + *(.rel.text.*) + *(.rel.gnu.linkonce.t*) + } + .rela.text : + { + *(.rela.text) + *(.rela.text.*) + *(.rela.gnu.linkonce.t*) + } + .rel.fini : { *(.rel.fini) } + .rela.fini : { *(.rela.fini) } + .rel.rodata : + { + *(.rel.rodata) + *(.rel.rodata.*) + *(.rel.gnu.linkonce.r*) + } + .rela.rodata : + { + *(.rela.rodata) + *(.rela.rodata.*) + *(.rela.gnu.linkonce.r*) + } + .rel.data : + { + *(.rel.data) + *(.rel.data.*) + *(.rel.gnu.linkonce.d*) + } + .rela.data : + { + *(.rela.data) + *(.rela.data.*) + *(.rela.gnu.linkonce.d*) + } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.bss : { *(.rel.bss) } + .rela.bss : { *(.rela.bss) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + /* Internal text space or external memory. */ + .text : + { + *(.vectors) + KEEP(*(.vectors)) + /* For data that needs to reside in the lower 64k of progmem. */ + *(.progmem.gcc*) + *(.progmem*) + . = ALIGN(2); + __trampolines_start = . ; + /* The jump trampolines for the 16-bit limited relocs will reside here. */ + *(.trampolines) + *(.trampolines*) + __trampolines_end = . ; + /* For future tablejump instruction arrays for 3 byte pc devices. + We don't relax jump/call instructions within these sections. */ + *(.jumptables) + *(.jumptables*) + /* For code that needs to reside in the lower 128k progmem. */ + *(.lowtext) + *(.lowtext*) + __ctors_start = . ; + *(.ctors) + __ctors_end = . ; + __dtors_start = . ; + *(.dtors) + __dtors_end = . ; + KEEP(SORT(*)(.ctors)) + KEEP(SORT(*)(.dtors)) + /* From this point on, we don't bother about wether the insns are + below or above the 16 bits boundary. */ + *(.init0) /* Start here after reset. */ + KEEP (*(.init0)) + *(.init1) + KEEP (*(.init1)) + *(.init2) /* Clear __zero_reg__, set up stack pointer. */ + KEEP (*(.init2)) + *(.init3) + KEEP (*(.init3)) + *(.init4) /* Initialize data and BSS. */ + KEEP (*(.init4)) + *(.init5) + KEEP (*(.init5)) + *(.init6) /* C++ constructors. */ + KEEP (*(.init6)) + *(.init7) + KEEP (*(.init7)) + *(.init8) + KEEP (*(.init8)) + *(.init9) /* Call main(). */ + KEEP (*(.init9)) + *(.text) + . = ALIGN(2); + *(.text.*) + . = ALIGN(2); + *(.fini9) /* _exit() starts here. */ + KEEP (*(.fini9)) + *(.fini8) + KEEP (*(.fini8)) + *(.fini7) + KEEP (*(.fini7)) + *(.fini6) /* C++ destructors. */ + KEEP (*(.fini6)) + *(.fini5) + KEEP (*(.fini5)) + *(.fini4) + KEEP (*(.fini4)) + *(.fini3) + KEEP (*(.fini3)) + *(.fini2) + KEEP (*(.fini2)) + *(.fini1) + KEEP (*(.fini1)) + *(.fini0) /* Infinite loop after program termination. */ + KEEP (*(.fini0)) + _etext = . ; + } > text + .data : AT (ADDR (.text) + SIZEOF (.text)) + { + PROVIDE (__data_start = .) ; + *(.data) + *(.data*) + *(.rodata) /* We need to include .rodata here if gcc is used */ + *(.rodata*) /* with -fdata-sections. */ + *(.gnu.linkonce.d*) + PROVIDE (_game_descriptors_start__ = .) ; + *(.game_descriptors) + PROVIDE (_game_descriptors_end__ = .) ; + . = ALIGN(2); + _edata = . ; + PROVIDE (__data_end = .) ; + } > data + .bss SIZEOF(.data) + ADDR(.data) : + { + PROVIDE (__bss_start = .) ; + *(.bss) + *(.bss*) + *(COMMON) + PROVIDE (__bss_end = .) ; + } > data + __data_load_start = LOADADDR(.data); + __data_load_end = __data_load_start + SIZEOF(.data); + /* Global data not cleared after reset. */ + .noinit SIZEOF(.bss) + ADDR(.bss) : + { + PROVIDE (__noinit_start = .) ; + *(.noinit*) + PROVIDE (__noinit_end = .) ; + _end = . ; + PROVIDE (__heap_start = .) ; + } > data + .eeprom : + { + *(.eeprom*) + __eeprom_end = . ; + } > eeprom + .fuse : + { + KEEP(*(.fuse)) + KEEP(*(.lfuse)) + KEEP(*(.hfuse)) + KEEP(*(.efuse)) + } > fuse + .lock : + { + KEEP(*(.lock*)) + } > lock + .signature : + { + KEEP(*(.signature*)) + } > signature + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } +} diff --git a/borg_hw/borg_hw_ancient.c b/borg_hw/borg_hw_ancient.c index 621cfc1..e4772b4 100644 --- a/borg_hw/borg_hw_ancient.c +++ b/borg_hw/borg_hw_ancient.c @@ -62,7 +62,7 @@ void timer0_off(){ COLPORT = 0; ROWPORT = 0; -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x00; TCCR0B = 0x00; TIMSK0 = 0; @@ -86,7 +86,7 @@ static void timer0_on(){ */ -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x02; // CTC Mode TCCR0B = 0x03; // clk/64 TCNT0 = 0x00; // reset timer diff --git a/borg_hw/borg_hw_andreborg.c b/borg_hw/borg_hw_andreborg.c index 1682e48..f665601 100644 --- a/borg_hw/borg_hw_andreborg.c +++ b/borg_hw/borg_hw_andreborg.c @@ -34,7 +34,7 @@ #define COLDDR2 DDR(COLPORT2) #define ROWDDR DDR(ROWPORT) -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) /* more ifdef magic :-( */ #define OCR0 OCR0A #define TIMER0_COMP_vect TIMER0_COMPA_vect @@ -120,7 +120,7 @@ void timer0_off() { COLPORT2 = 0; ROWPORT = 0; -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x00; TCCR0B = 0x00; #else @@ -141,7 +141,7 @@ static void timer0_on() { 1 0 1 clk/1024 */ -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x02; // CTC Mode TCCR0B = 0x03; // clk/64 TCNT0 = 0; // reset timer diff --git a/borg_hw/borg_hw_borg16.c b/borg_hw/borg_hw_borg16.c index adf0176..1d12e4e 100644 --- a/borg_hw/borg_hw_borg16.c +++ b/borg_hw/borg_hw_borg16.c @@ -33,7 +33,7 @@ #define COLDDR2 DDR(COLPORT2) #define ROWDDR DDR(ROWPORT) -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) /* more ifdef magic :-( */ #define OCR0 OCR0A #define TIMER0_COMP_vect TIMER0_COMPA_vect @@ -153,7 +153,7 @@ void timer0_off() { COLPORT2 = 0; ROWPORT = 0; -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x00; TCCR0B = 0x00; #else @@ -175,7 +175,7 @@ static void timer0_on() { 1 0 1 clk/1024 */ -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x02; // CTC Mode TCCR0B = 0x04; // clk/256 TCNT0 = 0; // reset timer diff --git a/borg_hw/borg_hw_borg16_hgmod.c b/borg_hw/borg_hw_borg16_hgmod.c index 7d89f25..1625688 100644 --- a/borg_hw/borg_hw_borg16_hgmod.c +++ b/borg_hw/borg_hw_borg16_hgmod.c @@ -34,7 +34,7 @@ } /* more ifdef magic :-( */ -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) #define OCR0 OCR0A #define TIMER0_COMP_vect TIMER0_COMPA_vect #endif @@ -195,7 +195,7 @@ void timer0_off() { TLCPORT = 0; ROWPORT = 0; - #if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) + #if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x00; TCCR0B = 0x00; #else @@ -221,7 +221,7 @@ static void timer0_on() { * 1 0 1 clk/1024 */ - #if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) + #if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x02; // CTC Mode TCCR0B = 0x04; // clk/256 TCNT0 = 0; // reset timer diff --git a/borg_hw/borg_hw_gigaborg.c b/borg_hw/borg_hw_gigaborg.c index 57209c3..e70ceb0 100644 --- a/borg_hw/borg_hw_gigaborg.c +++ b/borg_hw/borg_hw_gigaborg.c @@ -33,7 +33,7 @@ #define COLDDR2 DDR(COLPORT2) #define ROWDDR DDR(ROWPORT) -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) /* more ifdef magic :-( */ #define OCR0 OCR0A #define TIMER0_COMP_vect TIMER0_COMPA_vect @@ -62,7 +62,7 @@ void timer0_off() { COLPORT2 = 0; ROWPORT = 0; -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x00; TCCR0B = 0x00; #else @@ -83,7 +83,7 @@ void timer0_on() { 1 0 0 clk/256 1 0 1 clk/1024 */ -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x02; // CTC Mode TCCR0B = 0x04; // clk/256 TCNT0 = 0; // reset timer diff --git a/borg_hw/borg_hw_ledbrett.c b/borg_hw/borg_hw_ledbrett.c index f55c202..5d32f4b 100644 --- a/borg_hw/borg_hw_ledbrett.c +++ b/borg_hw/borg_hw_ledbrett.c @@ -31,7 +31,7 @@ #define MUX_ROWS 4 -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) /* more ifdef magic :-( */ #define OCR0 OCR0A #define SIG_OUTPUT_COMPARE0 SIG_OUTPUT_COMPARE0A @@ -283,7 +283,7 @@ void timer0_off() { ROW3_OFF(); ROW4_OFF(); -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x00; TCCR0B = 0x00; #else @@ -305,7 +305,7 @@ static void timer0_on() { 1 0 1 clk/1024 */ -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) TCCR0A = 0x02; // CTC Mode TCCR0B = 0x04; // clk/256 TCNT0 = 0; // reset timer diff --git a/config.in b/config.in index 35ba82f..de42852 100644 --- a/config.in +++ b/config.in @@ -11,6 +11,8 @@ comment "General Setup" ATmega328 atmega328 \ ATmega644 atmega644 \ ATmega644p atmega644p \ + ATmega1284 atmega1284 \ + ATmega1284p atmega1284p \ ATmega8515 atmega8515" \ 'ATmega32' MCU diff --git a/defaults.mk b/defaults.mk index a33d759..6359233 100644 --- a/defaults.mk +++ b/defaults.mk @@ -23,10 +23,6 @@ LIBS = -lm CFLAGS ?= -Wall -W -Wno-unused-parameter -Wno-sign-compare CFLAGS += -g -Os -std=gnu99 -fgnu89-inline -D_XOPEN_SOURCE=600 -DNDEBUG -# flags for the linker -LDFLAGS += -T ./avr5.x -Wl,-Map,image.map -mmcu=$(MCU) - - ############################################################################# #Settings for Simulator build @@ -101,6 +97,13 @@ include $(TOPDIR)/.config CPPFLAGS += -DF_CPU=$(FREQ)UL -mmcu=$(MCU) +# flags for the linker +ifeq ($(findstring atmega128,$(MCU)),atmega128) + LDFLAGS += -T ./avr51.x -Wl,-Map,image.map -mmcu=$(MCU) +else + LDFLAGS += -T ./avr5.x -Wl,-Map,image.map -mmcu=$(MCU) +endif + endif # MAKECMDGOALS!=menuconfig endif # MAKECMDGOALS!=mrproper endif # MAKECMDGOALS!=clean diff --git a/util.c b/util.c index 6c52e98..0629b68 100644 --- a/util.c +++ b/util.c @@ -60,7 +60,7 @@ void wait(int ms){ } #endif -#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || defined (__AVR_ATmega328__) +#if defined (__AVR_ATmega644P__) || defined (__AVR_ATmega644__) || defined (__AVR_ATmega328__) || (__AVR_ATmega1284P__) || defined (__AVR_ATmega1284__) while(!(TIFR1&(1<