sparc: consolidate CONFIG_{LEON, LEON2, LEON3} definition

CONFIG_LEON is already defined in
arch/sparc/cpu/{leon2,leon3}/config.mk.
Remove the redundant definition in board header files.

All leon3 boards define CONFIG_LEON3 in board header files.
Move the definition to arch/sparc/cpu/leon3/config.mk.

CONFIG_LEON2 can be move to arch/sparc/cpu/leon2/config.mk
as well.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
master
Masahiro Yamada 11 years ago committed by Tom Rini
parent a8a752c084
commit ece0d37014
  1. 2
      arch/sparc/cpu/leon2/config.mk
  2. 2
      arch/sparc/cpu/leon3/config.mk
  3. 2
      include/configs/gr_cpci_ax2000.h
  4. 2
      include/configs/gr_ep2s60.h
  5. 2
      include/configs/gr_xc3s_1500.h
  6. 2
      include/configs/grsim.h
  7. 2
      include/configs/grsim_leon2.h

@ -7,4 +7,4 @@
PLATFORM_RELFLAGS += -fPIC
PLATFORM_CPPFLAGS += -DCONFIG_LEON
PLATFORM_CPPFLAGS += -DCONFIG_LEON -DCONFIG_LEON2

@ -7,4 +7,4 @@
PLATFORM_RELFLAGS += -fPIC
PLATFORM_CPPFLAGS += -DCONFIG_LEON
PLATFORM_CPPFLAGS += -DCONFIG_LEON -DCONFIG_LEON3

@ -19,8 +19,6 @@
* (easy to change)
*/
#define CONFIG_LEON3 /* This is an LEON3 CPU */
#define CONFIG_LEON 1 /* This is an LEON CPU */
#define CONFIG_CPCI_AX2000 1 /* ... on GR-CPCI-AX2000 board */
#define CONFIG_LEON_RAM_SRAM 1

@ -20,8 +20,6 @@
* (easy to change)
*/
#define CONFIG_LEON3 /* This is an LEON3 CPU */
#define CONFIG_LEON 1 /* This is an LEON CPU */
/* Altera NIOS Development board, Stratix II board */
#define CONFIG_GR_EP2S60 1

@ -18,8 +18,6 @@
* (easy to change)
*/
#define CONFIG_LEON3 /* This is an LEON3 CPU */
#define CONFIG_LEON 1 /* This is an LEON CPU */
#define CONFIG_GRXC3S1500 1 /* ... on GR-XC3S-1500 board */
/* CPU / AMBA BUS configuration */

@ -24,8 +24,6 @@
*
*/
#define CONFIG_LEON3 /* This is an LEON3 CPU */
#define CONFIG_LEON 1 /* This is an LEON CPU */
#define CONFIG_GRSIM 0 /* ... not running on GRSIM */
#define CONFIG_TSIM 1 /* ... running on TSIM */

@ -23,8 +23,6 @@
*
*/
#define CONFIG_LEON2 /* This is an LEON2 CPU */
#define CONFIG_LEON 1 /* This is an LEON CPU */
#define CONFIG_GRSIM 0 /* ... not running on GRSIM */
#define CONFIG_TSIM 1 /* ... running on TSIM */

Loading…
Cancel
Save