diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MigoR.h | 2 | ||||
| -rw-r--r-- | include/configs/ap325rxa.h | 2 | ||||
| -rw-r--r-- | include/configs/ap_sh4a_4a.h | 3 | ||||
| -rw-r--r-- | include/configs/ecovec.h | 3 | ||||
| -rw-r--r-- | include/configs/espt.h | 2 | ||||
| -rw-r--r-- | include/configs/mpr2.h | 2 | ||||
| -rw-r--r-- | include/configs/ms7720se.h | 2 | ||||
| -rw-r--r-- | include/configs/ms7722se.h | 2 | ||||
| -rw-r--r-- | include/configs/ms7750se.h | 2 | ||||
| -rw-r--r-- | include/configs/r0p7734.h | 3 | ||||
| -rw-r--r-- | include/configs/r2dplus.h | 2 | ||||
| -rw-r--r-- | include/configs/r7780mp.h | 2 | ||||
| -rw-r--r-- | include/configs/rsk7203.h | 4 | ||||
| -rw-r--r-- | include/configs/rsk7264.h | 4 | ||||
| -rw-r--r-- | include/configs/rsk7269.h | 4 | ||||
| -rw-r--r-- | include/configs/sh7752evb.h | 2 | ||||
| -rw-r--r-- | include/configs/sh7753evb.h | 2 | ||||
| -rw-r--r-- | include/configs/sh7757lcr.h | 2 | ||||
| -rw-r--r-- | include/configs/sh7763rdp.h | 2 | ||||
| -rw-r--r-- | include/configs/sh7785lcr.h | 2 | ||||
| -rw-r--r-- | include/configs/shmin.h | 2 | ||||
| -rw-r--r-- | include/sh_tmu.h | 2 | 
22 files changed, 4 insertions, 49 deletions
| diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 9fd455142..88df94f11 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -10,8 +10,6 @@  #define __MIGO_R_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4		1  #define CONFIG_CPU_SH7722	1  #define CONFIG_MIGO_R		1 diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 933de52c5..462b2e291 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -11,8 +11,6 @@  #define __AP325RXA_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4		1  #define CONFIG_CPU_SH7723	1  #define CONFIG_AP325RXA	1 diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index 83a5c37e4..bb39491f8 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -10,9 +10,6 @@  #define __AP_SH4A_4A_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4		1 -#define CONFIG_SH4A		1  #define CONFIG_CPU_SH7734	1  #define CONFIG_AP_SH4A_4A	1  #define CONFIG_400MHZ_MODE	1 diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 3483cf1f5..3a5cc7482 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -23,9 +23,6 @@   */  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4		1 -#define CONFIG_SH4A		1  #define CONFIG_CPU_SH7724	1  #define CONFIG_BOARD_LATE_INIT		1  #define CONFIG_ECOVEC		1 diff --git a/include/configs/espt.h b/include/configs/espt.h index 1bd7eeceb..de16be70b 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -10,8 +10,6 @@  #ifndef __ESPT_H  #define __ESPT_H -#define CONFIG_SH		1 -#define CONFIG_SH4		1  #define CONFIG_CPU_SH7763	1  #define CONFIG_ESPT	1  #define __LITTLE_ENDIAN		1 diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index fcf237edb..8ae497c6d 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -24,8 +24,6 @@  #define CONFIG_VERSION_VARIABLE  /* CPU and platform */ -#define CONFIG_SH		1 -#define CONFIG_SH3		1  #define CONFIG_CPU_SH7720	1  #define CONFIG_MPR2		1 diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index ec8523eb9..585d68f20 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -9,8 +9,6 @@  #ifndef __MS7720SE_H  #define __MS7720SE_H -#define CONFIG_SH		1 -#define CONFIG_SH3		1  #define CONFIG_CPU_SH7720	1  #define CONFIG_MS7720SE		1 diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 54fb7c3e8..1c8ada6c0 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -9,8 +9,6 @@  #ifndef __MS7722SE_H  #define __MS7722SE_H -#define CONFIG_SH		1 -#define CONFIG_SH4		1  #define CONFIG_CPU_SH7722	1  #define CONFIG_MS7722SE		1 diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index eea3bd1f2..4cf8efeca 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -9,8 +9,6 @@  #ifndef __MS7750SE_H  #define __MS7750SE_H -#define CONFIG_SH		1 -#define CONFIG_SH4		1  #define CONFIG_CPU_SH7750	1  /* #define CONFIG_CPU_SH7751	1 */  /* #define CONFIG_CPU_TYPE_R	1 */ diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index dd26a71bc..53128ecc1 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -10,9 +10,6 @@  #define __R0P7734_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4		1 -#define CONFIG_SH4A		1  #define CONFIG_CPU_SH7734	1  #define CONFIG_R0P7734		1  #define CONFIG_400MHZ_MODE	1 diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index ddcc97587..24d0c34db 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -3,8 +3,6 @@  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4		1  #define CONFIG_CPU_SH7751	1  #define CONFIG_CPU_SH_TYPE_R	1  #define CONFIG_R2DPLUS		1 diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index f5e4daab8..8156724f7 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -11,8 +11,6 @@  #define __R7780RP_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4A		1  #define CONFIG_CPU_SH7780	1  #define CONFIG_R7780MP		1  #define CONFIG_SYS_R7780MP_OLD_FLASH	1 diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index acee4e898..543632458 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -11,8 +11,6 @@  #define __RSK7203_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH2		1  #define CONFIG_SH2A		1  #define CONFIG_CPU_SH7203	1  #define CONFIG_RSK7203	1 @@ -87,7 +85,7 @@  #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ  #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ  #define CMT_CLK_DIVIDER	32	/* 8 (default), 32, 128 or 512 */ -#define CONFIG_SYS_HZ			(CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER) +#define CONFIG_SH_CMT_CLK_FREQ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)  /* Network interface */  #define CONFIG_SMC911X diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index a5dbb64f4..4aaa3ef74 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -12,8 +12,6 @@  #define __RSK7264_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH2		1  #define CONFIG_SH2A		1  #define CONFIG_CPU_SH7264	1  #define CONFIG_RSK7264		1 @@ -67,7 +65,7 @@  #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ  #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ  #define CMT_CLK_DIVIDER		32	/* 8 (default), 32, 128 or 512 */ -#define CONFIG_SYS_HZ		(CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER) +#define CONFIG_SH_CMT_CLK_FREQ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)  /* Network interface */  #define CONFIG_SMC911X diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h index 9f54160af..11fc231fa 100644 --- a/include/configs/rsk7269.h +++ b/include/configs/rsk7269.h @@ -11,8 +11,6 @@  #define __RSK7269_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH2		1  #define CONFIG_SH2A		1  #define CONFIG_CPU_SH7269	1  #define CONFIG_RSK7269		1 @@ -66,7 +64,7 @@  #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ  #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ  #define CMT_CLK_DIVIDER		32	/* 8 (default), 32, 128 or 512 */ -#define CONFIG_SYS_HZ		(CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER) +#define CONFIG_SH_CMT_CLK_FREQ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)  /* Network interface */  #define CONFIG_SMC911X diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index ebdc5c8b0..f06abbca0 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -10,8 +10,6 @@  #define __SH7752EVB_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4A		1  #define CONFIG_SH_32BIT		1  #define CONFIG_CPU_SH7752	1  #define CONFIG_SH7752EVB	1 diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index f7eb86d1d..e400db08a 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -10,8 +10,6 @@  #define __SH7753EVB_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4A		1  #define CONFIG_SH_32BIT		1  #define CONFIG_CPU_SH7753	1  #define CONFIG_SH7753EVB	1 diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index ce1add268..08bff1da3 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -10,8 +10,6 @@  #define __SH7757LCR_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4A		1  #define CONFIG_SH_32BIT		1  #define CONFIG_CPU_SH7757	1  #define CONFIG_SH7757LCR	1 diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index a13778830..2438318fc 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -10,8 +10,6 @@  #ifndef __SH7763RDP_H  #define __SH7763RDP_H -#define CONFIG_SH		1 -#define CONFIG_SH4		1  #define CONFIG_CPU_SH7763	1  #define CONFIG_SH7763RDP	1  #define __LITTLE_ENDIAN		1 diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 4acbcab1b..2723eaf2d 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -10,8 +10,6 @@  #define __SH7785LCR_H  #undef DEBUG -#define CONFIG_SH		1 -#define CONFIG_SH4A		1  #define CONFIG_CPU_SH7785	1  #define CONFIG_SH7785LCR	1 diff --git a/include/configs/shmin.h b/include/configs/shmin.h index 5c990fc96..f8155efbc 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -9,8 +9,6 @@  #ifndef __SHMIN_H  #define __SHMIN_H -#define CONFIG_SH		1 -#define CONFIG_SH3		1  #define CONFIG_CPU_SH7706	1  /* T-SH7706LAN */  #define CONFIG_SHMIN		1 diff --git a/include/sh_tmu.h b/include/sh_tmu.h index f5b42faea..61afc7136 100644 --- a/include/sh_tmu.h +++ b/include/sh_tmu.h @@ -47,7 +47,7 @@ struct tmu_regs {  };  #endif /* CONFIG_SH3 */ -#if defined(CONFIG_SH4) || defined(CONFIG_SH4A) || defined(CONFIG_RMOBILE) +#if defined(CONFIG_SH4) || defined(CONFIG_RMOBILE)  struct tmu_regs {  	u32 reserved;  	u8  tstr; |