diff options
| author | Joel Sherrill <joel@rtems.org> | 2018-05-09 15:22:04 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2018-05-09 15:22:04 -0500 |
| commit | c8dcdf5438836255870893994d26539da7ff3c9a (patch) | |
| tree | 0a36878ac78b1a0fdb299154668a65bab77658bf /bsps | |
| parent | smdk2410: Move define of CPU_S3C2410 to bspopts.h (diff) | |
| download | rtems-c8dcdf5438836255870893994d26539da7ff3c9a.tar.bz2 | |
sparc64 niagara, usiii: Remove -D options from cfg file and move to bspopts.h
Updates #3425.
Diffstat (limited to 'bsps')
| -rw-r--r-- | bsps/sparc64/include/arch/arch.h | 4 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/frame.h | 4 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/mmu.h | 4 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/tlb.h | 3 | ||||
| -rw-r--r-- | bsps/sparc64/include/arch/mm/tte.h | 4 | ||||
| -rw-r--r-- | bsps/sparc64/niagara/config/niagara.cfg | 2 | ||||
| -rw-r--r-- | bsps/sparc64/usiii/config/usiii.cfg | 2 |
7 files changed, 21 insertions, 2 deletions
diff --git a/bsps/sparc64/include/arch/arch.h b/bsps/sparc64/include/arch/arch.h index 5fdd4a2cb2..36aa9222a6 100644 --- a/bsps/sparc64/include/arch/arch.h +++ b/bsps/sparc64/include/arch/arch.h @@ -37,10 +37,14 @@ #ifndef KERN_sparc64_ARCH_H_ #define KERN_sparc64_ARCH_H_ +#include <bspopts.h> + #if defined (SUN4U) #include <arch/sun4u/arch.h> #elif defined (SUN4V) #include <arch/sun4v/arch.h> +#else +#error "No SUN model defined" #endif #define ASI_AIUP 0x10 /** Access to primary context with user privileges. */ diff --git a/bsps/sparc64/include/arch/mm/frame.h b/bsps/sparc64/include/arch/mm/frame.h index fb66e54bf1..2fc17cc43c 100644 --- a/bsps/sparc64/include/arch/mm/frame.h +++ b/bsps/sparc64/include/arch/mm/frame.h @@ -35,10 +35,14 @@ #ifndef KERN_sparc64_FRAME_H_ #define KERN_sparc64_FRAME_H_ +#include <bspopts.h> + #if defined (SUN4U) #include <arch/mm/sun4u/frame.h> #elif defined (SUN4V) #include <arch/mm/sun4v/frame.h> +#else +#error "No SUN model defined" #endif #endif diff --git a/bsps/sparc64/include/arch/mm/mmu.h b/bsps/sparc64/include/arch/mm/mmu.h index 1d445f2e24..aab143f541 100644 --- a/bsps/sparc64/include/arch/mm/mmu.h +++ b/bsps/sparc64/include/arch/mm/mmu.h @@ -35,10 +35,14 @@ #ifndef KERN_sparc64_MMU_H_ #define KERN_sparc64_MMU_H_ +#include <bspopts.h> + #if defined (SUN4U) #include <arch/mm/sun4u/mmu.h> #elif defined (SUN4V) #include <arch/mm/sun4v/mmu.h> +#else +#error "No SUN model defined" #endif diff --git a/bsps/sparc64/include/arch/mm/tlb.h b/bsps/sparc64/include/arch/mm/tlb.h index 4adf26ca64..7a6b85db5a 100644 --- a/bsps/sparc64/include/arch/mm/tlb.h +++ b/bsps/sparc64/include/arch/mm/tlb.h @@ -35,11 +35,14 @@ #ifndef KERN_sparc64_TLB_H_ #define KERN_sparc64_TLB_H_ +#include <bspopts.h> #if defined (SUN4U) #include <arch/mm/sun4u/tlb.h> #elif defined (SUN4V) #include <arch/mm/sun4v/tlb.h> +#else +#error "No SUN model defined" #endif #endif diff --git a/bsps/sparc64/include/arch/mm/tte.h b/bsps/sparc64/include/arch/mm/tte.h index f0b746e8c6..10a672bae0 100644 --- a/bsps/sparc64/include/arch/mm/tte.h +++ b/bsps/sparc64/include/arch/mm/tte.h @@ -35,10 +35,14 @@ #ifndef KERN_sparc64_TTE_H_ #define KERN_sparc64_TTE_H_ +#include <bspopts.h> + #if defined (SUN4U) #include <arch/mm/sun4u/tte.h> #elif defined (SUN4V) #include <arch/mm/sun4v/tte.h> +#else +#error "No SUN model defined" #endif #endif diff --git a/bsps/sparc64/niagara/config/niagara.cfg b/bsps/sparc64/niagara/config/niagara.cfg index 2fd8973bd6..bfa73aa686 100644 --- a/bsps/sparc64/niagara/config/niagara.cfg +++ b/bsps/sparc64/niagara/config/niagara.cfg @@ -7,7 +7,7 @@ RTEMS_CPU=sparc64 # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. -CPU_CFLAGS = -mcpu=niagara -DSUN4V +CPU_CFLAGS = -mcpu=niagara # optimize flag: typically -g -O2 CFLAGS_OPTIMIZE_V = -g -O2 diff --git a/bsps/sparc64/usiii/config/usiii.cfg b/bsps/sparc64/usiii/config/usiii.cfg index b9fad21839..ee1c5089b0 100644 --- a/bsps/sparc64/usiii/config/usiii.cfg +++ b/bsps/sparc64/usiii/config/usiii.cfg @@ -7,7 +7,7 @@ RTEMS_CPU=sparc64 # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. -CPU_CFLAGS = -mcpu=ultrasparc3 -DUS3 -DSUN4U +CPU_CFLAGS = -mcpu=ultrasparc3 # optimize flag: typically -g -O2 CFLAGS_OPTIMIZE_V = -g -O2 |