diff options
| author | Tom Rini <trini@ti.com> | 2015-02-06 12:02:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-06 12:02:59 -0500 |
| commit | 5c123f5fbfa2f7ae43f08a0f92073e90330d704a (patch) | |
| tree | 8f79c94d7a04301d3ef51b4bc10571acc7bc9706 /arch/arm/include | |
| parent | 4e79908044e4ebf186464cf118497458faf0903c (diff) | |
| parent | 68102b81e8fb699087ec5757a75676c6c65af3fd (diff) | |
| download | blackbird-obmc-uboot-5c123f5fbfa2f7ae43f08a0f92073e90330d704a.tar.gz blackbird-obmc-uboot-5c123f5fbfa2f7ae43f08a0f92073e90330d704a.zip | |
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-armada-xp/config.h | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-armada-xp/cpu.h | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-armada-xp/config.h b/arch/arm/include/asm/arch-armada-xp/config.h index 00ee775a45..f9fd424609 100644 --- a/arch/arm/include/asm/arch-armada-xp/config.h +++ b/arch/arm/include/asm/arch-armada-xp/config.h @@ -31,7 +31,11 @@ #endif /* CONFIG_SYS_KWD_CONFIG */ /* Add target to build it automatically upon "make" */ +#ifdef CONFIG_SPL +#define CONFIG_BUILD_TARGET "u-boot-spl.kwb" +#else #define CONFIG_BUILD_TARGET "u-boot.kwb" +#endif /* end of 16M scrubbed by training in bootrom */ #define CONFIG_SYS_INIT_SP_ADDR 0x00FF0000 diff --git a/arch/arm/include/asm/arch-armada-xp/cpu.h b/arch/arm/include/asm/arch-armada-xp/cpu.h index 6b60c21ceb..4f5ff96d84 100644 --- a/arch/arm/include/asm/arch-armada-xp/cpu.h +++ b/arch/arm/include/asm/arch-armada-xp/cpu.h @@ -96,6 +96,9 @@ struct kwgpio_registers { u32 irq_level; }; +/* Needed for dynamic (board-specific) mbus configuration */ +extern struct mvebu_mbus_state mbus_state; + /* * functions */ @@ -103,5 +106,18 @@ unsigned int mvebu_sdram_bar(enum memory_bank bank); unsigned int mvebu_sdram_bs(enum memory_bank bank); void mvebu_sdram_size_adjust(enum memory_bank bank); int mvebu_mbus_probe(struct mbus_win windows[], int count); + +/* + * Highspeed SERDES PHY config init, ported from bin_hdr + * to mainline U-Boot + */ +int serdes_phy_config(void); + +/* + * DDR3 init / training code ported from Marvell bin_hdr. Now + * available in mainline U-Boot in: + * drivers/ddr/mvebu/ + */ +int ddr3_init(void); #endif /* __ASSEMBLY__ */ #endif /* _ARMADA_XP_CPU_H */ |
