summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-05-29 17:30:01 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-05-31 02:55:30 +0900
commitb6ef3a3f04b96336f1f4b519d62c12aad1f9f7b8 (patch)
treea9c1c2aab36998f7a04062e9f3ed63faeade983d /arch
parentf6e7f07c17bdf4c9c4c03375dc913b77c39dbe1d (diff)
downloadtalos-obmc-uboot-b6ef3a3f04b96336f1f4b519d62c12aad1f9f7b8.tar.gz
talos-obmc-uboot-b6ef3a3f04b96336f1f4b519d62c12aad1f9f7b8.zip
ARM: UniPhier: update the vendor name of UniPhier in Kconfig
The business for UniPhier Soc family has been transferred from Panasonic Corporation to Socionext Inc. Update the SoC select menu in Kconfig. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig5
-rw-r--r--arch/arm/mach-uniphier/Kconfig5
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b62842f3dc..2985e6e065 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -786,7 +786,7 @@ config TARGET_JORNADA
select CPU_SA1100
config ARCH_UNIPHIER
- bool "Panasonic UniPhier platform"
+ bool "Socionext UniPhier SoCs"
select CPU_V7
select SUPPORT_SPL
select SPL
@@ -794,6 +794,9 @@ config ARCH_UNIPHIER
select DM
select DM_SERIAL
select DM_I2C
+ help
+ Support for UniPhier SoC family developed by Socionext Inc.
+ (formerly, System LSI Business Division of Panasonic Corporation)
config TARGET_STM32F429_DISCOVERY
bool "Support STM32F429 Discovery"
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 2d27c49673..73b867668e 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -1,5 +1,4 @@
-menu "Panasonic UniPhier platform"
- depends on ARCH_UNIPHIER
+if ARCH_UNIPHIER
config SYS_CONFIG_NAME
default "uniphier"
@@ -78,4 +77,4 @@ config DDR_FREQ
default 1333 if DDR_FREQ_1333
default 1600 if DDR_FREQ_1600
-endmenu
+endif
OpenPOWER on IntegriCloud