Ptxdist uses a very old-dated version of mkimage. Current versions also support FDT blobs and so on.
Integrate a newer mkimage version, by extracting it from mainline u-boot sources. Signed-off-by: Remy Bohmer <[email protected]> --- rules/host-umkimage.make | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make index d18c7ec..36ebd09 100644 --- a/rules/host-umkimage.make +++ b/rules/host-umkimage.make @@ -17,12 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_UMKIMAGE) += host-umkimage # # Paths and names # -HOST_UMKIMAGE_VERSION := 1.1.6 -HOST_UMKIMAGE := u-boot-mkimage-$(HOST_UMKIMAGE_VERSION) -HOST_UMKIMAGE_SUFFIX := tar.bz2 -HOST_UMKIMAGE_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_UMKIMAGE).$(HOST_UMKIMAGE_SUFFIX) -HOST_UMKIMAGE_SOURCE := $(SRCDIR)/$(HOST_UMKIMAGE).$(HOST_UMKIMAGE_SUFFIX) -HOST_UMKIMAGE_DIR := $(HOST_BUILDDIR)/$(HOST_UMKIMAGE) +HOST_UMKIMAGE_DIR = $(HOST_BUILDDIR)/$(U_BOOT) # ---------------------------------------------------------------------------- # Get @@ -30,14 +25,10 @@ HOST_UMKIMAGE_DIR := $(HOST_BUILDDIR)/$(HOST_UMKIMAGE) host-umkimage_get: $(STATEDIR)/host-umkimage.get -$(STATEDIR)/host-umkimage.get: $(host-umkimage_get_deps_default) +$(STATEDIR)/host-umkimage.get: $(STATEDIR)/u-boot.get @$(call targetinfo, $@) @$(call touch, $@) -$(HOST_UMKIMAGE_SOURCE): - @$(call targetinfo, $@) - @$(call get, HOST_UMKIMAGE) - # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- @@ -47,8 +38,8 @@ host-umkimage_extract: $(STATEDIR)/host-umkimage.extract $(STATEDIR)/host-umkimage.extract: $(host-umkimage_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(HOST_UMKIMAGE_DIR)) - @$(call extract, HOST_UMKIMAGE, $(HOST_BUILDDIR)) - @$(call patchin, HOST_UMKIMAGE, $(HOST_UMKIMAGE_DIR)) + @$(call extract, U_BOOT, $(HOST_BUILDDIR)) + @$(call patchin, U_BOOT, $(HOST_UMKIMAGE_DIR)) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -60,9 +51,10 @@ host-umkimage_prepare: $(STATEDIR)/host-umkimage.prepare HOST_UMKIMAGE_PATH := PATH=$(HOST_PATH) HOST_UMKIMAGE_ENV := $(HOST_ENV) CFLAGS="$(HOST_CPPFLAGS)" +# We use a random config (at91sam9261ek), any other board config would be good $(STATEDIR)/host-umkimage.prepare: $(host-umkimage_prepare_deps_default) @$(call targetinfo, $@) - cd $(HOST_UMKIMAGE_DIR) && $(HOST_UMKIMAGE_PATH) $(MAKE) clean + @cd $(HOST_UMKIMAGE_DIR) && $(HOST_UMKIMAGE_PATH) $(MAKE) at91sam9261ek_config @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -73,7 +65,7 @@ host-umkimage_compile: $(STATEDIR)/host-umkimage.compile $(STATEDIR)/host-umkimage.compile: $(host-umkimage_compile_deps_default) @$(call targetinfo, $@) - cd $(HOST_UMKIMAGE_DIR) && $(HOST_UMKIMAGE_PATH) $(HOST_UMKIMAGE_ENV) $(MAKE) + @cd $(HOST_UMKIMAGE_DIR) && $(HOST_UMKIMAGE_PATH) $(HOST_UMKIMAGE_ENV) $(MAKE) tools @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -84,7 +76,7 @@ host-umkimage_install: $(STATEDIR)/host-umkimage.install $(STATEDIR)/host-umkimage.install: $(host-umkimage_install_deps_default) @$(call targetinfo, $@) - install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage + @install $(HOST_UMKIMAGE_DIR)/tools/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage @$(call touch, $@) # ---------------------------------------------------------------------------- -- 1.5.6.3 -- ptxdist mailing list [email protected]
