From a5a935b49a088410f6b8a4967a005e863818d4f0 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Fri, 29 May 2015 11:28:54 +0000
Subject: [PATCH] brcm2708: fix imagebuilder

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 45824
---
 package/kernel/brcm2708-gpu-fw/Makefile | 14 ++++++++++++--
 target/linux/brcm2708/image/Makefile    | 16 ++++++++--------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/package/kernel/brcm2708-gpu-fw/Makefile b/package/kernel/brcm2708-gpu-fw/Makefile
index b3936303d2..eee85e0763 100644
--- a/package/kernel/brcm2708-gpu-fw/Makefile
+++ b/package/kernel/brcm2708-gpu-fw/Makefile
@@ -33,11 +33,21 @@ define Package/brcm2708-gpu-fw/description
 endef
 
 define Build/Compile
+	true
+endef
+
+define Package/brcm2708-gpu-fw/install
+	true
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(BUILD_DIR)/brcm2708-gpu-fw-boot
-	$(CP) $(PKG_BUILD_DIR)/* $(BUILD_DIR)/brcm2708-gpu-fw-boot
+	$(CP) $(PKG_BUILD_DIR)/bootcode.bin $(KERNEL_BUILD_DIR)
+	$(CP) $(PKG_BUILD_DIR)/COPYING.linux $(KERNEL_BUILD_DIR)
+	$(CP) $(PKG_BUILD_DIR)/LICENCE.broadcom $(KERNEL_BUILD_DIR)
+	$(CP) $(PKG_BUILD_DIR)/start.elf $(KERNEL_BUILD_DIR)
+	$(CP) $(PKG_BUILD_DIR)/start_cd.elf $(KERNEL_BUILD_DIR)
+	$(CP) $(PKG_BUILD_DIR)/fixup.dat $(KERNEL_BUILD_DIR)
+	$(CP) $(PKG_BUILD_DIR)/fixup_cd.dat $(KERNEL_BUILD_DIR)
 endef
 
 $(eval $(call BuildPackage,brcm2708-gpu-fw))
diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
index cb5acde48c..e70bdd04d8 100644
--- a/target/linux/brcm2708/image/Makefile
+++ b/target/linux/brcm2708/image/Makefile
@@ -14,15 +14,15 @@ FAT32_BLOCKS=$(shell echo $$(($(CONFIG_BRCM2708_SD_BOOT_PARTSIZE)*1024*1024/$(FA
 define Image/Build/RaspberryPi
 	rm -f $(KDIR)/boot.img
 
-	mkdosfs -C $(KDIR)/boot.img $(FAT32_BLOCKS)
+	mkfs.fat -C $(KDIR)/boot.img $(FAT32_BLOCKS)
 	# Raspberry Pi has no bootloader, instead the GPU loads and starts the kernel
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/bootcode.bin ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/COPYING.linux ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/LICENCE.broadcom ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/start.elf ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/start_cd.elf ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/fixup.dat ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/fixup_cd.dat ::
+	mcopy -i $(KDIR)/boot.img $(KDIR)/bootcode.bin ::
+	mcopy -i $(KDIR)/boot.img $(KDIR)/COPYING.linux ::
+	mcopy -i $(KDIR)/boot.img $(KDIR)/LICENCE.broadcom ::
+	mcopy -i $(KDIR)/boot.img $(KDIR)/start.elf ::
+	mcopy -i $(KDIR)/boot.img $(KDIR)/start_cd.elf ::
+	mcopy -i $(KDIR)/boot.img $(KDIR)/fixup.dat ::
+	mcopy -i $(KDIR)/boot.img $(KDIR)/fixup_cd.dat ::
 	mcopy -i $(KDIR)/boot.img cmdline.txt ::
 	mcopy -i $(KDIR)/boot.img config.txt ::
 	mcopy -i $(KDIR)/boot.img $(KDIR)/Image ::kernel.img  # Copy OpenWrt built kernel