From cd3f47b05be71f8868f92f51ba7fd78afb586c51 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Thu, 5 May 2022 15:02:28 +0200 Subject: [PATCH] armada: machine.conf: Update u-boot configs BugzID: 77953 --- conf/machine/armada-385-nbhw17.conf | 5 ++--- conf/machine/armada-385-nrhw18.conf | 5 ++--- conf/machine/include/armada.inc | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/conf/machine/armada-385-nbhw17.conf b/conf/machine/armada-385-nbhw17.conf index 32013bf..404e6e7 100644 --- a/conf/machine/armada-385-nbhw17.conf +++ b/conf/machine/armada-385-nbhw17.conf @@ -7,9 +7,8 @@ require conf/machine/include/armada.inc SERIAL_CONSOLE = "115200 ttyS1" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" -KERNEL_DEFCONFIG ??= "nbhw_defconfig" -KERNEL_DEVICETREE = "armada-385-nbhw17-prod1.dtb" -KERNEL_IMAGETYPE = "zImage" +UBOOT_MACHINE = "armada-385-hw17_defconfig" +IMAGE_BOOT_FILES = "u-boot-armada-385-hw17.kwb" PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" PV_pn-linux-netmodule = "4.12.0-${SRCPV}" diff --git a/conf/machine/armada-385-nrhw18.conf b/conf/machine/armada-385-nrhw18.conf index 60810ad..77f1261 100644 --- a/conf/machine/armada-385-nrhw18.conf +++ b/conf/machine/armada-385-nrhw18.conf @@ -12,9 +12,8 @@ KERNEL_DEVICETREE_TO_USE = "${HW18_DT}" KERNEL_MODULE_PROBECONF += "ath10k_pci" module_conf_ath10k_pci = "options ath10k_pci irq_mode=1" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada" -UBOOT_MACHINE = "armada-385-nrhw18-v2_defconfig" -IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18-v2.kwb" +UBOOT_MACHINE = "armada-385-hw18_defconfig" +IMAGE_BOOT_FILES = "u-boot-armada-385-hw18.kwb" DEFAULT_ETH = "eth2" diff --git a/conf/machine/include/armada.inc b/conf/machine/include/armada.inc index 691e0b4..ae1a59f 100644 --- a/conf/machine/include/armada.inc +++ b/conf/machine/include/armada.inc @@ -6,8 +6,8 @@ DEFAULTTUNE ?= "cortexa9thf-neon" require conf/machine/include/tune-cortexa9.inc # Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -PREFERRED_PROVIDER_u-boot = "u-boot" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada" +PREFERRED_PROVIDER_u-boot = "u-boot-armada" UBOOT_ARCH = "arm" UBOOT_MACHINE = "mvebu_db_armada8k_config"