summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-03 12:43:42 -0500
committerTom Rini <trini@ti.com>2014-11-03 12:43:42 -0500
commita8b972bfa82c0391aaba809f29e351507fd28215 (patch)
tree3d8361220256d45bc0bdc7225f40b225ab6b5e7e /arch
parent130aec779ad9a2e28dc9d42ca5b367b957f311d7 (diff)
parentd9bc8fd1cb35feb2802ac1d4d39a1deabf0c3d79 (diff)
downloadu-boot-imx-a8b972bfa82c0391aaba809f29e351507fd28215.zip
u-boot-imx-a8b972bfa82c0391aaba809f29e351507fd28215.tar.gz
u-boot-imx-a8b972bfa82c0391aaba809f29e351507fd28215.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/uniphier/Kconfig9
-rw-r--r--arch/arm/cpu/armv7/uniphier/Makefile2
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig
index 524b193..f013dc3 100644
--- a/arch/arm/cpu/armv7/uniphier/Kconfig
+++ b/arch/arm/cpu/armv7/uniphier/Kconfig
@@ -23,4 +23,13 @@ config MACH_PH1_SLD8
endchoice
+config CMD_PINMON
+ bool "Enable boot mode pins monitor command"
+ depends on !SPL_BUILD
+ default y
+ help
+ The command "pinmon" shows the state of the boot mode pins.
+ The boot mode pins are latched when the system reset is deasserted
+ and determine which device the system should load a boot image from.
+
endmenu
diff --git a/arch/arm/cpu/armv7/uniphier/Makefile b/arch/arm/cpu/armv7/uniphier/Makefile
index 7ceddda..dd57469 100644
--- a/arch/arm/cpu/armv7/uniphier/Makefile
+++ b/arch/arm/cpu/armv7/uniphier/Makefile
@@ -12,7 +12,7 @@ obj-y += dram_init.o
obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o
obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
obj-$(CONFIG_UNIPHIER_SMP) += smp.o
-obj-$(if $(CONFIG_SPL_BUILD),,y) += cmd_pinmon.o
+obj-$(CONFIG_CMD_PINMON) += cmd_pinmon.o
obj-y += board_common.o
obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += support_card.o