From 68368b70fa58ceacdcdf40405f8f7713d0c44e8f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 May 2018 23:28:54 +0200 Subject: rpi: update firmware, kernel and fixup more stuff --- package/bcm28xx-bootloader/Makefile | 44 ++++++++++++----------- package/bcm28xx-bootloader/src/boot/bootcode.bin | Bin 52064 -> 52116 bytes package/bcm28xx-bootloader/src/boot/fixup.dat | Bin 6577 -> 6637 bytes package/bcm28xx-bootloader/src/boot/fixup_cd.dat | Bin 2598 -> 2608 bytes package/bcm28xx-bootloader/src/boot/fixup_db.dat | Bin 9737 -> 9799 bytes package/bcm28xx-bootloader/src/boot/fixup_x.dat | Bin 9735 -> 9797 bytes package/bcm28xx-bootloader/src/boot/start.elf | Bin 2826212 -> 2835108 bytes package/bcm28xx-bootloader/src/boot/start_cd.elf | Bin 673668 -> 674884 bytes package/bcm28xx-bootloader/src/boot/start_db.elf | Bin 4969220 -> 4978980 bytes package/bcm28xx-bootloader/src/boot/start_x.elf | Bin 3913252 -> 3921988 bytes 10 files changed, 24 insertions(+), 20 deletions(-) (limited to 'package/bcm28xx-bootloader') diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 54fc57f18..4ea08bf74 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bcm28xx-bootloader # not cloned, local src directory used -PKG_VERSION:= 865ddc1393f558198e7e7ce70928ff2e49c4f7f6 +PKG_VERSION:= 784fe6cebd9e5726c0c7b9e449f7cdbf2cf6959d PKG_RELEASE:= 1 PKG_DESCR:= bootloader for bcm28xx PKG_SECTION:= base/boot @@ -59,55 +59,59 @@ endif printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_AMP),) - printf "dtoverlay=hifiberry-amp.dtb\n" >> \ + printf "dtoverlay=hifiberry-amp\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_DAC),) - printf "dtoverlay=hifiberry-dac.dtb\n" >> \ + printf "dtoverlay=hifiberry-dac\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_DACPLUS),) - printf "dtoverlay=hifiberry-dacplus.dtb\n" >> \ + printf "dtoverlay=hifiberry-dacplus\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_DIGI),) - printf "dtoverlay=hifiberry-digi.dtb\n" >> \ + printf "dtoverlay=hifiberry-digi\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_RPI_DAC),) - printf "dtoverlay=rpi-dac.dtb\n" >> \ + printf "dtoverlay=rpi-dac\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_IQAUDIO_DAC),) - printf "dtoverlay=iqaudio-dac.dtb\n" >> \ + printf "dtoverlay=iqaudio-dac\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifneq ($(ADK_TARGET_HARDWARE_RPI_PROTO),) - printf "dtoverlay=rpi-proto.dtb\n" >> \ + printf "dtoverlay=rpi-proto\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif +ifeq ($(ADK_TARGET_HARDWARE_RPI3_NO_WIFI),y) + printf "dtoverlay=pi3-disable-wifi\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif +ifeq ($(ADK_TARGET_HARDWARE_RPI3_NO_BT),y) + printf "dtoverlay=pi3-disable-bt\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifeq ($(ADK_TARGET_HARDWARE_RPI3_SERIAL),y) - printf "dtoverlay=pi3-disable-bt.dtb\n" >> \ + printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y) +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y) printf "arm_control=0x200\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64),y) - printf "arm_control=0x200\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt - printf "enable_uart=1\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt -endif - printf "# License keys for video decoding\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +ifneq ($(ADK_RUNTIME_MPEG2_KEY),) printf "decode_MPG2=$(ADK_RUNTIME_MPEG2_KEY)\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif +ifneq ($(ADK_RUNTIME_VC1_KEY),) printf "decode_WVC1=$(ADK_RUNTIME_VC1_KEY)\n" >> \ - $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y) $(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/usr/bin $(INSTALL_BIN) ./files/vcdbg \ diff --git a/package/bcm28xx-bootloader/src/boot/bootcode.bin b/package/bcm28xx-bootloader/src/boot/bootcode.bin index 75a84dbf5..1a8f6402a 100644 Binary files a/package/bcm28xx-bootloader/src/boot/bootcode.bin and b/package/bcm28xx-bootloader/src/boot/bootcode.bin differ diff --git a/package/bcm28xx-bootloader/src/boot/fixup.dat b/package/bcm28xx-bootloader/src/boot/fixup.dat index 0a0e52dc3..79e9aa171 100644 Binary files a/package/bcm28xx-bootloader/src/boot/fixup.dat and b/package/bcm28xx-bootloader/src/boot/fixup.dat differ diff --git a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat index 1c379bebd..79b53400c 100644 Binary files a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat and b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat differ diff --git a/package/bcm28xx-bootloader/src/boot/fixup_db.dat b/package/bcm28xx-bootloader/src/boot/fixup_db.dat index f54329e10..210ccb81d 100644 Binary files a/package/bcm28xx-bootloader/src/boot/fixup_db.dat and b/package/bcm28xx-bootloader/src/boot/fixup_db.dat differ diff --git a/package/bcm28xx-bootloader/src/boot/fixup_x.dat b/package/bcm28xx-bootloader/src/boot/fixup_x.dat index 2baa1de59..1f52982a6 100644 Binary files a/package/bcm28xx-bootloader/src/boot/fixup_x.dat and b/package/bcm28xx-bootloader/src/boot/fixup_x.dat differ diff --git a/package/bcm28xx-bootloader/src/boot/start.elf b/package/bcm28xx-bootloader/src/boot/start.elf index 874c66053..030be853e 100644 Binary files a/package/bcm28xx-bootloader/src/boot/start.elf and b/package/bcm28xx-bootloader/src/boot/start.elf differ diff --git a/package/bcm28xx-bootloader/src/boot/start_cd.elf b/package/bcm28xx-bootloader/src/boot/start_cd.elf index c600e70c5..43e40673f 100644 Binary files a/package/bcm28xx-bootloader/src/boot/start_cd.elf and b/package/bcm28xx-bootloader/src/boot/start_cd.elf differ diff --git a/package/bcm28xx-bootloader/src/boot/start_db.elf b/package/bcm28xx-bootloader/src/boot/start_db.elf index 93a06b76a..3db397d43 100644 Binary files a/package/bcm28xx-bootloader/src/boot/start_db.elf and b/package/bcm28xx-bootloader/src/boot/start_db.elf differ diff --git a/package/bcm28xx-bootloader/src/boot/start_x.elf b/package/bcm28xx-bootloader/src/boot/start_x.elf index c8ec97f1a..21d7bbfae 100644 Binary files a/package/bcm28xx-bootloader/src/boot/start_x.elf and b/package/bcm28xx-bootloader/src/boot/start_x.elf differ -- cgit v1.2.3