[U-Boot] [PATCH 2/4] Convert CONFIG_BOARD_TYPES to Kconfig

Lukasz Majewski lukma at denx.de
Mon Dec 10 07:53:08 UTC 2018


Hi Simon,

> This converts the following to Kconfig:
>    CONFIG_BOARD_TYPES
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
>  arch/arm/mach-exynos/Kconfig | 8 ++++++++
>  configs/odroid-xu3_defconfig | 2 +-
>  configs/odroid_defconfig     | 2 +-
>  include/configs/axs10x.h     | 1 -
>  include/configs/hsdk.h       | 1 -
>  include/configs/odroid.h     | 1 -
>  include/configs/odroid_xu3.h | 1 -
>  scripts/config_whitelist.txt | 1 -
>  8 files changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/mach-exynos/Kconfig
> b/arch/arm/mach-exynos/Kconfig index ed04369cfae..33323d17f4b 100644
> --- a/arch/arm/mach-exynos/Kconfig
> +++ b/arch/arm/mach-exynos/Kconfig
> @@ -166,4 +166,12 @@ source "board/samsung/espresso7420/Kconfig"
>  config SPL_LDSCRIPT
>  	default "board/samsung/common/exynos-uboot-spl.lds" if
> ARCH_EXYNOS5 || ARCH_EXYNOS4 
> +config BOARD_TYPES
> +	bool "Call get_board_type() to get and display the board
> type"
> +	help
> +	  If this option is enabled, checkboard() will call
> get_board_type()
> +	  to get a string containing the board type and this will be
> +	  displayed immediately after the model is shown on the
> console
> +	  early in boot.
> +
>  endif
> diff --git a/configs/odroid-xu3_defconfig
> b/configs/odroid-xu3_defconfig index d5c7cc7129d..f6f05b29483 100644
> --- a/configs/odroid-xu3_defconfig
> +++ b/configs/odroid-xu3_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_EXYNOS=y
>  CONFIG_SYS_TEXT_BASE=0x43E00000
>  CONFIG_ARCH_EXYNOS5=y
> +CONFIG_BOARD_TYPES=y
>  CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1/HC2"
>  CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_NR_DRAM_BANKS=8
> @@ -47,7 +48,6 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_DWC3=y
>  CONFIG_USB_DWC3_GADGET=y
>  CONFIG_USB_DWC3_PHY_SAMSUNG=y
> -CONFIG_USB_STORAGE=y

This is interesting - we add BOARD_TYPES and then USB_STORAGE is going
to be removed.

>  CONFIG_USB_GADGET=y
>  CONFIG_USB_GADGET_MANUFACTURER="Samsung"
>  CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
> index 594800fc50c..184bb62c1c1 100644
> --- a/configs/odroid_defconfig
> +++ b/configs/odroid_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
>  CONFIG_SYS_TEXT_BASE=0x43e00000
>  CONFIG_ARCH_EXYNOS4=y
>  CONFIG_TARGET_ODROID=y
> +CONFIG_BOARD_TYPES=y
>  CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_NR_DRAM_BANKS=8
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> @@ -47,7 +48,6 @@ CONFIG_DM_REGULATOR_MAX77686=y
>  CONFIG_USB=y
>  CONFIG_DM_USB=y
>  CONFIG_USB_EHCI_HCD=y
> -CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
>  CONFIG_USB_GADGET_MANUFACTURER="Samsung"
>  CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
> index 1b2966fd612..a1b9e7b21d9 100644
> --- a/include/configs/axs10x.h
> +++ b/include/configs/axs10x.h
> @@ -34,7 +34,6 @@
>  /*
>   * This board might be of different versions so handle it
>   */
> -#define CONFIG_BOARD_TYPES
>  
>  /*
>   * NAND Flash configuration
> diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
> index cdf4fddd940..b1af1271777 100644
> --- a/include/configs/hsdk.h
> +++ b/include/configs/hsdk.h
> @@ -35,7 +35,6 @@
>  /*
>   * This board might be of different versions so handle it
>   */
> -#define CONFIG_BOARD_TYPES
>  
>  /*
>   * UART configuration
> diff --git a/include/configs/odroid.h b/include/configs/odroid.h
> index ad77242e380..bc044e069e0 100644
> --- a/include/configs/odroid.h
> +++ b/include/configs/odroid.h
> @@ -186,7 +186,6 @@
>   * TODO: Add Odroid X support
>   */
>  #define CONFIG_MISC_COMMON
> -#define CONFIG_BOARD_TYPES
>  
>  #undef CONFIG_REVISION_TAG
>  
> diff --git a/include/configs/odroid_xu3.h
> b/include/configs/odroid_xu3.h index f683ee46e39..c2363dd1eef 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -86,7 +86,6 @@
>  /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */
>  #define CONFIG_ODROID_REV_AIN			9
>  #define CONFIG_REVISION_TAG
> -#define CONFIG_BOARD_TYPES
>  
>  #undef CONFIG_SYS_BOARD
>  #define CONFIG_SYS_BOARD	"odroid"
> diff --git a/scripts/config_whitelist.txt
> b/scripts/config_whitelist.txt index b8addeaf693..335977b3038 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -132,7 +132,6 @@ CONFIG_BOARD_POSTCLK_INIT
>  CONFIG_BOARD_REVISION_TAG
>  CONFIG_BOARD_SIZE_LIMIT
>  CONFIG_BOARD_TAURUS
> -CONFIG_BOARD_TYPES
>  CONFIG_BOOGER
>  CONFIG_BOOTBLOCK
>  CONFIG_BOOTFILE




Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181210/5ea3b14e/attachment.sig>


More information about the U-Boot mailing list