diff options
| author | Tom Rini <trini@konsulko.com> | 2017-07-11 20:28:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-11 20:28:46 -0400 |
| commit | 8d3a25685e4aac7070365a2b3c53c2c81b27930f (patch) | |
| tree | 7956bf5e00e3490169a7fc41c42a4416da8db51f /arch/arm/imx-common | |
| parent | d43ef73bf26614af9b01fd57baa1a1fcf24bfade (diff) | |
| parent | 8c9eaadaaad888e0cd77512553d0d02d476b4dde (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm/imx-common')
| -rw-r--r-- | arch/arm/imx-common/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/imx-common/cpu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index b7cb434bd7..fc69172b0b 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -25,7 +25,7 @@ obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o endif ifeq ($(SOC),$(filter $(SOC),mx6 mx7)) obj-y += cache.o init.o -obj-$(CONFIG_CMD_SATA) += sata.o +obj-$(CONFIG_SATA) += sata.o obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o obj-$(CONFIG_IMX_RDC) += rdc-sema.o obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index 74bdd24ed1..9e83b4221e 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -278,7 +278,7 @@ void arch_preboot_os(void) #if defined(CONFIG_PCIE_IMX) imx_pcie_remove(); #endif -#if defined(CONFIG_CMD_SATA) +#if defined(CONFIG_SATA) sata_stop(); #if defined(CONFIG_MX6) disable_sata_clock(); |