mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-10 18:24:11 +01:00
8f977a4411
This is the first cleanup pass through makefiles and pios. Probably it is difficult to track changes due to the nature of them. I would recommend to look at resulting files and compiled code instead. NOTE: original branch was rebased and lot of conflicts were fixed on the way. So do not expect that every commit in this series will be buildable (unlike original branch). Only final result was tested. The main goal was to remove as much duplication of code (and copy/paste errors) as possible, moving common parts out of Makefiles. It still is not perfect, and mostly no code changes made - Makefiles and #ifdefs only. But please while testing make sure that all code works as before, and no modules/options are missed by accident. Brief list of changes: - Moved common parts of Makefiles into the set of *.mk files. - Changed method of passing common vars from top Makefile to lower ones. - Some pios cleanup, mostly #ifdefs, and all pios_config.h files. - Many obsolete files removed (for instance, AHRS files, op_config.h). - Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS). - Unified pios_config.h template. Please don't remove lines for board configs, only comment/uncomment them. Adding new PIOS options, please propagate them to all board files keeping the same order. - Some formatting, spacing, indentation (no line endings change yet). - Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows). - Added some library.mk files to move libs into AR achives later. - EntireFlash target now uses cross-platform python script to generate bin files. So it works on all supported platforms: Linux, OSX, Windows. - Top level packaging is completely rewritten. Now it is a part of top Makefile. As such, all dependencies are checked and accounted, no more 'make -j' problems should occur. - Default GCS_BUILD_CONF is release now, may be changed if necessary using 'make GCS_BUILD_CONF=debug gcs'. - GCS build paths are separated into debug and release, so no more obj file clashes. Packaging system supports only release builds. - New target is introduced: 'clean_package'. Now 'make package' does not clean build directory. Use clean_package instead for distributable builds. - Targets like 'all', 'opfw_resource', etc now will print extra contex in parallel builds too. - If any of 'package', 'clean_package', 'opfw_resource' targets are given on command line, GCS build will depend on the resource, so all fw_*.opfw targets will be built and embedded into GCS. By default GCS does not depend on resource, and will be built w/o firmware (unless the resource files already exist and the Qt resource file is generated). - fw_simposix (ELF executable) is now packaged for linux. Run'n'play! - Make help is refined and is now up to date. Still broken: - UnitTests, should be fixed - SimPosix: buildable, but should be reworked. Next planned passes to do: - toolchain bootstrapping and packaging (including windows - WIP) - CMSIS/StdPeriph lib cleanup - more PIOS cleanup - move libs into AR archives to save build time - sim targets refactir and cleanup - move android-related directories under <top>/android - unit test targets fix - source code line ending changes (there are many different, were not changed) - coding style Merging this, please use --no-ff git option to make it the real commit point Conflicts: A lot of... :-)
68 lines
2.1 KiB
Makefile
68 lines
2.1 KiB
Makefile
#
|
|
# Copyright (c) 2009-2013, The OpenPilot Team, http://www.openpilot.org
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
# for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along
|
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
#
|
|
|
|
ifndef OPENPILOT_IS_COOL
|
|
$(error Top level Makefile must be used to build this target)
|
|
endif
|
|
|
|
include $(ROOT_DIR)/make/boards/$(BOARD_NAME)/board-info.mk
|
|
include $(ROOT_DIR)/make/firmware-defs.mk
|
|
|
|
# ARM DSP library
|
|
override USE_DSP_LIB := NO
|
|
|
|
# Paths
|
|
TOPDIR = .
|
|
OPSYSTEM = $(TOPDIR)
|
|
OPSYSTEMINC = $(OPSYSTEM)/inc
|
|
PIOSINC = $(PIOS)/inc
|
|
PIOSCOMMON = $(PIOS)/Common
|
|
PIOSBOARDS = $(PIOS)/Boards
|
|
FLIGHTLIBINC = $(FLIGHTLIB)/inc
|
|
|
|
# List C source files here (C dependencies are automatically generated).
|
|
# Use file-extension c for "c-only"-files
|
|
SRC += $(OPSYSTEM)/main.c
|
|
SRC += $(OPSYSTEM)/pios_board.c
|
|
|
|
## PIOS Hardware
|
|
ifeq ($(MCU),cortex-m3)
|
|
include $(PIOS)/STM32F10x/library.mk
|
|
|
|
# Set linker-script name depending on selected submodel name
|
|
LDFLAGS += -T$(LINKER_SCRIPTS_PATH)/link_$(BOARD)_memory.ld
|
|
LDFLAGS += -T$(LINKER_SCRIPTS_PATH)/link_$(BOARD)_sections.ld
|
|
else
|
|
$(error Unsupported MCU for BootloaderUpdater: $(MCU))
|
|
endif
|
|
|
|
# List any extra directories to look for include files here.
|
|
# Each directory must be seperated by a space.
|
|
EXTRAINCDIRS += $(PIOS)
|
|
EXTRAINCDIRS += $(PIOSINC)
|
|
EXTRAINCDIRS += $(FLIGHTLIBINC)
|
|
EXTRAINCDIRS += $(PIOSCOMMON)
|
|
EXTRAINCDIRS += $(PIOSBOARDS)
|
|
EXTRAINCDIRS += $(HWDEFSINC)
|
|
EXTRAINCDIRS += $(OPSYSTEMINC)
|
|
|
|
# Link: create ELF output file from object files.
|
|
EXTRAOBJ := $(BUILD_DIR)/bl_$(BOARD_NAME)/bl_$(BOARD_NAME).bin.o
|
|
|
|
include $(ROOT_DIR)/make/common-defs.mk
|