diff options
| -rw-r--r-- | arch/arm/include/asm/arch-omap5/omap.h | 11 | ||||
| -rw-r--r-- | include/configs/dra7xx_evm.h | 3 | 
2 files changed, 11 insertions, 3 deletions
| diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h index 4fcd99f99..43a629f35 100644 --- a/arch/arm/include/asm/arch-omap5/omap.h +++ b/arch/arm/include/asm/arch-omap5/omap.h @@ -44,8 +44,15 @@  #define DRAM_ADDR_SPACE_START	OMAP54XX_DRAM_ADDR_SPACE_START  #define DRAM_ADDR_SPACE_END	OMAP54XX_DRAM_ADDR_SPACE_END -/* CONTROL_ID_CODE */ -#define CONTROL_ID_CODE		0x4A002204 +/* CONTROL ID CODE */ +#define CONTROL_CORE_ID_CODE	0x4A002204 +#define CONTROL_WKUP_ID_CODE	0x4AE0C204 + +#ifdef CONFIG_DRA7XX +#define CONTROL_ID_CODE		CONTROL_WKUP_ID_CODE +#else +#define CONTROL_ID_CODE		CONTROL_CORE_ID_CODE +#endif  /* To be verified */  #define OMAP5430_CONTROL_ID_CODE_ES1_0		0x0B94202F diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 28a306ba8..7826d138f 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -28,11 +28,12 @@  #ifndef __CONFIG_DRA7XX_EVM_H  #define __CONFIG_DRA7XX_EVM_H +/* High Level Configuration Options */ +#define CONFIG_DRA7XX		/* in a TI DRA7XX core */  #define CONFIG_ENV_IS_NOWHERE		/* For now. */  #include <configs/omap5_common.h> -#define CONFIG_DRA7XX		/* in a TI DRA7XX core */  #define CONFIG_SYS_PROMPT		"DRA752 EVM # "  #endif /* __CONFIG_DRA7XX_EVM_H */ |