diff options
Diffstat (limited to '')
5 files changed, 17 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am index 2eb13ab2a0..1801ae3072 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi332/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -24,6 +24,9 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # +# USE_INIT_FINI tells main.c what C++ help we need. +AM_CPPFLAGS += -DUSE_INIT_FINI + $(PGM): $(OBJS) $(make-rel) @@ -33,7 +36,8 @@ $(PROJECT_RELEASE)/lib/linkcmds: linkcmds $(PROJECT_RELEASE)/lib/linkcmds_ROM: linkcmds_ROM $(INSTALL_DATA) $< $@ -$(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).o: $(ARCH)/except_vect_332_ROM.o +$(PROJECT_RELEASE)/lib/except_vect_332_ROM$(LIB_VARIANT).o: \ + $(ARCH)/except_vect_332_ROM.o $(INSTALL_DATA) $< $@ # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile diff --git a/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c b/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c index 765b26c902..b50dd710a1 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c @@ -50,6 +50,10 @@ void bsp_start( void ) { void *vbr; extern void *_WorkspaceBase; + extern void *_RamSize; + extern unsigned long _M68k_Ramsize; + + _M68k_Ramsize = (unsigned long)&_RamSize; /* RAM size set in linker script */ /* * we only use a hook to get the C library initialized. diff --git a/c/src/lib/libbsp/m68k/efi332/startup/except_vect_332_ROM.S b/c/src/lib/libbsp/m68k/efi332/startup/except_vect_332_ROM.S index 0e5e11c085..9eb2f20556 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/except_vect_332_ROM.S +++ b/c/src/lib/libbsp/m68k/efi332/startup/except_vect_332_ROM.S @@ -11,7 +11,7 @@ will have priority. */ /* Vector 0: RESET: Initial SSP */ - .long __end_of_ram + .long _RamEnd /* Vector 1: RESET: Initial PC */ .long start diff --git a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds index 6ac7ee77a4..849c8692fa 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds @@ -33,6 +33,9 @@ __DYNAMIC = 0; /* * Declare some sizes. */ +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x80000; +_RamSize = DEFINED(_RamSize) ? _RamSize : 0x80000; +_RamEnd = _RamBase + _RamSize; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; @@ -41,10 +44,6 @@ MEMORY ram : ORIGIN = 0x80000, LENGTH = 512K } -_RamBase = 0x80000; -_RamSize = 0x80000; - -__end_of_ram = 0x100000; _copy_data_from_rom = 0; /* diff --git a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds_ROM b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds_ROM index b4f3bf70b1..acfee4c07f 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds_ROM +++ b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds_ROM @@ -43,6 +43,8 @@ MEMORY ram : ORIGIN = 0x80000, LENGTH = 512K } +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x080000; + __end_of_ram = 0x100000; _copy_data_from_rom = 1; |