eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-sh

Browse Source
This commit is contained in:
Tom Rini
2014-11-17 08:43:40 -05:00
parent 256d83cd6d 570dd7f441
commit bdf790fabc
41 changed files with 93 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/configs/rsk7203.h
View File

@@ -11,7 +11,6 @@
#define __RSK7203_H
#undef DEBUG
#define CONFIG_SH2A 1
#define CONFIG_CPU_SH7203 1
#define CONFIG_RSK7203 1

1
include/configs/rsk7264.h
View File

@@ -12,7 +12,6 @@
#define __RSK7264_H
#undef DEBUG
#define CONFIG_SH2A 1
#define CONFIG_CPU_SH7264 1
#define CONFIG_RSK7264 1

1
include/configs/rsk7269.h
View File

@@ -11,7 +11,6 @@
#define __RSK7269_H
#undef DEBUG
#define CONFIG_SH2A 1
#define CONFIG_CPU_SH7269 1
#define CONFIG_RSK7269 1

1
include/configs/sh7752evb.h
View File

@@ -10,7 +10,6 @@
#define __SH7752EVB_H
#undef DEBUG
#define CONFIG_SH_32BIT 1
#define CONFIG_CPU_SH7752 1
#define CONFIG_SH7752EVB 1

1
include/configs/sh7753evb.h
View File

@@ -10,7 +10,6 @@
#define __SH7753EVB_H
#undef DEBUG
#define CONFIG_SH_32BIT 1
#define CONFIG_CPU_SH7753 1
#define CONFIG_SH7753EVB 1

1
include/configs/sh7757lcr.h
View File

@@ -10,7 +10,6 @@
#define __SH7757LCR_H
#undef DEBUG
#define CONFIG_SH_32BIT 1
#define CONFIG_CPU_SH7757 1
#define CONFIG_SH7757LCR 1
#define CONFIG_SH7757LCR_DDR_ECC 1

8
include/sh_tmu.h
View File

@@ -25,7 +25,7 @@
#include <asm/types.h>
#if defined(CONFIG_SH3)
#if defined(CONFIG_CPU_SH3)
struct tmu_regs {
u8 tocr;
u8 reserved0;
@@ -45,9 +45,9 @@ struct tmu_regs {
u16 reserved4;
u32 tcpr2;
};
#endif /* CONFIG_SH3 */
#endif /* CONFIG_CPU_SH3 */
#if defined(CONFIG_SH4) || defined(CONFIG_RMOBILE)
#if defined(CONFIG_CPU_SH4) || defined(CONFIG_RMOBILE)
struct tmu_regs {
u32 reserved;
u8 tstr;
@@ -65,7 +65,7 @@ struct tmu_regs {
u16 tcr2;
u16 reserved5;
};
#endif /* CONFIG_SH4 */
#endif /* CONFIG_CPU_SH4 */
static inline unsigned long get_tmu0_clk_rate(void)
{