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.masah...@socionext.com>
---
Changes in v3:
- Newly added
Changes in v2: None
arch/arm/Kconfig | 5 ++++-
arch/arm/mach-uniphier/Kconfig | 5 ++---
drivers/i2c/Kconfig | 6 +++---
drivers/serial/Kconfig | 5 +++--
drivers/usb/host/Kconfig | 10 ++++------
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b62842f..2985e6e 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 2d27c49..73b8676 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
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index ba43019..86fb36b 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -63,13 +63,13 @@ config SYS_I2C_UNIPHIER
depends on ARCH_UNIPHIER && DM_I2C
default y
help
- Support for Panasonic UniPhier I2C controller driver. This I2C
- controller is used on PH1-LD4, PH1-sLD8 or older UniPhier SoCs.
+ Support for UniPhier I2C controller driver. This I2C controller
+ is used on PH1-LD4, PH1-sLD8 or older UniPhier SoCs.
config SYS_I2C_UNIPHIER_F
bool "UniPhier FIFO-builtin I2C driver"
depends on ARCH_UNIPHIER && DM_I2C
default y
help
- Support for Panasonic UniPhier FIFO-builtin I2C controller driver.
+ Support for UniPhier FIFO-builtin I2C controller driver.
This I2C controller is used on PH1-Pro4 or newer UniPhier SoCs.
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 54e6f26..5611fac 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -77,7 +77,8 @@ config DEBUG_UART_SHIFT
registers, 2=32-bit word registers, etc.
config UNIPHIER_SERIAL
- bool "UniPhier on-chip UART support"
+ bool "Support for UniPhier on-chip UART"
depends on ARCH_UNIPHIER && DM_SERIAL
help
- Support for the on-chip UARTs on the Panasonic UniPhier platform.
+ If you have a UniPhier based board and want to use the on-chip
+ serial ports, say Y to this option. If unsure, say N.
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 24a595f..8705c7c 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -18,12 +18,11 @@ config USB_XHCI
if USB_XHCI_HCD
config USB_XHCI_UNIPHIER
- bool "Support for Panasonic UniPhier on-chip xHCI USB controller"
+ bool "Support for UniPhier on-chip xHCI USB controller"
depends on ARCH_UNIPHIER
default y
---help---
- Enables support for the on-chip xHCI controller on Panasonic
- UniPhier SoCs.
+ Enables support for the on-chip xHCI controller on UniPhier SoCs.
endif
@@ -54,11 +53,10 @@ config USB_EHCI
if USB_EHCI_HCD
config USB_EHCI_UNIPHIER
- bool "Support for Panasonic UniPhier on-chip EHCI USB controller"
+ bool "Support for UniPhier on-chip EHCI USB controller"
depends on ARCH_UNIPHIER && OF_CONTROL
default y
---help---
- Enables support for the on-chip EHCI controller on Panasonic
- UniPhier SoCs.
+ Enables support for the on-chip EHCI controller on UniPhier SoCs.
endif
--
1.9.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
