3 files changed, 7 insertions, 9 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES b/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES
index e4f5e7d9b..296dd5e19 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES
@@ -5,7 +5,7 @@
 
 # E.g. MACHINE_FEATURE. Should *not* be in layer.conf !!
 # Radio packages
-#IMAGE_INSTALL:append:rcar-gen3 += " \
+#IMAGE_INSTALL:append:rcar-gen3 = " \
 #    si-tools \
 #    si-init \
 #    linux-firmware-wl18xx \
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
index eb1da3d35..0c344a471 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
@@ -4,16 +4,14 @@
 
 # Add a feature as a low-impact way to detect Kingfisher support in
 # recipes.
-AGL_FEATURES:append = " kingfisher"
+AGL_FEATURES:append:rcar-gen3 = " kingfisher"
 
-PREFERRED_RPROVIDER_virtual/gpsd-conf ?= "gpsd-kingfisher-conf"
-
-IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-kf${IMAGE_VERSION_SUFFIX}"
-IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}-kf"
-TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-kf-toolchain-${SDK_VERSION}"
+IMAGE_NAME:rcar-gen3 = "${IMAGE_BASENAME}-${MACHINE}-kf${IMAGE_VERSION_SUFFIX}"
+IMAGE_LINK_NAME:rcar-gen3 = "${IMAGE_BASENAME}-${MACHINE}-kf"
+TOOLCHAIN_OUTPUTNAME:rcar-gen3 = "${SDK_NAME}-kf-toolchain-${SDK_VERSION}"
 
 # Radio packages
-IMAGE_INSTALL:append:rcar-gen3 += " \
+IMAGE_INSTALL:append:rcar-gen3 = " \
     si-tools \
     si-init \
     linux-firmware-wl18xx \
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf b/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf
index 75bfcfcc7..bae421a50 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf
@@ -15,4 +15,4 @@ BBFILE_COLLECTIONS += "rcar-gen3-cogent"
 BBFILE_PATTERN_rcar-gen3-cogent := "^${LAYERDIR}/"
 BBFILE_PRIORITY_rcar-gen3-cogent = "7"
 
-LAYERSERIES_COMPAT_rcar-gen3-cogent = "dunfell"
+LAYERSERIES_COMPAT_rcar-gen3-cogent = "scarthgap"