diff options
author | Tom Rini <trini@ti.com> | 2014-08-29 11:06:51 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-08-29 11:06:51 -0400 |
commit | 5a1095a830299aef8dd32495e505e92ab1749e89 (patch) | |
tree | 9383de2534455119d51200bc87766a330591df27 /arch/arm/include/asm/arch-mx6/mx6-ddr.h | |
parent | 6af857c50df4e62ec08e51ad73c96f63f1480386 (diff) | |
parent | d145878d59c80a44d8c6e6d606b898ab87d205ee (diff) | |
download | blackbird-obmc-uboot-5a1095a830299aef8dd32495e505e92ab1749e89.tar.gz blackbird-obmc-uboot-5a1095a830299aef8dd32495e505e92ab1749e89.zip |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/include/asm/arch-mx6/mx6-ddr.h')
-rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6-ddr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h index d544d2e708..5ebabfa271 100644 --- a/arch/arm/include/asm/arch-mx6/mx6-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6-ddr.h @@ -13,7 +13,11 @@ #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) #include "mx6dl-ddr.h" #else +#ifdef CONFIG_MX6SX +#include "mx6sx-ddr.h" +#else #error "Please select cpu" +#endif /* CONFIG_MX6SX */ #endif /* CONFIG_MX6DL or CONFIG_MX6S */ #endif /* CONFIG_MX6Q */ #else |