brcm2708: fix imagebuilder

[openwrt.git] / target / linux / brcm2708 / image / Makefile

diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
index 6b4cf14..e70bdd0 100644 (file)
--- a/target/linux/brcm2708/image/Makefile
+++ b/target/linux/brcm2708/image/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,25 +8,21 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 include $(INCLUDE_DIR)/host.mk
 
-define Image/Prepare
-       cp $(LINUX_DIR)/arch/arm/boot/Image $(KDIR)/Image
-endef
-
 FAT32_BLOCK_SIZE=1024
 FAT32_BLOCKS=$(shell echo $$(($(CONFIG_BRCM2708_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
 
 define Image/Build/RaspberryPi
        rm -f $(KDIR)/boot.img
 
-       mkdosfs $(KDIR)/boot.img -C $(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