From 0af45b70f936eb5e309b8135c49e753218cf2199 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 4 Feb 2020 23:59:16 +0100
Subject: [PATCH] brcm2708: update image names and manifest aliases for new
 libplatforminfo

---
 targets/brcm2708-bcm2708 | 6 +++++-
 targets/brcm2708-bcm2709 | 3 ++-
 targets/brcm2708-bcm2710 | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/targets/brcm2708-bcm2708 b/targets/brcm2708-bcm2708
index 15ebd193b..4d4068aba 100644
--- a/targets/brcm2708-bcm2708
+++ b/targets/brcm2708-bcm2708
@@ -1,7 +1,11 @@
 include 'brcm2708.inc'
 
-device('raspberry-pi', 'rpi', {
+device('raspberrypi-model-b', 'rpi', {
 	manifest_aliases = {
+		'raspberrypi-model-b-plus',
+		'raspberrypi-model-b-rev2',
+
+		-- from Gluon 2019.1 and older
 		'raspberry-pi-model-b-rev-2',
 		'raspberry-pi-model-b-plus-rev-1.2',
 	},
diff --git a/targets/brcm2708-bcm2709 b/targets/brcm2708-bcm2709
index e0fbf0cda..e5af9c896 100644
--- a/targets/brcm2708-bcm2709
+++ b/targets/brcm2708-bcm2709
@@ -1,7 +1,8 @@
 include 'brcm2708.inc'
 
-device('raspberry-pi-2', 'rpi-2', {
+device('raspberrypi-2-model-b', 'rpi-2', {
 	manifest_aliases = {
+		-- from Gluon 2019.1 and older
 		'raspberry-pi-2-model-b-rev-1.1',
 	},
 })
diff --git a/targets/brcm2708-bcm2710 b/targets/brcm2708-bcm2710
index fc6473650..1cf9ef369 100644
--- a/targets/brcm2708-bcm2710
+++ b/targets/brcm2708-bcm2710
@@ -1,7 +1,10 @@
 include 'brcm2708.inc'
 
-device('raspberry-pi-3', 'rpi-3', {
+device('raspberrypi-3-model-b', 'rpi-3', {
 	manifest_aliases = {
+		'raspberrypi-3-model-b-plus',
+
+		-- from Gluon 2019.1 and older
 		'raspberry-pi-3-model-b-rev-1.2',
 	},
 })
-- 
GitLab