CTCaer/switch-l4t-atf
1
0
Fork 0
mirror of https://github.com/CTCaer/switch-l4t-atf.git synced 2025-03-04 00:18:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build:Replace soft links with file copy.

Browse Source 
Some build environments do not support symbolic links. This patch
removes the symlinks previously used to build fip_create and instead
copies the relevant header files.
The original motivation for using symlinks was to avoid Trusted Firmware
library headers conflicting with headers in the compiler standard
include path. Copying the header files instead has the same effect.

Like other build artefacts, the copied files are listed in .gitignore.

The distclean targets have also been updated to remove the copies.

Change-Id: Ie8b67bcb133f7f1d660ae93b857950aa15e42b1e
This commit is contained in:
Evan Lloyd 2015-12-02 20:30:13 +00:00
parent e7f54dbd03
commit bb5a762c3f
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -14,3 +14,7 @@ tools/fip_create/fip_create
tools/cert_create/src/*.o
tools/cert_create/src/**/*.o
tools/cert_create/cert_create
# Ignore header files copied.
tools/fip_create/firmware_image_package.h
tools/fip_create/uuid.h

23
tools/fip_create/Makefile
View File

@ -34,6 +34,7 @@ include ${MAKE_HELPERS_DIRECTORY}build_env.mk
PROJECT = fip_create
OBJECTS = fip_create.o
COPIED_H_FILES := uuid.h firmware_image_package.h
CFLAGS = -Wall -Werror -pedantic -std=c99
ifeq (${DEBUG},1)
@ -42,13 +43,12 @@ else
CFLAGS += -O2
endif
# Make soft links and include from local directory otherwise wrong headers
# could get pulled in from firmware tree.
# Only include from local directory (see comment below).
INCLUDE_PATHS = -I.
CC := gcc
.PHONY: all clean
.PHONY: all clean distclean
all: ${PROJECT}
@ -59,10 +59,25 @@ ${PROJECT}: ${OBJECTS} Makefile
@echo "Built $@ successfully"
@${ECHO_BLANK_LINE}
%.o: %.c %.h Makefile
%.o: %.c %.h ${COPIED_H_FILES} Makefile
@echo " CC $<"
${Q}${CC} -c ${CFLAGS} ${INCLUDE_PATHS} $< -o $@
#
# Copy required library headers to a local directory so they can be included
# by this project without adding the library directories to the system include
# path. This avoids conflicts with definitions in the compiler standard
# include path.
#
uuid.h : ../../include/stdlib/sys/uuid.h
$(call SHELL_COPY,$<,$@)
firmware_image_package.h : ../../include/common/firmware_image_package.h
$(call SHELL_COPY,$<,$@)
clean:
$(call SHELL_DELETE_ALL, ${PROJECT} ${OBJECTS})
distclean: clean
$(call SHELL_DELETE_ALL, ${COPIED_H_FILES})

1
tools/fip_create/firmware_image_package.h
View File

@ -1 +0,0 @@
../../include/common/firmware_image_package.h

1
tools/fip_create/uuid.h
View File

@ -1 +0,0 @@
../../include/stdlib/sys/uuid.h