diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-23 09:02:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-23 09:02:28 -0400 |
| commit | 3c9cc70d7153da442575112d9a2643eecd17d534 (patch) | |
| tree | b7f2abf20d86dfcb99e4a5406c3dd1b85c176b9f /arch/arm/mach-mvebu/include/mach/soc.h | |
| parent | 6b9f9eadffb5f64801746593784e12f07f2fadd0 (diff) | |
| parent | 9e30b31d20f0b793465d07f056b3d9885f578c0d (diff) | |
| download | talos-obmc-uboot-3c9cc70d7153da442575112d9a2643eecd17d534.tar.gz talos-obmc-uboot-3c9cc70d7153da442575112d9a2643eecd17d534.zip | |
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'arch/arm/mach-mvebu/include/mach/soc.h')
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/soc.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 1aaea672ee..125b5f278d 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -28,7 +28,17 @@ /* SOC specific definations */ #define INTREG_BASE 0xd0000000 #define INTREG_BASE_ADDR_REG (INTREG_BASE + 0x20080) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SYS_MVEBU_DDR_A38X) +/* + * On A38x switching the regs base address without running from + * SDRAM doesn't seem to work. So let the SPL still use the + * default base address and switch to the new address in the + * main u-boot later. + */ +#define SOC_REGS_PHY_BASE 0xd0000000 +#else #define SOC_REGS_PHY_BASE 0xf1000000 +#endif #define MVEBU_REGISTER(x) (SOC_REGS_PHY_BASE + x) #define MVEBU_SDRAM_SCRATCH (MVEBU_REGISTER(0x01504)) @@ -52,6 +62,7 @@ #define MVEBU_USB20_BASE (MVEBU_REGISTER(0x58000)) #define MVEBU_EGIGA0_BASE (MVEBU_REGISTER(0x70000)) #define MVEBU_EGIGA1_BASE (MVEBU_REGISTER(0x74000)) +#define MVEBU_AXP_SATA_BASE (MVEBU_REGISTER(0xa0000)) #define MVEBU_SATA0_BASE (MVEBU_REGISTER(0xa8000)) #define MVEBU_SDIO_BASE (MVEBU_REGISTER(0xd8000)) |
