[U-Boot] [PATCH 1/5] Revert "tools/mkimage: Make the path to the dtc binary that mkimage calls configurable"

Wolfgang Denk
2017-09-27T14:15:20Z

This reverts commit 1f6049e2501b5c35c61435dbc05ba96743202674.

This patch is part of a series which has never been reviewed and
has not been generally accepted by the community.

Signed-off-by: Wolfgang Denk <wd@denx.de>

Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Alexander Graf <agraf@suse.de>
Cc: Alexey Brodkin <alexey.brodkin@synopsys.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Andre Przywara <andre.przywara@arm.com>,
Cc: Andreas BieÃŸmann <andreas.devel@googlemail.com>
Cc: Angelo Dureghello <angelo@sysam.it>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Heinrich Schuchardt <xypron.debian@gmx.de>
Cc: Huan Wang <alison.wang@freescale.com>
Cc: Jagan Teki <jteki@openedev.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Kyungmin Park <kmpark@infradead.org>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Macpaul Lin <macpaul@andestech.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Robert Nelson <robertcnelson@gmail.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Sonic Zhang <sonic.adi@gmail.com>
Cc: Stanislav Galabov <sgalabov@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thomas Chou <thomas@wytron.com.tw>
Cc: Tom Rini <trini@konsulko.com>
Cc: Tom Warren <TWarren@nvidia.com>
Cc: u-boot at lists.denx.de
Cc: Vagrant Cascadian <vagrant@debian.org>
Cc: Vipin Kumar <vk.vipin@gmail.com>
Cc: York Sun <yorksun@freescale.com>
---
dts/Kconfig | 9 ---------
tools/Makefile | 2 +-
2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/dts/Kconfig b/dts/Kconfig
index 4ee0510943..44fc9fe36d 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -170,12 +170,3 @@ config TPL_OF_PLATDATA
information.

endmenu
-
-config MKIMAGE_DTC_PATH
- string "Path to dtc binary for use within mkimage"
- default "dtc"
- help
- The mkimage host tool will, in order to generate FIT images make
- calls to the dtc application in order to create the output. In
- some cases the system dtc may not support all required features
- and the path to a different version should be given here.
diff --git a/tools/Makefile b/tools/Makefile
index c16477459d..a0db19d6b0 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -175,7 +175,7 @@ HOSTCFLAGS_rsa-sign.o += -Wno-deprecated-declarations
endif
endif

-HOSTCFLAGS_fit_image.o += -DMKIMAGE_DTC=\"$(CONFIG_MKIMAGE_DTC_PATH)\"
+HOSTCFLAGS_fit_image.o += -DMKIMAGE_DTC=\"$(DTC)\"

HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)
HOSTLOADLIBES_fit_info := $(HOSTLOADLIBES_mkimage)
--
2.13.3