DTC as submodule
v3 cover DTC as submodule
These two patches add and use dtc as a submodule as per the RFC:
http://lists.gnu.org/archive/html/qemu-devel/2013-01/msg05000.html
There is a remaining action item to mandate libfdt for arm/microblaze and PPC which is left as follow up work for after review of this series.
Also fixed the configure to properly build pixman when cross compiling.
changed since v2:
Fixed P1 implementation (PMM review)
Fixed CC/AR/LD quoting issue P3 (PMM review)
Addressed PMM review
changed since v1:
Fixed cross compilation of submodules (new P1)
Fixed passing of ARFLAGS to dtc submake
Peter Crosthwaite (3):
configure: Put cross compile flags in EXTRA_CFLAGS
dtc: add submodule
configure/Make: Build libfdt from submodule DTC
.gitmodules | 3 +++ Makefile | 10 ++++++++++ configure | 44 ++++++++++++++++++++++++++++++++++---------- dtc | 1 + 4 files changed, 48 insertions(+), 10 deletions(-) create mode 160000 dtc
PATCH v3 1/3 configure: Put cross compile flags in EXTRA_CFLAGS
The cross compile CFLAGS are needed to properly build pixman (and any other submodules). Only the EXTRA_CFLAGS set is passed to submodules not QEMU_CFLAGS, so put the cross compile flags in EXTRA_CFLAGS instead.
---
Changed from v2:
Reverted first hunk to keep early CFLAGS settings (PMM review) Pretty much a completely different implementation now.
configure | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
configure +9 -6
@@ -913,33 +913,36 @@ done case "$cpu" in sparc) LDFLAGS="-m32 $LDFLAGS" - QEMU_CFLAGS="-m32 -mcpu=ultrasparc $QEMU_CFLAGS" + CPU_CFLAGS="-m32 -mcpu=ultrasparc" ;; sparc64) LDFLAGS="-m64 $LDFLAGS" - QEMU_CFLAGS="-m64 -mcpu=ultrasparc $QEMU_CFLAGS" + CPU_CFLAGS="-m64 -mcpu=ultrasparc" ;; s390) - QEMU_CFLAGS="-m31 -march=z990 $QEMU_CFLAGS" + CPU_CFLAGS="-m31 -march=z990" LDFLAGS="-m31 $LDFLAGS" ;; s390x) - QEMU_CFLAGS="-m64 -march=z990 $QEMU_CFLAGS" + CPU_CFLAGS="-m64 -march=z990" LDFLAGS="-m64 $LDFLAGS" ;; i386) - QEMU_CFLAGS="-m32 $QEMU_CFLAGS" + CPU_CFLAGS="-m32" LDFLAGS="-m32 $LDFLAGS" cc_i386='$(CC) -m32' ;; x86_64) - QEMU_CFLAGS="-m64 $QEMU_CFLAGS" + CPU_CFLAGS="-m64" LDFLAGS="-m64 $LDFLAGS" cc_i386='$(CC) -m32' ;; # No special flags required for other host CPUs esac +QEMU_CFLAGS="$CPU_CFLAGS $QEMU_CFLAGS" +EXTRA_CFLAGS="$CPU_CFLAGS $EXTRA_CFLAGS" + default_target_list="" # these targets are portable
Signature · 1 line
1.7.0.4
PATCH v3 2/3 dtc: add submodule
In reply to Peter CrosthwaiteAdd dtc submodule as a fallback for old distros.
Picking version 1.3.0. as this is the most recently tagged stable version.
---
.gitmodules | 3 +++ dtc | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) create mode 160000 dtc
.gitmodules +3 -0
@@ -22,3 +22,6 @@ [submodule "pixman"] path = pixman url = git://anongit.freedesktop.org/pixman +[submodule "dtc"] + path = dtc + url = git://git.qemu.org/dtc.git
dtc new file +1 -0
@@ -0,0 +1 @@ +Subproject commit bc895d6d09695d05ceb8b52486ffe861d6cfbdde
Signature · 1 line
1.7.0.4
PATCH v3 3/3 configure/Make: Build libfdt from submodule DTC
In reply to Peter CrosthwaiteConfigure to use the DTC submodule to build libfdt when no system libfdt is found. Prompt to install the DTC submodule if --enable-fdt is set but no DTC can be found.
DTC has no out-of-tree build capability, so the configure will symlink the Makefile and scripts directory in the out of tree build directory and pass in all the needed DTC arguments to make out of tree build happen. Ideally we fix the DTC make to support out of tree, but did it this way to avoid commits to DTC.
---
changed from v2:
Fixed quoting of Make arguments (PMM review)
Fixed comment styling and typos (PMM review)
Makefile | 10 ++++++++++ configure | 29 +++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-)
Makefile +10 -0
@@ -136,6 +136,15 @@ pixman/Makefile: $(SRC_PATH)/pixman/configure $(SRC_PATH)/pixman/configure: (cd $(SRC_PATH)/pixman; autoreconf -v --install) +DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt +DTC_CFLAGS=$(CFLAGS) $(extra_cflags) -I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt + +subdir-dtc:dtc/libfdt dtc/tests + $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt,) + +dtc/%: + mkdir -p $@ + $(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
@@ -253,6 +262,7 @@ distclean: clean rm -rf $$d || exit 1 ; \ done if test -f pixman/config.log; then make -C pixman distclean; fi + if test -f dtc/version_gen.h; then make $(DTC_MAKE_ARGS) clean; fi KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \ ar de en-us fi fr-be hr it lv nl pl ru th \
configure +25 -4
@@ -2418,11 +2418,28 @@ if test "$fdt" != "no" ; then int main(void) { return 0; } EOF if compile_prog "" "$fdt_libs" ; then + # system DTC is good - use it fdt=yes - else - if test "$fdt" = "yes" ; then - feature_not_found "fdt" + elif test -d ${source_path}/dtc/libfdt ; then + # have submodule DTC - use it + fdt=yes + dtc_internal="yes" + mkdir -p dtc + if [ "$source_path" != `pwd` ]; then + symlink "$source_path/dtc/Makefile" "dtc/Makefile" + symlink "$source_path/dtc/scripts" "dtc/scripts" fi + fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt" + fdt_libs="-L\$(BUILD_DIR)/dtc/libfdt $fdt_libs" + elif test "$fdt" = "yes" ; then + # have neither and want - prompt for system/submodule install + echo "ERROR: DTC not present. Your options:" + echo " (1) Preferred: Install the DTC devel package" + echo " (2) Fetch the DTC submodule, using:" + echo " git submodule update --init dtc" + exit 1 + else + # don't have and dont wan't fdt_libs= fdt=no fi
@@ -3309,7 +3326,7 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then fi # add pixman flags after all config tests are done -QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags" +QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags" libs_softmmu="$libs_softmmu $pixman_libs" echo "Install prefix $prefix"
@@ -4356,6 +4373,10 @@ if [ "$pixman" = "internal" ]; then echo "config-host.h: subdir-pixman" >> $config_host_mak fi +if [ "$dtc_internal" = "yes" ]; then + echo "config-host.h: subdir-dtc" >> $config_host_mak +fi + # build tree in object directory in case the source is not in the current directory DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
Signature · 1 line
1.7.0.4