summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2013-12-19 11:04:33 +0100
committerStefano Babic <sbabic@denx.de>2013-12-19 11:04:33 +0100
commitf5514e47c4086d342e81219bb9cbd8956961fa0e (patch)
tree5997a2f0c3a7a538acf312b6b7e4e09e677ee0e3
parentebaf6b26bc12bd470188f3149a75397f112ab09d (diff)
downloadblackbird-obmc-uboot-f5514e47c4086d342e81219bb9cbd8956961fa0e.tar.gz
blackbird-obmc-uboot-f5514e47c4086d342e81219bb9cbd8956961fa0e.zip
MX6: fix sata compilation for i.MX6
Commit 164d98466103a46b7c881149e92ec2a28a6375be breaks board with SATA support, because sata is not compiled. Signed-off-by: Stefano Babic <sbabic@denx.de>
-rw-r--r--arch/arm/imx-common/Makefile2
-rw-r--r--arch/arm/imx-common/sata.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index 68f0f5276a..ee5c872f51 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -18,7 +18,7 @@ ifeq ($(SOC),$(filter $(SOC),mx6 mxs))
obj-y += misc.o
endif
ifeq ($(SOC),$(filter $(SOC),mx6))
-objs-$(CONFIG_CMD_SATA) += sata.o
+obj-$(CONFIG_CMD_SATA) += sata.o
endif
obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o
obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
diff --git a/arch/arm/imx-common/sata.c b/arch/arm/imx-common/sata.c
index 1b4c5029af..2e694866e0 100644
--- a/arch/arm/imx-common/sata.c
+++ b/arch/arm/imx-common/sata.c
@@ -7,6 +7,7 @@
#include <asm/imx-common/iomux-v3.h>
#include <asm/arch/iomux.h>
#include <asm/io.h>
+#include <asm/arch/clock.h>
int setup_sata(void)
{
OpenPOWER on IntegriCloud