Skip to content

Commit 67953a3

Browse files
Claudio Fontanastsquad
Claudio Fontana
authored andcommitted
Makefile: dtc: update, build the libfdt target
dtc submodule update, now call the libfdt target from the new dtc Makefile, which has been changed to not require bison, flex, etc. This removes warnings during the build. scripts/ symlink and tests directory creation are not necessary, and neither is calling the clean rule explicitly. Signed-off-by: Claudio Fontana <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Tested-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Alex Bennée <[email protected]> Message-Id: <[email protected]> Message-Id: <[email protected]>
1 parent 7ec1edd commit 67953a3

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -526,13 +526,14 @@ $(SOFTMMU_FUZZ_RULES): $(edk2-decompressed)
526526
$(TARGET_DIRS_RULES):
527527
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),)
528528

529-
DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
529+
# LIBFDT_lib="": avoid breaking existing trees with objects requiring -fPIC
530+
DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_lib=""
530531
DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
531-
DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
532+
DTC_CPPFLAGS=-I$(SRC_PATH)/dtc/libfdt
532533

533534
.PHONY: dtc/all
534-
dtc/all: .git-submodule-status dtc/libfdt dtc/tests
535-
$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)
535+
dtc/all: .git-submodule-status dtc/libfdt
536+
$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt,)
536537

537538
dtc/%: .git-submodule-status
538539
@mkdir -p $@
@@ -820,7 +821,6 @@ distclean: clean
820821
rm -rf $$d || exit 1 ; \
821822
done
822823
rm -Rf .sdk
823-
if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi
824824

825825
KEYMAPS=da en-gb et fr fr-ch is lt no pt-br sv \
826826
ar de en-us fi fr-be hr it lv nl pl ru th \

configure

-1
Original file line numberDiff line numberDiff line change
@@ -4312,7 +4312,6 @@ EOF
43124312
mkdir -p dtc
43134313
if [ "$pwd_is_source_path" != "y" ] ; then
43144314
symlink "$source_path/dtc/Makefile" "dtc/Makefile"
4315-
symlink "$source_path/dtc/scripts" "dtc/scripts"
43164315
fi
43174316
fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt"
43184317
fdt_ldflags="-L\$(BUILD_DIR)/dtc/libfdt"

dtc

Submodule dtc updated from 88f1890 to 85e5d83

0 commit comments

Comments
 (0)