diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-03 08:36:29 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-03 08:41:02 -0400 |
| commit | 808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4 (patch) | |
| tree | 8f45f687f0205be120412d87a63c36bda6ee8ae0 /arch/arm/include/asm/arch-mx5 | |
| parent | 891b487098ee2169a16b1bbb354aaef28aa90630 (diff) | |
| parent | aa5a0d98943e1b32109fd1fb325007c6cdcedc50 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Conflicts:
configs/tbs2910_defconfig
configs/tqma6q_mba6_mmc_defconfig
configs/tqma6q_mba6_spi_defconfig
configs/tqma6s_mba6_mmc_defconfig
configs/tqma6s_mba6_spi_defconfig
include/configs/mx6_common.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/include/asm/arch-mx5')
| -rw-r--r-- | arch/arm/include/asm/arch-mx5/imx-regs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index f059d0f664..5f0e1e6346 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -9,6 +9,8 @@ #define ARCH_MXC +#define CONFIG_SYS_CACHELINE_SIZE 64 + #if defined(CONFIG_MX51) #define IRAM_BASE_ADDR 0x1FFE0000 /* internal ram */ #define IPU_SOC_BASE_ADDR 0x40000000 |