[PATCH 3/3] bsps/powerpc: Remove __ppc_generic define
Sebastian Huber
sebastian.huber at embedded-brains.de
Sun Sep 20 15:47:57 UTC 2020
Do not force BSPs to define __ppc_generic.
This was probably the last command line define in the BSPs.
---
bsps/powerpc/include/rtems/powerpc/powerpc.h | 6 ------
spec/build/bsps/powerpc/beatnik/abi.yml | 1 -
.../bsps/powerpc/motorola_powerpc/grp.yml | 2 --
.../motorola_powerpc/optppcgeneric.yml | 21 -------------------
spec/build/bsps/powerpc/mpc55xxevb/abi.yml | 1 -
spec/build/bsps/powerpc/mvme3100/abi.yml | 1 -
spec/build/bsps/powerpc/qoriq/abi.yml | 3 ---
spec/build/bsps/powerpc/t32mppc/abi.yml | 1 -
8 files changed, 36 deletions(-)
delete mode 100644 spec/build/bsps/powerpc/motorola_powerpc/optppcgeneric.yml
diff --git a/bsps/powerpc/include/rtems/powerpc/powerpc.h b/bsps/powerpc/include/rtems/powerpc/powerpc.h
index 4e16dd0be8..6a6b24f718 100644
--- a/bsps/powerpc/include/rtems/powerpc/powerpc.h
+++ b/bsps/powerpc/include/rtems/powerpc/powerpc.h
@@ -282,12 +282,6 @@ extern "C" {
#define PPC_INTERRUPT_MAX 125
#define PPC_USE_MULTIPLE 1
-#elif defined(__ppc_generic)
-
-#else
-
-#error "Unsupported CPU Model"
-
#endif
/*
diff --git a/spec/build/bsps/powerpc/beatnik/abi.yml b/spec/build/bsps/powerpc/beatnik/abi.yml
index 2413eebb8f..e58eba74f5 100644
--- a/spec/build/bsps/powerpc/beatnik/abi.yml
+++ b/spec/build/bsps/powerpc/beatnik/abi.yml
@@ -7,7 +7,6 @@ build-type: option
copyrights:
- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
default:
-- -D__ppc_generic
- -mcpu=7400
default-by-variant: []
description: |
diff --git a/spec/build/bsps/powerpc/motorola_powerpc/grp.yml b/spec/build/bsps/powerpc/motorola_powerpc/grp.yml
index 5b84b81fe5..f256fec10f 100644
--- a/spec/build/bsps/powerpc/motorola_powerpc/grp.yml
+++ b/spec/build/bsps/powerpc/motorola_powerpc/grp.yml
@@ -31,8 +31,6 @@ links:
uid: optmpc8240
- role: build-dependency
uid: optmvme2100
-- role: build-dependency
- uid: optppcgeneric
- role: build-dependency
uid: optqemu
- role: build-dependency
diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optppcgeneric.yml b/spec/build/bsps/powerpc/motorola_powerpc/optppcgeneric.yml
deleted file mode 100644
index 275adbb877..0000000000
--- a/spec/build/bsps/powerpc/motorola_powerpc/optppcgeneric.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-boolean: null
-- define-condition: null
-build-type: option
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
- variants:
- - powerpc/qemuprep
-- value: true
- variants:
- - powerpc/qemuprep-altivec
-description: |
- Define when generic PPC -- undefined for others
-enabled-by: true
-links: []
-name: __ppc_generic
-type: build
diff --git a/spec/build/bsps/powerpc/mpc55xxevb/abi.yml b/spec/build/bsps/powerpc/mpc55xxevb/abi.yml
index 7473a4f344..dca50fca94 100644
--- a/spec/build/bsps/powerpc/mpc55xxevb/abi.yml
+++ b/spec/build/bsps/powerpc/mpc55xxevb/abi.yml
@@ -7,7 +7,6 @@ build-type: option
copyrights:
- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
default:
-- -D__ppc_generic
- -mcpu=8540
- -msoft-float
- -meabi
diff --git a/spec/build/bsps/powerpc/mvme3100/abi.yml b/spec/build/bsps/powerpc/mvme3100/abi.yml
index 63ced0c662..41a634b4dc 100644
--- a/spec/build/bsps/powerpc/mvme3100/abi.yml
+++ b/spec/build/bsps/powerpc/mvme3100/abi.yml
@@ -7,7 +7,6 @@ build-type: option
copyrights:
- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
default:
-- -D__ppc_generic
- -mcpu=powerpc
- -msoft-float
default-by-variant: []
diff --git a/spec/build/bsps/powerpc/qoriq/abi.yml b/spec/build/bsps/powerpc/qoriq/abi.yml
index 9270ae2495..2d7477a565 100644
--- a/spec/build/bsps/powerpc/qoriq/abi.yml
+++ b/spec/build/bsps/powerpc/qoriq/abi.yml
@@ -7,7 +7,6 @@ build-type: option
copyrights:
- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
default:
-- -D__ppc_generic
- -mcpu=8540
- -msoft-float
- -meabi
@@ -15,13 +14,11 @@ default:
- -mstrict-align
default-by-variant:
- value:
- - -D__ppc_generic
- -mcpu=e6500
- -m64
variants:
- powerpc/qoriq_e6500_64
- value:
- - -D__ppc_generic
- -mcpu=e6500
- -m32
- -msdata=sysv
diff --git a/spec/build/bsps/powerpc/t32mppc/abi.yml b/spec/build/bsps/powerpc/t32mppc/abi.yml
index 8f804424bf..30d75f7e1d 100644
--- a/spec/build/bsps/powerpc/t32mppc/abi.yml
+++ b/spec/build/bsps/powerpc/t32mppc/abi.yml
@@ -7,7 +7,6 @@ build-type: option
copyrights:
- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
default:
-- -D__ppc_generic
- -mcpu=8540
- -msoft-float
- -meabi
--
2.26.2
More information about the devel
mailing list