summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/fetch.mk22
-rw-r--r--package/bcm2835-bootloader/Makefile37
2 files changed, 36 insertions, 23 deletions
diff --git a/mk/fetch.mk b/mk/fetch.mk
index b6637ba0e..9a4eb1d8c 100644
--- a/mk/fetch.mk
+++ b/mk/fetch.mk
@@ -62,17 +62,7 @@ $(1):
mkdir -p "$$$${fullname%%/$$$$filename}"; \
cd "$$$${fullname%%/$$$$filename}"; \
for url in "${PKG_SITES}"; do case $$$$url in \
- http://*|https://*|ftp://*) \
- for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \
- : echo "$${FETCH_CMD} $$$$site$$$$filename"; \
- rm -f "$$$$filename"; \
- if $${FETCH_CMD} $$$$site$$$$filename; then \
- : check the size here; \
- [[ ! -e $$$$filename ]] || exit 0; \
- fi; \
- done; \
- ;; \
- git://*) \
+ git://*|*.git) \
rm -rf $${PKG_NAME}-$${PKG_VERSION}; \
git clone $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION}; \
if [ $$$$(echo $${PKG_VERSION}|wc -c) -eq 41 ]; then \
@@ -89,6 +79,16 @@ $(1):
: check the size here; \
[[ ! -e $$$$filename ]] || exit 0; \
;; \
+ http://*|https://*|ftp://*) \
+ for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \
+ : echo "$${FETCH_CMD} $$$$site$$$$filename"; \
+ rm -f "$$$$filename"; \
+ if $${FETCH_CMD} $$$$site$$$$filename; then \
+ : check the size here; \
+ [[ ! -e $$$$filename ]] || exit 0; \
+ fi; \
+ done; \
+ ;; \
*) \
echo url schema not known; \
false ;; \
diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile
index df9d2c65c..40b39fb35 100644
--- a/package/bcm2835-bootloader/Makefile
+++ b/package/bcm2835-bootloader/Makefile
@@ -1,33 +1,46 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= bcm2835-bootloader
-# actually git checkout from 21.09.2014
-# 53162d55fa557e60453c0652aa00fa3daf4ed618
-PKG_VERSION:= 1.2
+PKG_VERSION:= 393dcc0e76f18f6ac1b67ba45d36058410670034
PKG_RELEASE:= 1
-PKG_HASH:= 20f15e1e2fd4245e59b5b3223df8bdca6b8a54baeff113f74e3aed56d57f0be8
+PKG_HASH:= 44723adf99a06e6a21df7e9ee20ff29c6235323e38e1d055ea087d29a7597c81
PKG_DESCR:= bootloader for raspberry pi
PKG_SECTION:= base/boot
PKG_URL:= https://github.com/raspberrypi/firmware
-PKG_SITES:= http://openadk.org/distfiles/
+PKG_SITES:= https://github.com/raspberrypi/firmware.git
PKG_SYSTEM_DEPENDS:= raspberry-pi
+PKG_CHOICES_BCM2835_BOOTLOADER:= DEFAULT EXTRA CUTDOWN
+PKGCD_DEFAULT:= default bootloader
+PKGCD_EXTRA:= bootloader with extra features and codecs
+PKGCD_CUTDOWN:= cut down bootloader
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
do-install:
- ${INSTALL_DIR} ${IDIR_BCM2835_BOOTLOADER}/boot
- ${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_BOOTLOADER}/boot/
+ $(INSTALL_DIR) $(IDIR_BCM2835_BOOTLOADER)/boot
+ $(CP) $(WRKBUILD)/boot/bootcode.bin $(IDIR_BCM2835_BOOTLOADER)/boot/
+ifeq ($(ADK_PACKAGE_BCM2835_BOOTLOADER_DEFAULT),y)
+ $(CP) $(WRKBUILD)/boot/{start.elf,fixup.dat} $(IDIR_BCM2835_BOOTLOADER)/boot/
+endif
+ifeq ($(ADK_PACKAGE_BCM2835_BOOTLOADER_EXTRA),y)
+ $(CP) $(WRKBUILD)/boot/{start_x.elf,fixup_x.dat} $(IDIR_BCM2835_BOOTLOADER)/boot/
+ printf "start_x=1\n" >> $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+endif
+ifeq ($(ADK_PACKAGE_BCM2835_BOOTLOADER_CUTDOWN),y)
+ $(CP) $(WRKBUILD)/boot/{start_cd.elf,fixup_cd.dat} $(IDIR_BCM2835_BOOTLOADER)/boot/
+ printf "start_cd=1\n" >> $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
+endif
printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \
- ${IDIR_BCM2835_BOOTLOADER}/boot/config.txt
+ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk