Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 12:23:23 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

simplifly Makefiles a bit, use ?= instead of ifndef

Browse Source
This commit is contained in:
Felix Ruess
2012-09-18 23:14:54 +02:00
parent 7c5e62611d
commit 5cae44e2ea
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.ac
+2 -3
View File
@@ -33,9 +33,8 @@ ACINCLUDE = $(PAPARAZZI_HOME)/var/$(AIRCRAFT)
AIRCRAFT_CONF_DIR = $(ACINCLUDE)/conf AIRCRAFT_CONF_DIR = $(ACINCLUDE)/conf
AC_GENERATED = $(ACINCLUDE)/generated AC_GENERATED = $(ACINCLUDE)/generated
ifndef PERIODIC_FREQ # periodic frequency defaults to 60Hz
PERIODIC_FREQ = 60 PERIODIC_FREQ ?= 60
endif
AIRFRAME_H=$(AC_GENERATED)/airframe.h AIRFRAME_H=$(AC_GENERATED)/airframe.h
PERIODIC_H=$(AC_GENERATED)/periodic_telemetry.h PERIODIC_H=$(AC_GENERATED)/periodic_telemetry.h
conf/Makefile.lpc21
+1 -3
View File
@@ -126,9 +126,7 @@ LDFLAGS +=-T$(LDSCRIPT)
# Settings and variables: # Settings and variables:
LPC21ISP = lpc21isp LPC21ISP = lpc21isp
ifndef LPC21ISP_PORT LPC21ISP_PORT ?= /dev/ttyS0
LPC21ISP_PORT = /dev/ttyS0
endif
LPC21ISP_FLASHFILE = $(OBJDIR)/$(TARGET).hex LPC21ISP_FLASHFILE = $(OBJDIR)/$(TARGET).hex
# verbose output: # verbose output:
#LPC21ISP_DEBUG = -debug #LPC21ISP_DEBUG = -debug
conf/Makefile.stm32
+5 -9
View File
@@ -45,9 +45,7 @@ OPT = s
#OPT = 0 #OPT = 0
ifndef $(PYTHON) PYTHON ?= $(shell which python)
PYTHON = $(shell which python)
endif
ifneq ($(BOARD_SERIAL),) ifneq ($(BOARD_SERIAL),)
OOCD_OPTIONS = -c "ft2232_serial $(BOARD_SERIAL)" OOCD_OPTIONS = -c "ft2232_serial $(BOARD_SERIAL)"
@@ -266,11 +264,10 @@ upload: $(OBJDIR)/$(TARGET).hex
-c shutdown -c shutdown
else else
# jtag via BMP # jtag via BMP
ifndef $(BMP_UPLOAD_SCRIPT) BMP_UPLOAD_SCRIPT ?= $(PAPARAZZI_SRC)/conf/boards/upload_scripts/bmp_jtag_flash.scr
BMP_UPLOAD_SCRIPT = $(PAPARAZZI_SRC)/conf/boards/upload_scripts/bmp_jtag_flash.scr
endif
upload: $(OBJDIR)/$(TARGET).elf upload: $(OBJDIR)/$(TARGET).elf
@echo "Assuming luftboot bootloader: $(ASSUMING_LUFTBOOT)"
@echo "Using Black Magic Probe with JTAG" @echo "Using Black Magic Probe with JTAG"
@echo "Using GDB = $(GDB)" @echo "Using GDB = $(GDB)"
@echo " BMP\t$<" @echo " BMP\t$<"
@@ -284,10 +281,9 @@ endif
else ifeq ($(FLASH_MODE),SWD) else ifeq ($(FLASH_MODE),SWD)
# only works if BMP_PORT is defined # only works if BMP_PORT is defined
ifneq ($(BMP_PORT),) ifneq ($(BMP_PORT),)
ifndef $(BMP_UPLOAD_SCRIPT) BMP_UPLOAD_SCRIPT ?= $(PAPARAZZI_SRC)/conf/boards/upload_scripts/bmp_swd_flash.scr
BMP_UPLOAD_SCRIPT = $(PAPARAZZI_SRC)/conf/boards/upload_scripts/bmp_swd_flash.scr
endif
upload: $(OBJDIR)/$(TARGET).elf upload: $(OBJDIR)/$(TARGET).elf
@echo "Assuming luftboot bootloader: $(ASSUMING_LUFTBOOT)"
@echo "Using Black Magic Probe with SWD" @echo "Using Black Magic Probe with SWD"
@echo "Using GDB = $(GDB)" @echo "Using GDB = $(GDB)"
@echo " BMP\t$<" @echo " BMP\t$<"