-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Build System: Resolve CPU-specific logic in common build files
* tools/Config.mk - Add empty definition POSTBUILD * tools/Makefile.unix/win - Replace CXD56xx specific logic with $(call POSTBUILD) * boards/arm/cxd56xx/scripts/cxd56xx_Config.mk - Add POSTBUILD definitions with logic removed from Makefile.unix/win * boards/arm/cxd56xx/spresense/scripts/Make.defs - Include cxd56xx_Config.mk immediately after tools/Config.mk so that the empty POSTBUILD definition will be replaced with the correct one NOTE: There is a precedent for this approach. This is the way that other architecture-specific build options are implemented. See, for example, tools/zds/zds_Config.mk
- Loading branch information
1 parent
45a8edd
commit a0fc80f
Showing
6 changed files
with
55 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
############################################################################ | ||
# board/arm/cxd56xx/script/cxd56xx_Config.defs | ||
# | ||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. The | ||
# ASF licenses this file to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance with the | ||
# License. You may obtain a copy of the License at | ||
# | ||
# http:https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
# License for the specific language governing permissions and limitations | ||
# under the License. | ||
# | ||
############################################################################ | ||
|
||
# These are the macros that will be used in the NuttX make system to compile | ||
# and assembly source files and to insert the resulting object files into an | ||
# archive. These replace the default definitions at tools/Config.mk | ||
|
||
# POSTBUILD -- Perform post build operations | ||
|
||
ifeq ($(CONFIG_CXD56_BINARY),y) | ||
define POSTBUILD | ||
$(Q) if [ ! -f "tools/cxd56/mkspk" ] ; then \ | ||
echo ""; \ | ||
echo "Please run the following command to build the needed tool"; \ | ||
echo ""; \ | ||
echo "cd tools/cxd56 && make && cd ../.."; \ | ||
echo ""; \ | ||
echo "run make again to create the nuttx.spk image."; \ | ||
else \ | ||
echo "Generating: $(NUTTXNAME).spk"; \ | ||
tools/cxd56/mkspk -c2 nuttx nuttx nuttx.spk; \ | ||
fi | ||
endef | ||
endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# tools/Config.mk | ||
# Global build rules and macros. | ||
# | ||
# Copyright (C) 2011, 2013-2014, 2018-2019 Gregory Nutt. All rights | ||
# Copyright (C) 2011, 2013-2014, 2018-2019, 2020 Gregory Nutt. All rights | ||
# reserved. | ||
# Author: Richard Cochran | ||
# Gregory Nutt <[email protected]> | ||
|
@@ -239,6 +239,15 @@ define PRELINK | |
endef | ||
endif | ||
|
||
# POSTBUILD -- Perform post build operations | ||
# Some architectures require the use of special tools and special handling | ||
# AFTER building the NuttX binary. Make.defs files for thos architectures | ||
# should override the following define with the correct operations for | ||
# that platform | ||
|
||
define POSTBUILD | ||
endef | ||
|
||
# DELFILE - Delete one file | ||
|
||
ifeq ($(CONFIG_WINDOWS_NATIVE),y) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters