Add the #1680 fix for GNU make versions

[openwrt.git] / target / linux / at91-2.6 / image / Makefile

diff --git a/target/linux/at91-2.6/image/Makefile b/target/linux/at91-2.6/image/Makefile
index 8b1a947..73a281b 100644 (file)
--- a/target/linux/at91-2.6/image/Makefile
+++ b/target/linux/at91-2.6/image/Makefile
@@ -17,13 +17,17 @@ define Build/Compile
        $(MAKE) -C romboot compile
 #      $(MAKE) -C u-boot configure
        $(MAKE) -C u-boot compile
        $(MAKE) -C romboot compile
 #      $(MAKE) -C u-boot configure
        $(MAKE) -C u-boot compile

+       $(KDIR)/u-boot-1.1.4/tools/ubparams
+       cp params $(KDIR)

 endef
 
 define Image/Prepare
   cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
        cp $(KDIR)/romboot/romboot.bin $(KDIR)/romboot.bin
 endef
 
 define Image/Prepare
   cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
        cp $(KDIR)/romboot/romboot.bin $(KDIR)/romboot.bin

+       cp $(KDIR)/romboot/rbptest.bin $(KDIR)/rbptest.bin

        cp $(KDIR)/u-boot-1.1.4/u-boot.bin $(KDIR)/u-boot.bin
        cp $(KDIR)/u-boot-1.1.4/u-boot.bin $(KDIR)/u-boot.bin

-       cat $(KDIR)/romboot/romboot.block $(KDIR)/u-boot-1.1.4/u-boot.block > $(KDIR)/loaders.block
+       dd if=$(KDIR)/u-boot.bin of=$(KDIR)/u-boot.block bs=100k count=1 conv=sync
+       cat $(KDIR)/u-boot.block $(KDIR)/params > $(KDIR)/u-boot.full

 endef
 
 define Image/BuildKernel
 endef
 
 define Image/BuildKernel


@@ -31,6 +35,11 @@ define Image/BuildKernel
 endef
 
 define Image/Build
 endef
 
 define Image/Build

+       dd if=$(KDIR)/uImage of=$(KDIR)/uImage.block bs=8448 conv=sync
+       dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.block bs=8448 conv=sync
+       cat $(KDIR)/uImage.block $(KDIR)/root.block > $(KDIR)/knlroot.bin
+       $(STAGING_DIR)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).trx -f $(KDIR)/romboot.bin -f$(KDIR)/u-boot.full -f$(KDIR)/knlroot.bin
+       cp $(KDIR)/rbptest.bin $(BIN_DIR)

        $(call Image/Build/$(1),$(1))
 endef
 
        $(call Image/Build/$(1),$(1))
 endef