diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-24 07:50:00 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-24 07:50:00 (GMT) |
| commit | 33144ea443c298ac9d6f04926a02881a5bae91a3 (patch) | |
| tree | 8d29378ecf90192f3f0f0637db89e0044d9c94cf /arch/arm/include/asm/arch-omap4/cpu.h | |
| parent | 3eb5e198632dcc3e03b5742d1e0ebced0ef2f551 (diff) | |
| parent | 39338a30fab2ce7d80dfe0d457071573727f499f (diff) | |
| download | u-boot-33144ea443c298ac9d6f04926a02881a5bae91a3.tar.xz | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-omap4/cpu.h')
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/cpu.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-omap4/cpu.h b/arch/arm/include/asm/arch-omap4/cpu.h index c21fb54..f7595ae 100644 --- a/arch/arm/include/asm/arch-omap4/cpu.h +++ b/arch/arm/include/asm/arch-omap4/cpu.h @@ -12,6 +12,8 @@ #include <asm/types.h> #endif /* !(__KERNEL_STRICT_NAMES || __ASSEMBLY__) */ +#include <asm/arch/hardware.h> + #ifndef __KERNEL_STRICT_NAMES #ifndef __ASSEMBLY__ struct gptimer { @@ -57,9 +59,6 @@ struct watchdog { #define TCLR_AR (0x1 << 1) #define TCLR_PRE (0x1 << 5) -/* GPMC BASE */ -#define GPMC_BASE (OMAP44XX_GPMC_BASE) - /* I2C base */ #define I2C_BASE1 (OMAP44XX_L4_PER_BASE + 0x70000) #define I2C_BASE2 (OMAP44XX_L4_PER_BASE + 0x72000) |