[meta-arm,1/4] arm-bsp: branding CA5DS to Corstone-500

Submitted by abdellatif.elkhlifi@arm.com on Nov. 24, 2020, 11:36 a.m. | Patch ID: 178250

Details

Message ID 20201124113621.3663-2-abdellatif.elkhlifi@arm.com
State New
Headers show

Commit Message

abdellatif.elkhlifi@arm.com Nov. 24, 2020, 11:36 a.m.
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>


This commit changes the name of CA5DS platform to Corstone-500

Change-Id: I7fc687aea8ce6bba6d7021963ad4cb38f30858d5
Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>

---
 .../machine/{a5ds.conf => corstone500.conf}   | 13 +++++--------
 .../documentation/{a5ds.md => corstone500.md} | 12 ++++++------
 ...inc => trusted-firmware-a-corstone500.inc} |  4 ++--
 .../trusted-firmware-a_2.3.bbappend           |  2 +-
 .../0001-armv7-add-mmio-timer.patch           |  0
 ...002-board-arm-add-corstone500-board.patch} | 19 +++++++++++--------
 .../u-boot/u-boot_2020.07.bbappend            |  7 ++++---
 .../linux/linux-arm-platforms.inc             |  5 ++---
 8 files changed, 31 insertions(+), 31 deletions(-)
 rename meta-arm-bsp/conf/machine/{a5ds.conf => corstone500.conf} (64%)
 rename meta-arm-bsp/documentation/{a5ds.md => corstone500.md} (67%)
 rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a-a5ds.inc => trusted-firmware-a-corstone500.inc} (85%)
 rename meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/{a5ds => corstone500}/0001-armv7-add-mmio-timer.patch (100%)
 rename meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/{a5ds/0002-board-arm-add-designstart-cortex-a5-board.patch => corstone500/0002-board-arm-add-corstone500-board.patch} (96%)

-- 
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#1433): https://lists.yoctoproject.org/g/meta-arm/message/1433
Mute This Topic: https://lists.yoctoproject.org/mt/78474995/1003190
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/conf/machine/a5ds.conf b/meta-arm-bsp/conf/machine/corstone500.conf
similarity index 64%
rename from meta-arm-bsp/conf/machine/a5ds.conf
rename to meta-arm-bsp/conf/machine/corstone500.conf
index 8a4b36d..0358f1c 100644
--- a/meta-arm-bsp/conf/machine/a5ds.conf
+++ b/meta-arm-bsp/conf/machine/corstone500.conf
@@ -1,12 +1,10 @@ 
-# Configuration for Cortex-A5 DesignStart development board
-
 #@TYPE: Machine
-#@NAME: a5ds machine
-#@DESCRIPTION: Machine configuration for Cortex-A5 DesignStart
+#@NAME: Corstone-500 machine
+#@DESCRIPTION: Machine configuration for the Corstone-500 platform
 
 require conf/machine/include/tune-cortexa5.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.3%"
 KBUILD_DEFCONFIG = "multi_v7_defconfig"
 KCONFIG_MODE = "--alldefconfig"
@@ -19,9 +17,8 @@  SERIAL_CONSOLES = "115200;ttyAMA0"
 
 IMAGE_FSTYPES += "tar.bz2 cpio.gz"
 
-# Cortex-a5 u-boot configuration
-PREFERRED_VERSION_u-boot ?= "2020.07"
+# Corstone-500 u-boot configuration
 UBOOT_MACHINE = "designstart_ca5_defconfig"
 UBOOT_IMAGE_ENTRYPOINT = "0x84000000"
 UBOOT_IMAGE_LOADADDRESS = "0x84000000"
-
+PREFERRED_VERSION_u-boot ?= "2020.07"
\ No newline at end of file
diff --git a/meta-arm-bsp/documentation/a5ds.md b/meta-arm-bsp/documentation/corstone500.md
similarity index 67%
rename from meta-arm-bsp/documentation/a5ds.md
rename to meta-arm-bsp/documentation/corstone500.md
index 38c719a..92f8a98 100644
--- a/meta-arm-bsp/documentation/a5ds.md
+++ b/meta-arm-bsp/documentation/corstone500.md
@@ -1,19 +1,19 @@ 
-# Cortex-A5 DesignStart A5DS Platform Support in meta-arm-bsp
+# Corstone-500 Platform Support in meta-arm-bsp
 
 ## Howto Build and Run
 
 ### Configuration:
 In the local.conf file, MACHINE should be set as follow:
-MACHINE ?= "a5ds"
-DISTRO ?= "iota-tiny"
+MACHINE ?= "corstone500"
+DISTRO ?= "poky-tiny"
 
 Or set environment variables with that values:
 
-MACHINE "a5ds"
-DISTRO "iota-tiny"
+MACHINE "corstone500"
+DISTRO "poky-tiny"
 
 ### Build:
-``bash$ bitbake iota-tiny-image```
+``bash$ bitbake arm-reference-image```
 
 ### Run:
 To run the result in a Fixed Virtual Platform please get:
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-a5ds.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone500.inc
similarity index 85%
rename from meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-a5ds.inc
rename to meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone500.inc
index d892794..4d3432c 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-a5ds.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone500.inc
@@ -1,6 +1,6 @@ 
-# Cortex-A5 Designstart specific TFA support
+# Corstone-500 specific TFA support
 
-COMPATIBLE_MACHINE = "a5ds"
+COMPATIBLE_MACHINE = "corstone500"
 TFA_PLATFORM = "a5ds"
 TFA_DEBUG = "1"
 TFA_UBOOT = "1"
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
index 0e6fb1e..02e69a8 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
@@ -2,7 +2,7 @@ 
 
 MACHINE_TFA_REQUIRE ?= ""
 MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc"
-MACHINE_TFA_REQUIRE_a5ds = "trusted-firmware-a-a5ds.inc"
+MACHINE_TFA_REQUIRE_corstone500 = "trusted-firmware-a-corstone500.inc"
 MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc"
 MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
 MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0001-armv7-add-mmio-timer.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/corstone500/0001-armv7-add-mmio-timer.patch
similarity index 100%
rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0001-armv7-add-mmio-timer.patch
rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/corstone500/0001-armv7-add-mmio-timer.patch
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0002-board-arm-add-designstart-cortex-a5-board.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/corstone500/0002-board-arm-add-corstone500-board.patch
similarity index 96%
rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0002-board-arm-add-designstart-cortex-a5-board.patch
rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/corstone500/0002-board-arm-add-corstone500-board.patch
index 204bdb3..33e1b15 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0002-board-arm-add-designstart-cortex-a5-board.patch
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/corstone500/0002-board-arm-add-corstone500-board.patch
@@ -1,4 +1,7 @@ 
-From eed15d394137616a18add204a85b0e9dd5b00e0b Mon Sep 17 00:00:00 2001
+Upstream-Status: Pending [Not submitted to upstream yet]
+Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
+
+From f58e263f575c0520926e4737694e11da31cb4886 Mon Sep 17 00:00:00 2001
 From: Rui Miguel Silva <rui.silva@linaro.org>
 Date: Wed, 8 Jan 2020 09:48:11 +0000
 Subject: [PATCH 2/2] board: arm: add designstart cortex-a5 board
@@ -22,7 +25,7 @@  Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
  create mode 100644 include/configs/designstart_ca5.h
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 54d65f84889f..7bc12f0b4300 100644
+index 54d65f8488..7bc12f0b43 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -665,6 +665,12 @@ config ARCH_BCM6858
@@ -48,7 +51,7 @@  index 54d65f84889f..7bc12f0b4300 100644
  source "board/broadcom/bcm28155_ap/Kconfig"
 diff --git a/board/armltd/designstart/Kconfig b/board/armltd/designstart/Kconfig
 new file mode 100644
-index 000000000000..a9564e8655e2
+index 0000000000..a9564e8655
 --- /dev/null
 +++ b/board/armltd/designstart/Kconfig
 @@ -0,0 +1,12 @@
@@ -66,7 +69,7 @@  index 000000000000..a9564e8655e2
 +endif
 diff --git a/board/armltd/designstart/Makefile b/board/armltd/designstart/Makefile
 new file mode 100644
-index 000000000000..d2dc2b74ed85
+index 0000000000..d2dc2b74ed
 --- /dev/null
 +++ b/board/armltd/designstart/Makefile
 @@ -0,0 +1,8 @@
@@ -80,7 +83,7 @@  index 000000000000..d2dc2b74ed85
 +obj-y := designstart.o
 diff --git a/board/armltd/designstart/designstart.c b/board/armltd/designstart/designstart.c
 new file mode 100644
-index 000000000000..658057a00330
+index 0000000000..658057a003
 --- /dev/null
 +++ b/board/armltd/designstart/designstart.c
 @@ -0,0 +1,49 @@
@@ -135,7 +138,7 @@  index 000000000000..658057a00330
 +
 diff --git a/configs/designstart_ca5_defconfig b/configs/designstart_ca5_defconfig
 new file mode 100644
-index 000000000000..a2a756740295
+index 0000000000..a2a7567402
 --- /dev/null
 +++ b/configs/designstart_ca5_defconfig
 @@ -0,0 +1,37 @@
@@ -178,7 +181,7 @@  index 000000000000..a2a756740295
 +
 diff --git a/include/configs/designstart_ca5.h b/include/configs/designstart_ca5.h
 new file mode 100644
-index 000000000000..6db5b1cf4ac2
+index 0000000000..6db5b1cf4a
 --- /dev/null
 +++ b/include/configs/designstart_ca5.h
 @@ -0,0 +1,122 @@
@@ -305,5 +308,5 @@  index 000000000000..6db5b1cf4ac2
 +#define CONFIG_ENV_IS_IN_FLASH                1
 +#endif
 -- 
-2.28.0
+2.17.1
 
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend
index c1f8b01..c4bd3d2 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend
@@ -6,10 +6,11 @@  FILESEXTRAPATHS_prepend_fvp-base = "${THIS_DIR}/${BP}/fvp-common:"
 FILESEXTRAPATHS_prepend_foundation-armv8 = "${THIS_DIR}/${BP}/fvp-common:"
 
 #
-# Cortex-A5 DesignStart KMACHINE
+# Corstone-500 MACHINE
 #
-SRC_URI_append_a5ds = " file://0001-armv7-add-mmio-timer.patch \
-                        file://0002-board-arm-add-designstart-cortex-a5-board.patch"
+SRC_URI_append_corstone500 = " \
+                   file://0001-armv7-add-mmio-timer.patch \
+                   file://0002-board-arm-add-corstone500-board.patch"
 
 #
 # FVP FOUNDATION KMACHINE
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
index 62b1dec..5d71bab 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
@@ -18,10 +18,9 @@  SRC_URI_append_gem5-arm64 = " ${SRC_URI_KMETA}"
 SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5"
 
 #
-# Cortex-A5 DesignStart KMACHINE
+# Corstone-500 KMACHINE
 #
-COMPATIBLE_MACHINE_a5ds = "a5ds"
-KMACHINE_a5ds = "a5ds"
+COMPATIBLE_MACHINE_corstone500 = "corstone500"
 
 #
 # FVP FOUNDATION KMACHINE