From 58102512a5d1dbf898715ca45c7ca98e20d07e91 Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Thu, 5 May 2022 15:03:10 +0200
Subject: [PATCH] HW17: machine.conf: Update kernel configuration

BugzID: 77953
---
 conf/machine/armada-385-nbhw17.conf | 5 +----
 conf/machine/include/armada.inc     | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/conf/machine/armada-385-nbhw17.conf b/conf/machine/armada-385-nbhw17.conf
index 404e6e7..eac08d8 100644
--- a/conf/machine/armada-385-nbhw17.conf
+++ b/conf/machine/armada-385-nbhw17.conf
@@ -10,8 +10,5 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
 UBOOT_MACHINE = "armada-385-hw17_defconfig"
 IMAGE_BOOT_FILES = "u-boot-armada-385-hw17.kwb"
 
+KERNEL_DEVICETREE_TO_USE = "${HW17_DT}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
-PV_pn-linux-netmodule = "4.12.0-${SRCPV}"
-SRC_URI_pn-linux-netmodule = "git://github.com/netmodule/linux.git;protocol=https;branch=4.12/standard/nrhw14"
-SRCREV_pn-linux-netmodule = "2fb3360ec3cf672c74321e1dbe5c04e59d1ced11"
-
diff --git a/conf/machine/include/armada.inc b/conf/machine/include/armada.inc
index ae1a59f..96ef86f 100644
--- a/conf/machine/include/armada.inc
+++ b/conf/machine/include/armada.inc
@@ -28,6 +28,7 @@ MACHINEOVERRIDES =. "${NM_TARGET}:"
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEFCONFIG = "armada-385-netmodule_defconfig"
 
+HW17_DT = "armada-385-nbhw17-prod1.dtb"
 HW18_DT = "armada-385-nrhw18-prod1.dtb"
 
-KERNEL_DEVICETREE = "${HW18_DT}"
+KERNEL_DEVICETREE = "${HW17_DT} ${HW18_DT}"