diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-10-20 20:45:22 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-10-29 22:53:42 +0900 |
| commit | 59ca5537be1f17abd6d36dffb5a522b89f36163a (patch) | |
| tree | 228833772d841917b609a626a47a2c20c026f92c /arch/arm/cpu/armv7/uniphier | |
| parent | d58a9451e7339ed4cf2b2627e534611f427fb791 (diff) | |
| download | blackbird-obmc-uboot-59ca5537be1f17abd6d36dffb5a522b89f36163a.tar.gz blackbird-obmc-uboot-59ca5537be1f17abd6d36dffb5a522b89f36163a.zip | |
ARM: UniPhier: make pinmon command optional
Add CONFIG_CMD_PINMON to UniPhier-specific Kconfig and make the
"pinmon" command user-configurable. This command can be disabled
via the configuration if users do not need it.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/cpu/armv7/uniphier')
| -rw-r--r-- | arch/arm/cpu/armv7/uniphier/Kconfig | 9 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/uniphier/Makefile | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig index 34f5496c8c..8906f64c45 100644 --- a/arch/arm/cpu/armv7/uniphier/Kconfig +++ b/arch/arm/cpu/armv7/uniphier/Kconfig @@ -29,4 +29,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 7cedddaadc..dd57469d9c 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 |
