Bootloader now uses NANO setting from the main Makefile (ported from master)
This commit is contained in:
+1
-1
@@ -1340,7 +1340,7 @@ bootloader.lbm: bootloader/bootloader_ramBoot.bin
|
|||||||
|
|
||||||
.PHONY bootloader/bootloader_ramBoot.bin:
|
.PHONY bootloader/bootloader_ramBoot.bin:
|
||||||
@echo "Building bootloader..."
|
@echo "Building bootloader..."
|
||||||
$(MAKE) -C bootloader PCB=$(PCB) PCBREV=$(PCBREV)
|
$(MAKE) -C bootloader PCB=$(PCB) PCBREV=$(PCBREV) NANO=$(NANO)
|
||||||
else ifeq ($(PCB), 9XRPRO)
|
else ifeq ($(PCB), 9XRPRO)
|
||||||
bootloader.lbm:
|
bootloader.lbm:
|
||||||
@echo "Fetching Mike's bootloader..."
|
@echo "Fetching Mike's bootloader..."
|
||||||
|
|||||||
@@ -262,9 +262,15 @@ CPPXOBJS = $(CPPSRC:%.cpp=%.o)
|
|||||||
LIBS = $(DLIBS) $(ULIBS)
|
LIBS = $(DLIBS) $(ULIBS)
|
||||||
MCFLAGS = -mcpu=$(MCU)
|
MCFLAGS = -mcpu=$(MCU)
|
||||||
|
|
||||||
|
ifeq ($(NANO), YES)
|
||||||
|
# use newlib-nano for linking
|
||||||
|
# NEWLIB_NANO_FLAGS = --specs=nano.specs -u _printf_float #use this version if printf for floats is needed!
|
||||||
|
NEWLIB_NANO_FLAGS = --specs=nano.specs
|
||||||
|
endif
|
||||||
|
|
||||||
#ASFLAGS = $(MCFLAGS) -g -gdwarf-2 -Wa,-amhls=$(OBJDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)
|
#ASFLAGS = $(MCFLAGS) -g -gdwarf-2 -Wa,-amhls=$(OBJDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)
|
||||||
CPFLAGS = $(MCFLAGS) $(OPT) -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -Wstrict-prototypes -fverbose-asm $(DEFS)
|
CPFLAGS = $(MCFLAGS) $(OPT) -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -Wstrict-prototypes -fverbose-asm $(DEFS)
|
||||||
LDFLAGS = $(MCFLAGS) -mthumb -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(FULL_PRJ).map,--cref,--no-warn-mismatch $(LIBDIR) --specs=nano.specs
|
LDFLAGS = $(MCFLAGS) -mthumb -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(FULL_PRJ).map,--cref,--no-warn-mismatch $(LIBDIR) $(NEWLIB_NANO_FLAGS)
|
||||||
CPPFLAGS = $(MCFLAGS) $(OPT) -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -fverbose-asm $(DEFS)
|
CPPFLAGS = $(MCFLAGS) $(OPT) -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -fverbose-asm $(DEFS)
|
||||||
|
|
||||||
CPPFLAGS += $(CPPDEFS)
|
CPPFLAGS += $(CPPDEFS)
|
||||||
|
|||||||
Reference in New Issue
Block a user