aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-05-29 11:28:54 +0000
committerJohn Crispin <blogic@openwrt.org>2015-05-29 11:28:54 +0000
commitd893bff4f0c7a097070feab66c6d93ee9a467e89 (patch)
tree5b2d636204da854bba4cd9039dda153e7ce76e4e
parent63da3677605b0b0915fbf0c1407a272c800f085e (diff)
downloadmaster-187ad058-d893bff4f0c7a097070feab66c6d93ee9a467e89.tar.gz
master-187ad058-d893bff4f0c7a097070feab66c6d93ee9a467e89.tar.bz2
master-187ad058-d893bff4f0c7a097070feab66c6d93ee9a467e89.zip
brcm2708: fix imagebuilder
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45824 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/brcm2708-gpu-fw/Makefile14
-rw-r--r--target/linux/brcm2708/image/Makefile16
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