diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 9e552557f5..e39fca9446 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -255,7 +255,13 @@ makeinstall_target() { fi elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then mkdir -p $INSTALL/usr/share/bootloader/overlays + + # install platform dtbs, but remove upstream kernel dtbs (i.e. without downstream + # drivers and decent USB support) as these are not required by LibreELEC cp -p arch/$TARGET_KERNEL_ARCH/boot/dts/*.dtb $INSTALL/usr/share/bootloader + rm -f $INSTALL/usr/share/bootloader/bcm283*.dtb + + # install overlay dtbs for dtb in arch/$TARGET_KERNEL_ARCH/boot/dts/overlays/*.dtbo; do cp $dtb $INSTALL/usr/share/bootloader/overlays 2>/dev/null || : done diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh index 6ee3917146..eb7a3d85b4 100755 --- a/packages/tools/bcm2835-bootloader/scripts/update.sh +++ b/packages/tools/bcm2835-bootloader/scripts/update.sh @@ -34,6 +34,7 @@ cp -p $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT [ -f $SYSTEM_ROOT/usr/share/bootloader/dt-blob.bin ] && cp -p $SYSTEM_ROOT/usr/share/bootloader/dt-blob.bin $BOOT_ROOT + rm -f $BOOT_ROOT/bcm283*.dtb # cleanup excess dtb's used by upstream kernels (ie. not LE) cp -p $SYSTEM_ROOT/usr/share/bootloader/*.dtb $BOOT_ROOT cp -pR $SYSTEM_ROOT/usr/share/bootloader/overlays $BOOT_ROOT