From dd280054903db8c356f2325934b3cbf4e3c13176 Mon Sep 17 00:00:00 2001
From: Hesham Almatary <hesham.almatary@cl.cam.ac.uk>
Date: Sun, 18 Dec 2022 12:22:06 +0000
Subject: spec/build/riscv: Default rv64* BSPs to medany cmodel

Currently generic RISC-V BSPs (riscv/riscv) that start with rv64 and not
rv64*_medany will start at 0x70000000. This adds high maintenance overhead
and deviates from almost all other RISC-V-based OSes and baremetal programs
that start at 0x80000000. Further, testing now has to account for an extra
parameter (medany or not) that doubles the number of BSPs need to be
tested.

This commit defaults all RV64 BSPs to use medany code model to allow starting
all BSPs at 0x80000000. BSPs that require different code models and/or
start addresses are custom and need to add their own entries.

Updates #4775
---
 spec/build/bsps/riscv/riscv/abi.yml                 | 13 ++-----------
 spec/build/bsps/riscv/riscv/bsprv64imacmedany.yml   | 19 -------------------
 spec/build/bsps/riscv/riscv/bsprv64imafdcmedany.yml | 19 -------------------
 spec/build/bsps/riscv/riscv/bsprv64imafdmedany.yml  | 19 -------------------
 4 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 spec/build/bsps/riscv/riscv/bsprv64imacmedany.yml
 delete mode 100644 spec/build/bsps/riscv/riscv/bsprv64imafdcmedany.yml
 delete mode 100644 spec/build/bsps/riscv/riscv/bsprv64imafdmedany.yml

diff --git a/spec/build/bsps/riscv/riscv/abi.yml b/spec/build/bsps/riscv/riscv/abi.yml
index 3ef8b0681d..29dd7b449d 100644
--- a/spec/build/bsps/riscv/riscv/abi.yml
+++ b/spec/build/bsps/riscv/riscv/abi.yml
@@ -21,21 +21,17 @@ default-by-variant:
   - -mabi=lp64d
   - -mcmodel=medany
   variants:
-  - riscv/rv64imafdc_medany
-- value:
-  - -march=rv64imafdc
-  - -mabi=lp64d
-  variants:
   - riscv/rv64imafdc
 - value:
   - -march=rv64imafd
   - -mabi=lp64d
   - -mcmodel=medany
   variants:
-  - riscv/rv64imafd_medany
+  - riscv/rv64imafd
 - value:
   - -march=rv64imafd
   - -mabi=lp64d
+  - -mcmodel=medany
   variants:
   - riscv/rv64imafd
 - value:
@@ -43,11 +39,6 @@ default-by-variant:
   - -mabi=lp64
   - -mcmodel=medany
   variants:
-  - riscv/rv64imac_medany
-- value:
-  - -march=rv64imac
-  - -mabi=lp64
-  variants:
   - riscv/rv64imac
 - value: []
   variants:
diff --git a/spec/build/bsps/riscv/riscv/bsprv64imacmedany.yml b/spec/build/bsps/riscv/riscv/bsprv64imacmedany.yml
deleted file mode 100644
index c0db3e0720..0000000000
--- a/spec/build/bsps/riscv/riscv/bsprv64imacmedany.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-arch: riscv
-bsp: rv64imac_medany
-build-type: bsp
-cflags: []
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-cppflags: []
-enabled-by: true
-family: riscv
-includes: []
-install: []
-links:
-- role: build-dependency
-  uid: ../../opto2
-- role: build-dependency
-  uid: grp
-source: []
-type: build
diff --git a/spec/build/bsps/riscv/riscv/bsprv64imafdcmedany.yml b/spec/build/bsps/riscv/riscv/bsprv64imafdcmedany.yml
deleted file mode 100644
index e4ecd4736a..0000000000
--- a/spec/build/bsps/riscv/riscv/bsprv64imafdcmedany.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-arch: riscv
-bsp: rv64imafdc_medany
-build-type: bsp
-cflags: []
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-cppflags: []
-enabled-by: true
-family: riscv
-includes: []
-install: []
-links:
-- role: build-dependency
-  uid: ../../opto2
-- role: build-dependency
-  uid: grp
-source: []
-type: build
diff --git a/spec/build/bsps/riscv/riscv/bsprv64imafdmedany.yml b/spec/build/bsps/riscv/riscv/bsprv64imafdmedany.yml
deleted file mode 100644
index 9e01572c70..0000000000
--- a/spec/build/bsps/riscv/riscv/bsprv64imafdmedany.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-arch: riscv
-bsp: rv64imafd_medany
-build-type: bsp
-cflags: []
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-cppflags: []
-enabled-by: true
-family: riscv
-includes: []
-install: []
-links:
-- role: build-dependency
-  uid: ../../opto2
-- role: build-dependency
-  uid: grp
-source: []
-type: build
-- 
cgit v1.2.3