1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00

Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into PipXtreme

This commit is contained in:
Brian Webb 2012-03-15 19:31:18 -07:00
commit 78b622a8d8
2 changed files with 11 additions and 3 deletions

View File

@ -448,8 +448,16 @@ BU_BOARDS := $(ALL_BOARDS)
# FIXME: The INS build doesn't have a bootloader or bootloader
# updater yet so we need to filter them out to prevent errors.
BL_BOARDS := $(filter-out ins, $(ALL_BOARDS))
BU_BOARDS := $(filter-out ins, $(ALL_BOARDS))
BL_BOARDS := $(filter-out ins, $(BL_BOARDS))
BU_BOARDS := $(filter-out ins, $(BU_BOARDS))
# FIXME: The CC bootloader updaters don't work anymore due to
# differences between CC and CC3D
BU_BOARDS := $(filter-out coptercontrol, $(BU_BOARDS))
# FIXME: PipXtreme bootloader updater doesn't work due to missing
# definitions for LEDs
BU_BOARDS := $(filter-out pipxtreme, $(BU_BOARDS))
# Generate the targets for whatever boards are left in each list
FW_TARGETS := $(addprefix fw_, $(FW_BOARDS))

View File

@ -275,7 +275,7 @@ SECTIONS
_init_stack_top = . - 4 ;
} > RAM
_eram = ORIGIN(SRAM) + LENGTH(SRAM) ;
_eram = ORIGIN(RAM) + LENGTH(RAM) ;
_ebss = _eram ;
/* keep the heap section at the end of the SRAM