rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-05 21:52:10 +01:00
Code Issues Releases Activity

OP-954 Fixes from review:

Browse Source 
- CopterControl target fix
- tabs in Nakefiles
- Removed duplicate stale settings and clean empty lines in osd Makefile
+review OPReview-470
This commit is contained in:
Alessio Morale 2013-05-15 23:18:50 +02:00
parent c80f01dff9
commit 6ba15ebc53
6 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flight/targets/boards/oplinkmini/board-info.mk
View File

@ -14,13 +14,13 @@ OPENOCD_CONFIG := stm32f1x.stlink.cfg
# Flash memory map for OPLM: # Flash memory map for OPLM:
# Sector start size use # Sector start size use
# 0 0x0800 0000 1k BL # 0 0x0800 0000 1k BL
# 1 0x0800 0400 1k BL # 1 0x0800 0400 1k BL
# .. .. # .. ..
# 10 0x0800 2C00 1k BL # 10 0x0800 2C00 1k BL
# 11 0x0800 3000 1k FW # 11 0x0800 3000 1k FW
# 12 0x0800 1000 1k FW # 12 0x0800 1000 1k FW
# .. .. # .. ..
# 125 0x0801 F400 1k FW # 125 0x0801 F400 1k FW
# 126 0x0801 F800 1k EE # 126 0x0801 F800 1k EE
# 127 0x0801 FC00 1k EE # 127 0x0801 FC00 1k EE

3
flight/targets/boards/oplinkmini/firmware/Makefile
View File

@ -56,9 +56,6 @@ else
SRC += $(OPTESTS)/$(TESTAPP).c SRC += $(OPTESTS)/$(TESTAPP).c
endif endif
CDEFS += -DEE_BANK_BASE=$(EE_BANK_BASE)
CDEFS += -DEE_BANK_SIZE=$(EE_BANK_SIZE)
# Optional component libraries # Optional component libraries
include $(FLIGHTLIB)/rscode/library.mk include $(FLIGHTLIB)/rscode/library.mk

26
flight/targets/boards/osd/board-info.mk
View File

@ -14,19 +14,19 @@ OPENOCD_CONFIG := stm32f4xx.stlink.cfg
#OPENOCD_CONFIG := stm32f4xx.cfg #OPENOCD_CONFIG := stm32f4xx.cfg
# Flash memory map for OSD: # Flash memory map for OSD:
# Sector start size use # Sector start size use
# 0 0x0800 0000 16k BL # 0 0x0800 0000 16k BL
# 1 0x0800 4000 16k BL # 1 0x0800 4000 16k BL
# 2 0x0800 8000 16k EE # 2 0x0800 8000 16k EE
# 3 0x0800 C000 16k EE # 3 0x0800 C000 16k EE
# 4 0x0801 0000 64k Unused # 4 0x0801 0000 64k Unused
# 5 0x0802 0000 128k FW # 5 0x0802 0000 128k FW
# 6 0x0804 0000 128k FW # 6 0x0804 0000 128k FW
# 7 0x0806 0000 128k FW # 7 0x0806 0000 128k FW
# 8 0x0808 0000 128k Unused # 8 0x0808 0000 128k Unused
# 9 0x080A 0000 128k Unused # 9 0x080A 0000 128k Unused
# 10 0x080C 0000 128k Unused .. # 10 0x080C 0000 128k Unused ..
# 11 0x080E 0000 128k Unused # 11 0x080E 0000 128k Unused
# Note: These must match the values in link_$(BOARD)_memory.ld # Note: These must match the values in link_$(BOARD)_memory.ld
BL_BANK_BASE := 0x08000000 # Start of bootloader flash BL_BANK_BASE := 0x08000000 # Start of bootloader flash

2
flight/targets/boards/osd/firmware/Makefile
View File

@ -99,8 +99,6 @@ else
SRC += $(OPTESTS)/test_common.c SRC += $(OPTESTS)/test_common.c
SRC += $(OPTESTS)/$(TESTAPP).c SRC += $(OPTESTS)/$(TESTAPP).c
endif endif
# Optional component libraries # Optional component libraries
include $(PIOS)/common/libraries/dosfs/library.mk include $(PIOS)/common/libraries/dosfs/library.mk

26
flight/targets/boards/revolution/board-info.mk
View File

@ -13,19 +13,19 @@ OPENOCD_JTAG_CONFIG := stlink-v2.cfg
OPENOCD_CONFIG := stm32f4xx.stlink.cfg OPENOCD_CONFIG := stm32f4xx.stlink.cfg
# Flash memory map for Revolution: # Flash memory map for Revolution:
# Sector start size use # Sector start size use
# 0 0x0800 0000 16k BL # 0 0x0800 0000 16k BL
# 1 0x0800 4000 16k BL # 1 0x0800 4000 16k BL
# 2 0x0800 8000 16k EE # 2 0x0800 8000 16k EE
# 3 0x0800 C000 16k EE # 3 0x0800 C000 16k EE
# 4 0x0801 0000 64k Unused # 4 0x0801 0000 64k Unused
# 5 0x0802 0000 128k FW # 5 0x0802 0000 128k FW
# 6 0x0804 0000 128k FW # 6 0x0804 0000 128k FW
# 7 0x0806 0000 128k FW # 7 0x0806 0000 128k FW
# 8 0x0808 0000 128k Unused # 8 0x0808 0000 128k Unused
# 9 0x080A 0000 128k Unused # 9 0x080A 0000 128k Unused
# 10 0x080C 0000 128k Unused .. # 10 0x080C 0000 128k Unused ..
# 11 0x080E 0000 128k Unused # 11 0x080E 0000 128k Unused
# Note: These must match the values in link_$(BOARD)_memory.ld # Note: These must match the values in link_$(BOARD)_memory.ld
BL_BANK_BASE := 0x08000000 # Start of bootloader flash BL_BANK_BASE := 0x08000000 # Start of bootloader flash

3
make/common-defs.mk
View File

@ -136,9 +136,10 @@ BOARD_CDEFS += -DFW_DESC_SIZE=$(FW_DESC_SIZE)
BOARD_CDEFS += -DBL_BANK_BASE=$(BL_BANK_BASE) BOARD_CDEFS += -DBL_BANK_BASE=$(BL_BANK_BASE)
BOARD_CDEFS += -DBL_BANK_SIZE=$(BL_BANK_SIZE) BOARD_CDEFS += -DBL_BANK_SIZE=$(BL_BANK_SIZE)
BOARD_CDEFS += -DBL_DESC_SIZE=$(BL_DESC_SIZE) BOARD_CDEFS += -DBL_DESC_SIZE=$(BL_DESC_SIZE)
ifdef EE_BANK_BASE
BOARD_CDEFS += -DEE_BANK_BASE=$(EE_BANK_BASE) BOARD_CDEFS += -DEE_BANK_BASE=$(EE_BANK_BASE)
BOARD_CDEFS += -DEE_BANK_SIZE=$(EE_BANK_SIZE) BOARD_CDEFS += -DEE_BANK_SIZE=$(EE_BANK_SIZE)
endif
CDEFS += $(BOARD_CDEFS) CDEFS += $(BOARD_CDEFS)
ifeq ($(DEBUG), YES) ifeq ($(DEBUG), YES)