diff options
Diffstat (limited to 'package/bcm28xx-bootloader')
19 files changed, 43 insertions, 16 deletions
diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 4ea08bf74..58ae843dc 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -5,31 +5,25 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bcm28xx-bootloader # not cloned, local src directory used -PKG_VERSION:= 784fe6cebd9e5726c0c7b9e449f7cdbf2cf6959d -PKG_RELEASE:= 1 +PKG_VERSION:= 1e403e23baab5673f0494a200f57cd01287d5b1a +PKG_RELEASE:= 3 PKG_DESCR:= bootloader for bcm28xx PKG_SECTION:= base/boot PKG_URL:= https://github.com/raspberrypi/firmware PKG_SITES:= https://github.com/raspberrypi/firmware.git -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 +PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi4 raspberry-pi4-64 raspberry-pi5 PKG_CHOICES_BCM28XX_BOOTLOADER:= DEFAULT EXTRA CUTDOWN PKGCD_DEFAULT:= default bootloader PKGCD_EXTRA:= bootloader with extra features and codecs PKGCD_CUTDOWN:= cut down bootloader -PKG_SUBPKGS:= BCM28XX_BOOTLOADER BCM28XX_DEBUGTOOL -PKGSD_BCM28XX_DEBUGTOOL:= bcm28xx debugtool (vcdbg) -PKGSC_BCM28XX_DEBUGTOOL:= sys/hw -PKGSS_BCM28XX_DEBUGTOOL:= bcm28xx-vc-debug bcm28xx-vc-libs - NO_DISTFILES:= 1 include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,BCM28XX_BOOTLOADER,bcm28xx-bootloader,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -$(eval $(call PKG_template,BCM28XX_DEBUGTOOL,bcm28xx-debugtool,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_BCM28XX_DEBUGTOOL))) CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -38,14 +32,28 @@ INSTALL_STYLE:= manual do-install: $(INSTALL_DIR) $(IDIR_BCM28XX_BOOTLOADER)/boot $(CP) $(WRKBUILD)/boot/bootcode.bin $(IDIR_BCM28XX_BOOTLOADER)/boot/ +ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y) + printf "console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" > \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt +endif +ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y) + printf "console=tty0 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" > \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt +endif printf "kernel=kernel\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "dtparam=audio,i2s,spi,i2c\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_DEFAULT),y) +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) + $(CP) $(WRKBUILD)/boot/{start4.elf,fixup4.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ + printf "start_file=start4.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "fixup_file=fixup4.dat\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +else $(CP) $(WRKBUILD)/boot/{start.elf,fixup.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ printf "start_file=start.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "fixup_file=fixup.dat\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif +endif ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_EXTRA),y) $(CP) $(WRKBUILD)/boot/{start_x.elf,fixup_x.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ printf "start_file=start_x.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt @@ -58,6 +66,14 @@ ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_CUTDOWN),y) endif printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) + printf "dtoverlay=vc4-kms-v3d-pi4\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI5),y) + printf "dtoverlay=vc4-kms-v3d-pi5\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_AMP),) printf "dtoverlay=hifiberry-amp\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt @@ -98,12 +114,28 @@ ifeq ($(ADK_TARGET_HARDWARE_RPI3_SERIAL),y) printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y) - printf "arm_control=0x200\n" >> \ +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4),y) + printf "enable_uart=1\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) + printf "arm_64bit=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI5),y) + printf "dtparam=fan_temp0=0\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "dtparam=fan_temp0_speed=64\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "dtparam=fan_temp1_speed=64\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "dtparam=fan_temp2_speed=64\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "dtparam=fan_temp3_speed=64\n" >> \ + $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +endif ifneq ($(ADK_RUNTIME_MPEG2_KEY),) printf "decode_MPG2=$(ADK_RUNTIME_MPEG2_KEY)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt @@ -112,10 +144,5 @@ ifneq ($(ADK_RUNTIME_VC1_KEY),) printf "decode_WVC1=$(ADK_RUNTIME_VC1_KEY)\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_PACKAGE_BCM28XX_DEBUGTOOL),y) - $(INSTALL_DIR) $(IDIR_BCM28XX_DEBUGTOOL)/usr/bin - $(INSTALL_BIN) ./files/vcdbg \ - $(IDIR_BCM28XX_DEBUGTOOL)/usr/bin -endif include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/bcm28xx-bootloader/files/vcdbg b/package/bcm28xx-bootloader/files/vcdbg Binary files differdeleted file mode 100755 index ba3e55e8e..000000000 --- a/package/bcm28xx-bootloader/files/vcdbg +++ /dev/null diff --git a/package/bcm28xx-bootloader/src/boot/bootcode.bin b/package/bcm28xx-bootloader/src/boot/bootcode.bin Binary files differindex 1a8f6402a..636933850 100644 --- a/package/bcm28xx-bootloader/src/boot/bootcode.bin +++ b/package/bcm28xx-bootloader/src/boot/bootcode.bin diff --git a/package/bcm28xx-bootloader/src/boot/fixup.dat b/package/bcm28xx-bootloader/src/boot/fixup.dat Binary files differindex 79e9aa171..667cafba8 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4.dat b/package/bcm28xx-bootloader/src/boot/fixup4.dat Binary files differnew file mode 100644 index 000000000..9bf503434 --- /dev/null +++ b/package/bcm28xx-bootloader/src/boot/fixup4.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4cd.dat b/package/bcm28xx-bootloader/src/boot/fixup4cd.dat Binary files differnew file mode 100644 index 000000000..c0614cd5d --- /dev/null +++ b/package/bcm28xx-bootloader/src/boot/fixup4cd.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4db.dat b/package/bcm28xx-bootloader/src/boot/fixup4db.dat Binary files differnew file mode 100644 index 000000000..9ef1b932b --- /dev/null +++ b/package/bcm28xx-bootloader/src/boot/fixup4db.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4x.dat b/package/bcm28xx-bootloader/src/boot/fixup4x.dat Binary files differnew file mode 100644 index 000000000..9c10b2d5e --- /dev/null +++ b/package/bcm28xx-bootloader/src/boot/fixup4x.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat Binary files differindex 79b53400c..c0614cd5d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_db.dat b/package/bcm28xx-bootloader/src/boot/fixup_db.dat Binary files differindex 210ccb81d..e695c9f9d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_db.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_db.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_x.dat b/package/bcm28xx-bootloader/src/boot/fixup_x.dat Binary files differindex 1f52982a6..ea04cdbdb 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_x.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_x.dat diff --git a/package/bcm28xx-bootloader/src/boot/start.elf b/package/bcm28xx-bootloader/src/boot/start.elf Binary files differindex 030be853e..0af80e5cf 100644 --- a/package/bcm28xx-bootloader/src/boot/start.elf +++ b/package/bcm28xx-bootloader/src/boot/start.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4.elf b/package/bcm28xx-bootloader/src/boot/start4.elf Binary files differnew file mode 100644 index 000000000..a5b6bf0ef --- /dev/null +++ b/package/bcm28xx-bootloader/src/boot/start4.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4cd.elf b/package/bcm28xx-bootloader/src/boot/start4cd.elf Binary files differnew file mode 100644 index 000000000..eee7efc46 --- /dev/null +++ b/package/bcm28xx-bootloader/src/boot/start4cd.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4db.elf b/package/bcm28xx-bootloader/src/boot/start4db.elf Binary files differnew file mode 100644 index 000000000..f3e979f10 --- /dev/null +++ b/package/bcm28xx-bootloader/src/boot/start4db.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4x.elf b/package/bcm28xx-bootloader/src/boot/start4x.elf Binary files differnew file mode 100644 index 000000000..f9901aa7a --- /dev/null +++ b/package/bcm28xx-bootloader/src/boot/start4x.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_cd.elf b/package/bcm28xx-bootloader/src/boot/start_cd.elf Binary files differindex 43e40673f..46517c526 100644 --- a/package/bcm28xx-bootloader/src/boot/start_cd.elf +++ b/package/bcm28xx-bootloader/src/boot/start_cd.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_db.elf b/package/bcm28xx-bootloader/src/boot/start_db.elf Binary files differindex 3db397d43..80a04b2ba 100644 --- a/package/bcm28xx-bootloader/src/boot/start_db.elf +++ b/package/bcm28xx-bootloader/src/boot/start_db.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_x.elf b/package/bcm28xx-bootloader/src/boot/start_x.elf Binary files differindex 21d7bbfae..b21614bc2 100644 --- a/package/bcm28xx-bootloader/src/boot/start_x.elf +++ b/package/bcm28xx-bootloader/src/boot/start_x.elf |