diff --git a/contrib/other/uarm/Makefile b/contrib/other/uarm/Makefile index 3dbc69b060..f6f0eb003a 100755 --- a/contrib/other/uarm/Makefile +++ b/contrib/other/uarm/Makefile @@ -19,8 +19,8 @@ SRC = RAM.c icache.c MMU.c pxa255_PwrClk.c pxa255_IC.c pxa255_GPIO.c callout_RAM OBJECTS = $(patsubst %.c, %.o, $(SRC)) default: $(patsubst %.c,%.o,$(SRC)) - kos32-ld $(LDFLAGS) $(LIBPATH) --subsystem console -o uARMk $(OBJECTS) -lgcc -lc.dll - objcopy uARMk -O binary + kos32-ld $(LDFLAGS) $(LIBPATH) --subsystem console -o uARM $(OBJECTS) -lgcc -lc.dll + objcopy uARM -O binary %.o : %.c Makefile $(SRC) $(CC) $(CFLAGS) $(INCLUDES) -o $@ $< diff --git a/contrib/other/uarm/Tupfile.lua b/contrib/other/uarm/Tupfile.lua new file mode 100755 index 0000000000..7a1162c52f --- /dev/null +++ b/contrib/other/uarm/Tupfile.lua @@ -0,0 +1,7 @@ +if tup.getconfig("NO_GCC") ~= "" then return end +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.getconfig("HELPERDIR") +tup.include(HELPERDIR .. "/use_gcc.lua") +tup.include(HELPERDIR .. "/use_newlib.lua") + +compile_gcc{"RAM.c", "icache.c", "MMU.c", "pxa255_PwrClk.c", "pxa255_IC.c", "pxa255_GPIO.c", "callout_RAM.c", "rt.c", "pxa255_RTC.c", "SoC.c", "pxa255_UART.c", "pxa255_TIMR.c", "mem.c", "dcache.c", "pxa255_LCD.c", "cp15.c", "pxa255_DMA.c", "math64.c", "CPU.c", "main_pc.c", "pxa255_DSP.c"} +link_gcc("uARM")