diff options
author | Tom Rini <trini@ti.com> | 2014-04-17 14:33:25 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-04-17 14:33:25 -0400 |
commit | 0f507779ca00d90cdd4bcc8252630370339b7ea6 (patch) | |
tree | a91a89ac67dcbd42c8a4357501d155a129fa1e5a /include/configs | |
parent | 0f605c1501f6e82553e9affc6e17876a85db408c (diff) | |
parent | ece0d370144fdecb6f3ed5738ffe96f5b12f9e96 (diff) | |
download | u-boot-imx-0f507779ca00d90cdd4bcc8252630370339b7ea6.zip u-boot-imx-0f507779ca00d90cdd4bcc8252630370339b7ea6.tar.gz u-boot-imx-0f507779ca00d90cdd4bcc8252630370339b7ea6.tar.bz2 |
Merge branch 'next'
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/gr_cpci_ax2000.h | 2 | ||||
-rw-r--r-- | include/configs/gr_ep2s60.h | 2 | ||||
-rw-r--r-- | include/configs/gr_xc3s_1500.h | 2 | ||||
-rw-r--r-- | include/configs/grsim.h | 2 | ||||
-rw-r--r-- | include/configs/grsim_leon2.h | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index 2437b4b..854807d 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -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 diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 2cd6eae..ed2dd2a 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -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 diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index 39036cd..e3cbb6f 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -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 */ diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 2d977ce..556c749 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -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 */ diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 36ebaf7..8be9898 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -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 */ |