| Message ID | 1282740501-8000-1-git-send-email-u-boot@emk-elektronik.de |
|---|---|
| State | Accepted |
| Commit | 33825ec1a48b279a5e825b1df4eda8b5da1fb34a |
| Delegated to: | Reinhard Meyer |
| Headers | show |
Reinhard Meyer schrieb: > Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de> > --- > arch/arm/include/asm/arch-at91/hardware.h | 1 + > arch/arm/include/asm/arch-at91/memory-map.h | 1 + > 2 files changed, 2 insertions(+), 0 deletions(-) Applied to u-boot-atmel/next Thanks, Reinhard
Reinhard Meyer schrieb: > Reinhard Meyer schrieb: >> Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de> >> --- >> arch/arm/include/asm/arch-at91/hardware.h | 1 + >> arch/arm/include/asm/arch-at91/memory-map.h | 1 + >> 2 files changed, 2 insertions(+), 0 deletions(-) > Applied to u-boot-atmel/next De-applied, it breaks one other board. Needs rework in the #define cascade for SPI1_BASE through memory-map.h, hardware.h, <SoC>.h :( Reinhard
diff --git a/arch/arm/include/asm/arch-at91/hardware.h b/arch/arm/include/asm/arch-at91/hardware.h index 9f732a7..348129c 100644 --- a/arch/arm/include/asm/arch-at91/hardware.h +++ b/arch/arm/include/asm/arch-at91/hardware.h @@ -22,6 +22,7 @@ #include <asm/arch/at91sam9260.h> #define AT91_BASE_MCI AT91SAM9260_BASE_MCI #define AT91_BASE_SPI AT91SAM9260_BASE_SPI0 +#define AT91_BASE_SPI1 AT91SAM9260_BASE_SPI1 #define AT91_ID_UHP AT91SAM9260_ID_UHP #define AT91_PMC_UHP AT91SAM926x_PMC_UHP #elif defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10) diff --git a/arch/arm/include/asm/arch-at91/memory-map.h b/arch/arm/include/asm/arch-at91/memory-map.h index f605f37..d489fa2 100644 --- a/arch/arm/include/asm/arch-at91/memory-map.h +++ b/arch/arm/include/asm/arch-at91/memory-map.h @@ -31,5 +31,6 @@ #define USART2_BASE AT91_USART2 #define USART3_BASE (AT91_BASE_SYS + AT91_DBGU) #define SPI0_BASE AT91_BASE_SPI +#define SPI1_BASE AT91_BASE_SPI1 #endif /* __ASM_ARM_ARCH_MEMORYMAP_H__ */
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de> --- arch/arm/include/asm/arch-at91/hardware.h | 1 + arch/arm/include/asm/arch-at91/memory-map.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)