diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
| commit | 5ed28948a3ffe6c735386e59c132989869beaa3e (patch) | |
| tree | cbb940a4fa90b89abdd57d6b13d64351cfce839c /arch/arm/include/asm/arch-keystone | |
| parent | e6607cffef965011ef0ddc0fbe6f4b7c0d53aeec (diff) | |
| parent | 83bad1026b9e3a4f6b7783cc1cbb434c1bbd3fa2 (diff) | |
| download | u-boot-imx-5ed28948a3ffe6c735386e59c132989869beaa3e.zip u-boot-imx-5ed28948a3ffe6c735386e59c132989869beaa3e.tar.gz u-boot-imx-5ed28948a3ffe6c735386e59c132989869beaa3e.tar.bz2 | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-keystone')
| -rw-r--r-- | arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-keystone/hardware.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-keystone/hardware-k2hk.h b/arch/arm/include/asm/arch-keystone/hardware-k2hk.h index 50ff13a..7ac2662 100644 --- a/arch/arm/include/asm/arch-keystone/hardware-k2hk.h +++ b/arch/arm/include/asm/arch-keystone/hardware-k2hk.h @@ -115,8 +115,6 @@ #define K2HK_LPSC_ARM_SREFLEX 51 #define K2HK_LPSC_TETRIS 52 -#define K2HK_UART0_BASE 0x02530c00 - /* DDR3A definitions */ #define K2HK_DDR3A_EMIF_CTRL_BASE 0x21010000 #define K2HK_DDR3A_EMIF_DATA_BASE 0x80000000 diff --git a/arch/arm/include/asm/arch-keystone/hardware.h b/arch/arm/include/asm/arch-keystone/hardware.h index a305a0c..6c532ca 100644 --- a/arch/arm/include/asm/arch-keystone/hardware.h +++ b/arch/arm/include/asm/arch-keystone/hardware.h @@ -142,6 +142,9 @@ struct ddr3_emif_config { #define KS2_DDR3_PMCTL_OFFSET 0x38 #define KS2_DDR3_ZQCFG_OFFSET 0xC8 +#define KS2_UART0_BASE 0x02530c00 +#define KS2_UART1_BASE 0x02531000 + #ifdef CONFIG_SOC_K2HK #include <asm/arch/hardware-k2hk.h> #endif |