diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-03-16 02:26:50 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-03-16 02:26:50 +0000 |
commit | a902441a2532b4c56bf636cc38d979a13c07c056 (patch) | |
tree | 9e009228718cb80576512388cd4724bf5c5b5974 /c/src/lib/libbsp/m68k/efi332/startup | |
parent | Added ftpd server from Jake Janovetz <janovetz@tempest.ece.uiuc.edu>. (diff) | |
download | rtems-a902441a2532b4c56bf636cc38d979a13c07c056.tar.bz2 |
Patch from John S. Gwynne <jgwynne@mrcday.com> to correct minor
problems that prevented the 19990302 snapshot from running on
the efi332.
I'm happy to report that rtems-19990302 is running on the efi332
board. I have enclosed a few minor patches below to the efi332 bsp. All
patches are within that library but one. make/custom/efi332.cfg has a
patch to select the right CPU_CFLAGS (at one time -m68332 was a
problem... -mcpu32 or -m68332 work fine now).
Diffstat (limited to 'c/src/lib/libbsp/m68k/efi332/startup')
-rw-r--r-- | c/src/lib/libbsp/m68k/efi332/startup/Makefile.in | 11 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/efi332/startup/linkcmds | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/efi332/startup/linkcmds_ROM | 15 |
3 files changed, 29 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in index 0b50e9331a..ac416d1493 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.in @@ -19,8 +19,13 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) H_FILES= -SRCS=$(C_FILES) $(H_FILES) -OBJS=$(C_O_FILES) +# Assembly source names, if any, go here -- minus the .S +S_PIECES= except_vect_332_ROM +S_FILES=$(S_PIECES:%=%.S) +S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o) + +SRCS=$(C_FILES) $(H_FILES) $(S_FILES) +OBJS=$(C_O_FILES) $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/leaf.cfg @@ -52,6 +57,8 @@ ${PGM}: ${SRCS} ${OBJS} all: ${ARCH} $(SRCS) $(PGM) $(INSTALL_CHANGE) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib + $(INSTALL_CHANGE) $(srcdir)/linkcmds_ROM ${PROJECT_RELEASE}/lib + $(INSTALL_CHANGE) ${ARCH}/except_vect_332_ROM.o ${PROJECT_RELEASE}/lib # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile diff --git a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds index 90a27cb2fe..58c90b64a9 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds @@ -32,10 +32,10 @@ __DYNAMIC = 0; MEMORY { - ram : ORIGIN = 0x80000, LENGTH = 256K + ram : ORIGIN = 0x80000, LENGTH = 512K } -__end_of_ram = 0xc0000; +__end_of_ram = 0x100000; _copy_data_from_rom = 0; /* @@ -48,8 +48,10 @@ SECTIONS CREATE_OBJECT_SYMBOLS text_start = .; _text_start = .; + *(.text) . = ALIGN (16); + *(.eh_fram) . = ALIGN (16); @@ -69,6 +71,10 @@ SECTIONS *(.shdata) _endtext = .; } > ram + .gcc_exc : + { + *(.gcc_exc) + } > ram .data : { data_start = .; diff --git a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds_ROM b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds_ROM index d11708772e..b4f3bf70b1 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds_ROM +++ b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds_ROM @@ -40,10 +40,10 @@ __DYNAMIC = 0; MEMORY { rom : ORIGIN = 0x00000, LENGTH = 256K - ram : ORIGIN = 0x80000, LENGTH = 256K + ram : ORIGIN = 0x80000, LENGTH = 512K } -__end_of_ram = 0xc0000; +__end_of_ram = 0x100000; _copy_data_from_rom = 1; /* @@ -57,6 +57,11 @@ SECTIONS text_start = .; _text_start = .; *(.text) + . = ALIGN (16); + + *(.eh_fram) + . = ALIGN (16); + etext = ALIGN(0x10); _etext = .; __CTOR_LIST__ = .; @@ -73,9 +78,13 @@ SECTIONS *(.shdata) _endtext = .; } > rom - .data : + .gcc_exc : AT ( ADDR(.text) + SIZEOF( .text ) ) { + *(.gcc_exc) + } > ram + .data : + { data_start = .; _data_start = .; _sdata = . ; |