From fe53c3cf24e57acc36f5163c2cd7501e5500a33b Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 12 Aug 2020 23:32:51 +0300 Subject: [PATCH] Raspberry Pi 4: fix rpi-firmware boot files issue --- board/raspberrypi4/postscript.sh | 4 ++-- configs/bananapim1_defconfig | 1 + configs/orangepione_defconfig | 1 + configs/orangepizero_defconfig | 1 + configs/raspberrypi4_defconfig | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi4/postscript.sh b/board/raspberrypi4/postscript.sh index f2572d6296..89f9d74e88 100755 --- a/board/raspberrypi4/postscript.sh +++ b/board/raspberrypi4/postscript.sh @@ -10,8 +10,8 @@ cp ${BOARD_DIR}/initrd.gz ${BOOT_DIR} cp ${IMG_DIR}/zImage ${BOOT_DIR}/kernel.img cp ${IMG_DIR}/bcm2711-rpi-4-b.dtb ${BOOT_DIR} cp ${RPI_FW_DIR}/bootcode.bin ${BOOT_DIR} -cp ${RPI_FW_DIR}/start4.elf ${BOOT_DIR} -cp ${RPI_FW_DIR}/fixup4.dat ${BOOT_DIR} +cp ${RPI_FW_DIR}/start.elf ${BOOT_DIR} +cp ${RPI_FW_DIR}/fixup.dat ${BOOT_DIR} # copy overlays mkdir -p ${BOOT_DIR}/overlays diff --git a/configs/bananapim1_defconfig b/configs/bananapim1_defconfig index d9d19282cc..650cf0f1aa 100644 --- a/configs/bananapim1_defconfig +++ b/configs/bananapim1_defconfig @@ -88,3 +88,4 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DTC=y +BR2_PACKAGE_HOST_PYTHON3=y diff --git a/configs/orangepione_defconfig b/configs/orangepione_defconfig index cc535fc30b..ed6e478c7b 100644 --- a/configs/orangepione_defconfig +++ b/configs/orangepione_defconfig @@ -85,4 +85,5 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_E2FSPROGS=y +BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/orangepizero_defconfig b/configs/orangepizero_defconfig index c41e304f6a..65e73d481a 100644 --- a/configs/orangepizero_defconfig +++ b/configs/orangepizero_defconfig @@ -85,4 +85,5 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_E2FSPROGS=y +BR2_PACKAGE_HOST_PYTHON3=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 0e2ce398da..71fba59e70 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -41,6 +41,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_FIRMWARE_X=y BR2_PACKAGE_RNG_TOOLS=y BR2_PACKAGE_RPI_ARMMEM=y