diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-08-22 15:48:16 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-08-22 15:48:16 +0000 |
| commit | 4e6f091ab2d397a7c289928933f5204b4d8752dd (patch) | |
| tree | bd5a71a69942ca2194a1d0c1362ea68c0c9ec3e1 | |
| parent | 993437a36d4ca9a4ce44d5da6288a8759163f8e1 (diff) | |
2008-08-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.shared: Update Makefiles.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.shared | 47 |
2 files changed, 39 insertions, 12 deletions
@@ -1,3 +1,7 @@ +2008-08-22 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.shared: Update Makefiles. + 2008-07-23 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile, rtems_init.c: Add ada_from_c_task example. diff --git a/Makefile.shared b/Makefile.shared index 7ccbe49..8183d9d 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -3,7 +3,8 @@ # # Tool helpers -CARGS =-B${RTEMS_MAKEFILE_PATH}/lib/ -specs=bsp_specs -qrtems $(CPU_CFLAGS) +SPECFLAGS =-B${RTEMS_MAKEFILE_PATH}/lib/ -specs=bsp_specs -qrtems +CFLAGS = $(CPU_CFLAGS) # GEN5200 Specific Information ifeq ($(RTEMS_BSP_FAMILY),gen5200) @@ -27,19 +28,34 @@ ifeq ($(NEED_ROOTFS_FOR_HOST_INFO),yes) CFLAGS += -DENABLE_UNTAR_ROOT_FILESYSTEM -I. endif +ifeq ($(NEED_NETWORK),yes) +#NETWORK_HFILE= ../networkconfig_$(RTEMS_BSP).h +#NETWORK_HFILE= ../networkconfig.h +endif + + +DEFINES += -D$(RTEMS_BSP) CFLAGS += $(DEFINES) +RTS= --RTS=$(shell $(CC) -print-multi-directory $(CFLAGS)) + all: $(PROGRAM).exe -$(PROGRAM).exe: rtems_init.o $(FILESYSTEM_OBJS) $(PROGRAM).adb $(EXTRA_OBJS) - $(AS:as=gnatmake) \ - -g -I$(RTEMS_MAKEFILE_PATH)/lib/include/adainclude \ - -v $(EXTRA_GNATFLAGS) \ +joel: + @echo CFLAGS=$(CFLAGS) + @echo CC=$(CC) + @echo RTS=$(RTS) + $(CC) -print-multi-directory $(CFLAGS) + $(CC) -mcpu=403 -print-multi-directory + +$(PROGRAM).exe: rtems_init.o $(FILESYSTEM_OBJS) $(EXTRA_OBJS) + $(AS:as=gnatmake) -v $(EXTRA_GNATFLAGS) \ + -I$(RTEMS_MAKEFILE_PATH)/lib/include/adainclude \ -O -gnata -gnatE -gnato -g $(PROGRAM) -o $(@) \ -bargs -Mgnat_main \ - -largs $(CARGS) $(LINKARGS) rtems_init.o $(FILESYSTEM_OBJS) \ - $(EXTRA_OBJS) - $(SIZE) $(@) + -largs $(SPECFLAGS) $(CFLAGS) $(LINKARGS) \ + rtems_init.o $(FILESYSTEM_OBJS) \ + $(EXTRA_OBJS) ifeq ($(RTEMS_BSP_FAMILY),pc386) mv $(@) $(@).obj $(OBJCOPY) -O elf32-i386 \ @@ -50,11 +66,18 @@ ifeq ($(RTEMS_BSP_FAMILY),pc386) $(OBJCOPY) -O binary $(@).obj $(@).bin $(RTEMS_MAKEFILE_PATH)/build-tools/bin2boot -v $(@).bt $(HEADERADDR) \ $(START16FILE) $(START16ADDR) 0 $(@).bin $(RELOCADDR) 0 - # rm -f $(@).obj - rm -f $(@).bin +endif +ifeq ($(RTEMS_BSP),icecube) + $(OBJCOPY) -R -S -O binary obj/$(PROGRAM) obj/$(PROGRAM).bin + cat obj/$(PROGRAM).bin | gzip -9 >obj/$(PROGRAM).gz + mkimage \ + -A ppc -O rtems -T kernel -a 0x40000 -e 0x40000 -n "RTEMS" \ + -d obj/$(PROGRAM).gz obj/$(PROGRAM).img + cp obj/$(PROGRAM).img ../../../../tftpboot/main.img + rm -f obj/$(PROGRAM).gz obj/$(PROGRAM).img endif -rtems_init.o: ../rtems_init.c ../networkconfig.h $(FILESYSTEM_SRCS) +rtems_init.o: ../rtems_init.c $(FILESYSTEM_SRCS) $(NETWORK_HFILE) $(CC) $(CFLAGS) -I. $(CPU_CFLAGS) -c $< ifeq ($(NEED_ROOTFS_FOR_HOST_INFO),yes) @@ -70,6 +93,6 @@ FilesystemImage.o: FilesystemImage.c endif clean: + rm -f obj/* rm -f b~*.* *.o *.ali $(PROGRAM) rm -f *.num *.exe *.obj *.bin *.bt *.gba - |