From 1c2ee9f48e3cd973085a8a2116ed629a1869f8ef Mon Sep 17 00:00:00 2001 From: Grzegorz Kowalski Date: Mon, 11 Mar 2024 20:15:04 +0100 Subject: [PATCH] move bootloader configuration to generic sunxi --- conf/machine/pinecube.conf | 3 --- wic/pinecube.wks | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/machine/pinecube.conf b/conf/machine/pinecube.conf index 77cfe41..6dad39e 100644 --- a/conf/machine/pinecube.conf +++ b/conf/machine/pinecube.conf @@ -28,9 +28,6 @@ SERIAL_CONSOLES ?= "115200;ttyS0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # Bootloader -EXTRA_IMAGEDEPENDS += "virtual/bootloader" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" -SPL_BINARY = "u-boot-sunxi-with-spl.bin" UBOOT_MACHINE = "pinecube_defconfig" # wic SD card image diff --git a/wic/pinecube.wks b/wic/pinecube.wks index 8450c0f..38c6fe5 100644 --- a/wic/pinecube.wks +++ b/wic/pinecube.wks @@ -7,7 +7,7 @@ # u-boot-sunxi-with-spl.bin. It should be added to machine's # IMAGE_BOOT_FILES for wic to find it. -part u-boot --source rawcopy --sourceparams="file=u-boot-sunxi-with-spl.bin" --ondisk mmcblk0 --offset 8 --no-table +part u-boot --source rawcopy --sourceparams="file=${SPL_BINARY}" --ondisk mmcblk0 --offset 8 --no-table # add your partitions and options below: part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label helium-root --active --align 4