|
@@ -99,10 +99,10 @@ quiet_cmd_ihex = IHEX $@
|
|
|
cmd_ihex = $(OBJCOPY) -Iihex -Obinary $< $@
|
|
|
|
|
|
quiet_cmd_ihex2fw = IHEX2FW $@
|
|
|
- cmd_ihex2fw = $(objtree)/$(obj)/ihex2fw $< $@
|
|
|
+ cmd_ihex2fw = $(objtree)/scripts/ihex2fw $< $@
|
|
|
|
|
|
quiet_cmd_h16tofw = H16TOFW $@
|
|
|
- cmd_h16tofw = $(objtree)/$(obj)/ihex2fw -w $< $@
|
|
|
+ cmd_h16tofw = $(objtree)/scripts/ihex2fw -w $< $@
|
|
|
|
|
|
quiet_cmd_fwbin = MK_FW $@
|
|
|
cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)"; \
|
|
@@ -165,11 +165,11 @@ $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)
|
|
|
# is actually meaningful, because the firmware has to be loaded in a certain
|
|
|
# order rather than as a single binary blob. Thus, we convert them into our
|
|
|
# more compact binary representation of ihex records (<linux/ihex.h>)
|
|
|
-$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
|
|
|
+$(obj)/%.fw: $(obj)/%.HEX | $(objtree)/$(obj)/$$(dir %)
|
|
|
$(call cmd,ihex2fw)
|
|
|
|
|
|
# .H16 is our own modified form of Intel HEX, with 16-bit length for records.
|
|
|
-$(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
|
|
|
+$(obj)/%.fw: $(obj)/%.H16 | $(objtree)/$(obj)/$$(dir %)
|
|
|
$(call cmd,h16tofw)
|
|
|
|
|
|
$(firmware-dirs):
|
|
@@ -186,5 +186,3 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \
|
|
|
# Without this, built-in.o won't be created when it's empty, and the
|
|
|
# final vmlinux link will fail.
|
|
|
obj-n := dummy
|
|
|
-
|
|
|
-hostprogs-y := ihex2fw
|