| Message ID | 1421164606-3222-3-git-send-email-maxime.ripard@free-electrons.com |
|---|---|
| State | Accepted |
| Headers | show |
Thanks, applied in 43969. Imre On Tue, 13 Jan 2015 16:56:39 +0100, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The mvebu image makefile define something almost identical to the generic > implementation found in include/image.mk. > > Switch to this implementation. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > target/linux/mvebu/image/Makefile | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/target/linux/mvebu/image/Makefile > b/target/linux/mvebu/image/Makefile > index f265dc43d25d..6e00346fe29a 100644 > --- a/target/linux/mvebu/image/Makefile > +++ b/target/linux/mvebu/image/Makefile > @@ -24,15 +24,12 @@ KDIR_TMP:=$(KDIR)/tmp > UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage > -define Image/Build/MkuImage > - mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e > $(LOADADDR) \ > - -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(1) $(2); > -endef > - > define Image/Build/DTB > cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1); > cat $(DTS_DIR)/$(1).dtb >> $(KDIR)/zImage$(2)-$(1); > - $(call > Image/Build/MkuImage,$(KDIR)/zImage$(2)-$(1),$(KDIR)/uImage$(2)-$(1)) > + $(call Image/BuildKernel/MkuImage, \ > + none, $(LOADADDR), $(LOADADDR), \ > + $(KDIR)/zImage$(2)-$(1), $(KDIR)/uImage$(2)-$(1)) > cp $(KDIR)/uImage$(2)-$(1) $(UIMAGE)$(2)-$(1); > endef
On 2015-01-13 16:56, Maxime Ripard wrote: > The mvebu image makefile define something almost identical to the generic > implementation found in include/image.mk. > > Switch to this implementation. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> FYI, my rework of the image makefile code is in the tree now. You can find examples in the ramips target (mt7621 based devices), and in ar71xx (carambola2, wndr3*00). - Felix
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index f265dc43d25d..6e00346fe29a 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -24,15 +24,12 @@ KDIR_TMP:=$(KDIR)/tmp UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage -define Image/Build/MkuImage - mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e $(LOADADDR) \ - -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(1) $(2); -endef - define Image/Build/DTB cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1); cat $(DTS_DIR)/$(1).dtb >> $(KDIR)/zImage$(2)-$(1); - $(call Image/Build/MkuImage,$(KDIR)/zImage$(2)-$(1),$(KDIR)/uImage$(2)-$(1)) + $(call Image/BuildKernel/MkuImage, \ + none, $(LOADADDR), $(LOADADDR), \ + $(KDIR)/zImage$(2)-$(1), $(KDIR)/uImage$(2)-$(1)) cp $(KDIR)/uImage$(2)-$(1) $(UIMAGE)$(2)-$(1); endef
The mvebu image makefile define something almost identical to the generic implementation found in include/image.mk. Switch to this implementation. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- target/linux/mvebu/image/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)