From d3f0f1fbcf6db9ab7c5ca318485d13e28d59efd1 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sat, 19 May 2018 10:50:10 +0200 Subject: [PATCH] Fix bootloader --- buildroot-external/board/rpi3/barebox.config | 3 +-- buildroot-external/configs/rpi3_defconfig | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildroot-external/board/rpi3/barebox.config b/buildroot-external/board/rpi3/barebox.config index 0878a2a09..3f5598bbe 100644 --- a/buildroot-external/board/rpi3/barebox.config +++ b/buildroot-external/board/rpi3/barebox.config @@ -1,7 +1,6 @@ # CONFIG_LOCALVERSION_AUTO is not set CONFIG_ARCH_BCM283X=y -CONFIG_MACH_RPI=y -CONFIG_MACH_RPI2=y +CONFIG_MACH_RPI3=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 9a7d80d6e..0afd21d81 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -22,8 +22,8 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rpi-4.14.y" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" @@ -70,6 +70,7 @@ BR2_TARGET_BAREBOX_CUSTOM_VERSION=y BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2018.05.0" BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/rpi3/barebox.config" +BR2_TARGET_BAREBOX_IMAGE_FILE="barebox-raspberry-pi-3.img" BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/barebox-env" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y