diff mbox

[U-Boot,v2,1/2] ARM: uniphier: fix makefiles to build cmd_ddr(m)phy.c

Message ID 1454646032-23240-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit 126f9bad77ad6f373de857eb88d0d9f284ee2709
Delegated to: Masahiro Yamada
Headers show

Commit Message

Masahiro Yamada Feb. 5, 2016, 4:20 a.m. UTC 
The U-Boot proper building needs to descend arch/arm/mach-uniphier/dram
to build these commands.

Fixes: 93d92d46cd01 ("ARM: uniphier: add dump command for DDR Multi PHY registers")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - Newly added

 arch/arm/mach-uniphier/Makefile      | 3 ++-
 arch/arm/mach-uniphier/dram/Makefile | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

Comments

Masahiro Yamada Feb. 14, 2016, 8:40 a.m. UTC | #1 
2016-02-05 13:20 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> The U-Boot proper building needs to descend arch/arm/mach-uniphier/dram
> to build these commands.
>
> Fixes: 93d92d46cd01 ("ARM: uniphier: add dump command for DDR Multi PHY registers")
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---


Applied to u-boot-uniphier/master.
diff mbox

Patch

diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile
index 491e78e..e65d602 100644
--- a/arch/arm/mach-uniphier/Makefile
+++ b/arch/arm/mach-uniphier/Makefile
@@ -6,7 +6,7 @@  ifdef CONFIG_SPL_BUILD
 
 obj-y += lowlevel_init.o
 
-obj-y += init/ bcu/ memconf/ pll/ early-clk/ early-pinctrl/ dram/
+obj-y += init/ bcu/ memconf/ pll/ early-clk/ early-pinctrl/
 obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/
 
 obj-$(CONFIG_DEBUG_LL) += debug_ll.o
@@ -32,5 +32,6 @@  obj-y += timer.o
 obj-y += boards.o
 obj-y += soc_info.o
 obj-y += boot-mode/
+obj-y += dram/
 
 obj-$(CONFIG_MICRO_SUPPORT_CARD) += micro-support-card.o
diff --git a/arch/arm/mach-uniphier/dram/Makefile b/arch/arm/mach-uniphier/dram/Makefile
index cab7df1..a0a6003 100644
--- a/arch/arm/mach-uniphier/dram/Makefile
+++ b/arch/arm/mach-uniphier/dram/Makefile
@@ -2,6 +2,8 @@ 
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+
 obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= umc-ph1-ld4.o \
 					   ddrphy-training.o ddrphy-ph1-ld4.o
 obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= umc-ph1-pro4.o \
@@ -11,5 +13,9 @@  obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= umc-ph1-sld8.o \
 obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= umc-proxstream2.o
 obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= umc-proxstream2.o
 
+else
+
 obj-$(CONFIG_CMD_DDRPHY_DUMP) += cmd_ddrphy.o
 obj-$(CONFIG_CMD_DDRMPHY_DUMP) += cmd_ddrmphy.o
+
+endif