diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 16 | ||||
| -rw-r--r-- | include/environment.h | 8 | ||||
| -rw-r--r-- | include/phy.h | 1 | ||||
| -rw-r--r-- | include/spartan3.h | 9 |
4 files changed, 22 insertions, 12 deletions
diff --git a/include/common.h b/include/common.h index 3df1def..59e0b00 100644 --- a/include/common.h +++ b/include/common.h @@ -22,10 +22,10 @@ */ #ifndef __COMMON_H_ -#define __COMMON_H_ 1 +#define __COMMON_H_ #undef _LINUX_CONFIG_H -#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */ +#define _LINUX_CONFIG_H /* avoid reading Linux autoconf.h file */ #ifndef __ASSEMBLY__ /* put C only stuff in this section */ @@ -51,18 +51,18 @@ typedef volatile unsigned char vu_char; defined(CONFIG_MPC859DSL) || \ defined(CONFIG_MPC866) || defined(CONFIG_MPC866T) || \ defined(CONFIG_MPC866P) -# define CONFIG_MPC866_FAMILY 1 +# define CONFIG_MPC866_FAMILY #elif defined(CONFIG_MPC870) \ || defined(CONFIG_MPC875) \ || defined(CONFIG_MPC880) \ || defined(CONFIG_MPC885) -# define CONFIG_MPC885_FAMILY 1 +# define CONFIG_MPC885_FAMILY #endif #if defined(CONFIG_MPC860) \ || defined(CONFIG_MPC860T) \ || defined(CONFIG_MPC866_FAMILY) \ || defined(CONFIG_MPC885_FAMILY) -# define CONFIG_MPC86x 1 +# define CONFIG_MPC86x #endif #elif defined(CONFIG_5xx) #include <asm/5xx_immap.h> @@ -77,10 +77,10 @@ typedef volatile unsigned char vu_char; || defined(CONFIG_MPC8248) \ || defined(CONFIG_MPC8271) \ || defined(CONFIG_MPC8272) -#define CONFIG_MPC8272_FAMILY 1 +#define CONFIG_MPC8272_FAMILY #endif #if defined(CONFIG_MPC8272_FAMILY) -#define CONFIG_MPC8260 1 +#define CONFIG_MPC8260 #endif #include <asm/immap_8260.h> #endif @@ -200,7 +200,7 @@ typedef void (interrupt_handler_t)(void *); || defined(CONFIG_8xx_CONS_SCC1) || defined(CONFIG_8xx_CONS_SCC2) \ || defined(CONFIG_8xx_CONS_SCC3) || defined(CONFIG_8xx_CONS_SCC4) -#define CONFIG_SERIAL_MULTI 1 +#define CONFIG_SERIAL_MULTI #endif diff --git a/include/environment.h b/include/environment.h index 3c145af..1ef44f3 100644 --- a/include/environment.h +++ b/include/environment.h @@ -22,7 +22,7 @@ */ #ifndef _ENVIRONMENT_H_ -#define _ENVIRONMENT_H_ 1 +#define _ENVIRONMENT_H_ /************************************************************************** * @@ -64,10 +64,10 @@ # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \ (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) -# define ENV_IS_EMBEDDED 1 +# define ENV_IS_EMBEDDED # endif # if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) -# define CONFIG_SYS_REDUNDAND_ENVIRONMENT 1 +# define CONFIG_SYS_REDUNDAND_ENVIRONMENT # endif # ifdef CONFIG_ENV_IS_EMBEDDED # error "do not define CONFIG_ENV_IS_EMBEDDED in your board config" @@ -120,7 +120,7 @@ extern unsigned long nand_env_oob_offset; * calculated automatically (i.e. NAND), take the board opt-in. */ #if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED) -# define ENV_IS_EMBEDDED 1 +# define ENV_IS_EMBEDDED #endif /* The build system likes to know if the env is embedded */ diff --git a/include/phy.h b/include/phy.h index 095f41c..bc522d5 100644 --- a/include/phy.h +++ b/include/phy.h @@ -224,6 +224,7 @@ int phy_marvell_init(void); int phy_micrel_init(void); int phy_natsemi_init(void); int phy_realtek_init(void); +int phy_smsc_init(void); int phy_teranetics_init(void); int phy_vitesse_init(void); diff --git a/include/spartan3.h b/include/spartan3.h index 67ede4b..89f1156 100644 --- a/include/spartan3.h +++ b/include/spartan3.h @@ -80,6 +80,12 @@ typedef struct { #define XILINX_XC3S1200E_SIZE 3841184/8 #define XILINX_XC3S1600E_SIZE 5969696/8 +/* + * Spartan-6 : the Spartan-6 family can be programmed + * exactly as the Spartan-3 + */ +#define XILINK_XC6SLX4_SIZE (3713568/8) + /* Descriptor Macros *********************************************************************/ /* Spartan-III devices */ @@ -123,4 +129,7 @@ typedef struct { #define XILINX_XC3S1600E_DESC(iface, fn_table, cookie) \ { Xilinx_Spartan3, iface, XILINX_XC3S1600E_SIZE, fn_table, cookie } +#define XILINX_XC6SLX4_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINK_XC6SLX4_SIZE, fn_table, cookie } + #endif /* _SPARTAN3_H_ */ |