|
@@ -3789,15 +3789,14 @@ int main(void) { fdt_first_subnode(0, 0); return 0; }
|
|
|
EOF
|
|
|
if compile_prog "" "$fdt_libs" ; then
|
|
|
# system DTC is good - use it
|
|
|
- fdt=yes
|
|
|
+ fdt=system
|
|
|
else
|
|
|
# have GIT checkout, so activate dtc submodule
|
|
|
if test -e "${source_path}/.git" ; then
|
|
|
git_submodules="${git_submodules} dtc"
|
|
|
fi
|
|
|
if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
|
|
|
- fdt=yes
|
|
|
- dtc_internal="yes"
|
|
|
+ fdt=git
|
|
|
mkdir -p dtc
|
|
|
if [ "$pwd_is_source_path" != "y" ] ; then
|
|
|
symlink "$source_path/dtc/Makefile" "dtc/Makefile"
|
|
@@ -6338,7 +6337,7 @@ fi
|
|
|
if test "$preadv" = "yes" ; then
|
|
|
echo "CONFIG_PREADV=y" >> $config_host_mak
|
|
|
fi
|
|
|
-if test "$fdt" = "yes" ; then
|
|
|
+if test "$fdt" != "no" ; then
|
|
|
echo "CONFIG_FDT=y" >> $config_host_mak
|
|
|
fi
|
|
|
if test "$membarrier" = "yes" ; then
|
|
@@ -7140,7 +7139,7 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
|
|
|
|
|
|
done # for target in $targets
|
|
|
|
|
|
-if [ "$dtc_internal" = "yes" ]; then
|
|
|
+if [ "$fdt" = "git" ]; then
|
|
|
echo "config-host.h: subdir-dtc" >> $config_host_mak
|
|
|
fi
|
|
|
if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then
|