Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: UniPhier: move support card select to Kconfig

Browse source 
There are two kinds of expansion boards which are often used for
the UniPhier platform and they are only exclusively selectable.
It can be better described by the "choice" menu of Kconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Masahiro Yamada 2014-12-06 00:03:21 +09:00
parent 84b3584f21
commit 3201455d6a
8 changed files with 26 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/arm/cpu/armv7/uniphier/Kconfig
View file

@ -27,6 +27,29 @@ config MACH_PH1_SLD8
endchoice
choice
prompt "UniPhier Support Card select"
optional
config PFC_MICRO_SUPPORT_CARD
bool "Support card with PFC CPLD"
help
This option provides support for the expansion board with PFC
original address mapping.
Say Y to use the on-board UART, Ether, LED devices.
config DCC_MICRO_SUPPORT_CARD
bool "Support card with DCC CPLD"
help
This option provides support for the expansion board with DCC-
arranged address mapping that is compatible with legacy UniPhier
reference boards.
Say Y to use the on-board UART, Ether, LED devices.
endchoice
config CMD_PINMON
bool "Enable boot mode pins monitor command"
depends on !SPL_BUILD

1
configs/ph1_ld4_defconfig
View file

@ -4,6 +4,7 @@ CONFIG_FIT_VERBOSE=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_UNIPHIER=y
+S:CONFIG_MACH_PH1_LD4=y
+S:CONFIG_DCC_MICRO_SUPPORT_CARD=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BDI=y
CONFIG_CMD_CONSOLE=y

1
configs/ph1_pro4_defconfig
View file

@ -4,6 +4,7 @@ CONFIG_FIT_VERBOSE=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_UNIPHIER=y
+S:CONFIG_MACH_PH1_PRO4=y
+S:CONFIG_DCC_MICRO_SUPPORT_CARD=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BDI=y
CONFIG_CMD_CONSOLE=y

1
configs/ph1_sld8_defconfig
View file

@ -4,6 +4,7 @@ CONFIG_FIT_VERBOSE=y
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_UNIPHIER=y
+S:CONFIG_MACH_PH1_SLD8=y
+S:CONFIG_DCC_MICRO_SUPPORT_CARD=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BDI=y
CONFIG_CMD_CONSOLE=y

15
include/configs/ph1_ld4.h
View file

@ -8,21 +8,6 @@
#ifndef __PH1_XXX_H
#define __PH1_XXX_H
/*
* Support Card Select
*
* CONFIG_PFC_MICRO_SUPPORT_CARD - Original Micro Support Card made by PFC.
* CONFIG_DCC_MICRO_SUPPORT_CARD - DCC version Micro Support Card.
* CPLD is re-programmed for ARIMA board compatibility.
* No define - No support card.
*/
#if 0
#define CONFIG_PFC_MICRO_SUPPORT_CARD
#else
#define CONFIG_DCC_MICRO_SUPPORT_CARD
#endif
/*
* Serial Configuration
* SoC UART : enable CONFIG_UNIPHIER_SERIAL

15
include/configs/ph1_pro4.h
View file

@ -8,21 +8,6 @@
#ifndef __PH1_XXX_H
#define __PH1_XXX_H
/*
* Support Card Select
*
* CONFIG_PFC_MICRO_SUPPORT_CARD - Original Micro Support Card made by PFC.
* CONFIG_DCC_MICRO_SUPPORT_CARD - DCC version Micro Support Card.
* CPLD is re-programmed for ARIMA board compatibility.
* No define - No support card.
*/
#if 0
#define CONFIG_PFC_MICRO_SUPPORT_CARD
#else
#define CONFIG_DCC_MICRO_SUPPORT_CARD
#endif
/*
* Serial Configuration
* SoC UART : enable CONFIG_UNIPHIER_SERIAL

15
include/configs/ph1_sld8.h
View file

@ -8,21 +8,6 @@
#ifndef __PH1_XXX_H
#define __PH1_XXX_H
/*
* Support Card Select
*
* CONFIG_PFC_MICRO_SUPPORT_CARD - Original Micro Support Card made by PFC.
* CONFIG_DCC_MICRO_SUPPORT_CARD - DCC version Micro Support Card.
* CPLD is re-programmed for ARIMA board compatibility.
* No define - No support card.
*/
#if 0
#define CONFIG_PFC_MICRO_SUPPORT_CARD
#else
#define CONFIG_DCC_MICRO_SUPPORT_CARD
#endif
/*
* Serial Configuration
* SoC UART : enable CONFIG_UNIPHIER_SERIAL

6
include/configs/uniphier-common.h
View file

@ -10,12 +10,6 @@
#ifndef __CONFIG_UNIPHIER_COMMON_H__
#define __CONFIG_UNIPHIER_COMMON_H__
#if defined(CONFIG_PFC_MICRO_SUPPORT_CARD) && \
defined(CONFIG_DCC_MICRO_SUPPORT_CARD)
# error "Both CONFIG_PFC_MICRO_SUPPORT_CARD and CONFIG_DCC_MICRO_SUPPORT_CARD \
are defined. Select only one of them."
#endif
/*
* Support card address map
*/