[PATCH v5 13/13] smbios: Drop the unused Kconfig options

Thu Nov 5 07:49:15 CET 2020

Hi Simon,

On Wed, Nov 4, 2020 at 11:23 PM Simon Glass <sjg at chromium.org> wrote:
>
> Now that we can use devicetree to specify this information, drop the old
> CONFIG options.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> Changes in v5:
> - Rename smbios_add_prop_default() to smbios_add_prop()
>
> Changes in v3:
> - Add onto the sysinfo binding
>
>  configs/clearfog_gt_8k_defconfig    |  2 --
>  configs/mt7622_rfb_defconfig        |  1 -
>  configs/mvebu_db_armada8k_defconfig |  2 --
>  configs/r8a774a1_beacon_defconfig   |  2 --
>  configs/r8a77970_eagle_defconfig    |  2 --
>  configs/r8a77980_condor_defconfig   |  2 --
>  configs/r8a77990_ebisu_defconfig    |  2 --
>  configs/r8a77995_draak_defconfig    |  2 --
>  configs/rcar3_salvator-x_defconfig  |  2 --
>  configs/rcar3_ulcb_defconfig        |  2 --
>  lib/Kconfig                         | 16 ----------
>  lib/smbios.c                        | 46 ++++++++---------------------
>  12 files changed, 13 insertions(+), 68 deletions(-)
>
> diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig
> index 552df3a8b80..9bb1f212a70 100644
> --- a/configs/clearfog_gt_8k_defconfig
> +++ b/configs/clearfog_gt_8k_defconfig
> @@ -12,7 +12,6 @@ CONFIG_DM_GPIO=y
>  CONFIG_DEBUG_UART_BASE=0xf0512000
>  CONFIG_DEBUG_UART_CLOCK=200000000
>  CONFIG_DEFAULT_DEVICE_TREE="armada-8040-clearfog-gt-8k"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_DEBUG_UART=y
>  CONFIG_AHCI=y
>  CONFIG_DISTRO_DEFAULTS=y
> @@ -78,4 +77,3 @@ CONFIG_USB_ETHER_ASIX=y
>  CONFIG_USB_ETHER_MCS7830=y
>  CONFIG_USB_ETHER_RTL8152=y
>  CONFIG_USB_ETHER_SMSC95XX=y
> -CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/mt7622_rfb_defconfig b/configs/mt7622_rfb_defconfig
> index a6089d6cf6a..ccf926e1040 100644
> --- a/configs/mt7622_rfb_defconfig
> +++ b/configs/mt7622_rfb_defconfig
> @@ -5,7 +5,6 @@ CONFIG_SYS_TEXT_BASE=0x41e00000
>  CONFIG_SYS_MALLOC_F_LEN=0x4000
>  CONFIG_NR_DRAM_BANKS=1
>  CONFIG_DEFAULT_DEVICE_TREE="mt7622-rfb"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_FIT=y
>  CONFIG_DEFAULT_FDT_FILE="mt7622-rfb"
>  CONFIG_LOGLEVEL=7
> diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig
> index a88d5cc98bd..5d8a1b655cd 100644
> --- a/configs/mvebu_db_armada8k_defconfig
> +++ b/configs/mvebu_db_armada8k_defconfig
> @@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
>  CONFIG_DEBUG_UART_BASE=0xf0512000
>  CONFIG_DEBUG_UART_CLOCK=200000000
>  CONFIG_DEFAULT_DEVICE_TREE="armada-8040-db"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_DEBUG_UART=y
>  CONFIG_AHCI=y
>  CONFIG_DISTRO_DEFAULTS=y
> @@ -72,4 +71,3 @@ CONFIG_USB_ETHER_ASIX=y
>  CONFIG_USB_ETHER_MCS7830=y
>  CONFIG_USB_ETHER_RTL8152=y
>  CONFIG_USB_ETHER_SMSC95XX=y
> -CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a774a1_beacon_defconfig b/configs/r8a774a1_beacon_defconfig
> index 5d564d82c2f..2f45edd92ec 100644
> --- a/configs/r8a774a1_beacon_defconfig
> +++ b/configs/r8a774a1_beacon_defconfig
> @@ -8,7 +8,6 @@ CONFIG_RCAR_GEN3=y
>  CONFIG_TARGET_BEACON_RZG2M=y
>  # CONFIG_SPL is not set
>  CONFIG_DEFAULT_DEVICE_TREE="r8a774a1-beacon-rzg2m-kit"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_FIT=y
>  CONFIG_SUPPORT_RAW_INITRD=y
>  # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
> @@ -64,4 +63,3 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_GENERIC=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig
> index a7774842353..9dbe0e1d5b4 100644
> --- a/configs/r8a77970_eagle_defconfig
> +++ b/configs/r8a77970_eagle_defconfig
> @@ -11,7 +11,6 @@ CONFIG_SPL_TEXT_BASE=0xe6318000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_TARGET_EAGLE=y
>  CONFIG_DEFAULT_DEVICE_TREE="r8a77970-eagle-u-boot"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_FIT=y
>  CONFIG_SUPPORT_RAW_INITRD=y
>  CONFIG_USE_BOOTARGS=y
> @@ -74,4 +73,3 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_GENERIC=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a77980_condor_defconfig b/configs/r8a77980_condor_defconfig
> index 4e457234ed0..dbe2912779c 100644
> --- a/configs/r8a77980_condor_defconfig
> +++ b/configs/r8a77980_condor_defconfig
> @@ -11,7 +11,6 @@ CONFIG_SPL_TEXT_BASE=0xe6318000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_TARGET_CONDOR=y
>  CONFIG_DEFAULT_DEVICE_TREE="r8a77980-condor-u-boot"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_FIT=y
>  CONFIG_SUPPORT_RAW_INITRD=y
>  CONFIG_USE_BOOTARGS=y
> @@ -75,4 +74,3 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_GENERIC=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig
> index 4667284bb37..cb75b5c3a60 100644
> --- a/configs/r8a77990_ebisu_defconfig
> +++ b/configs/r8a77990_ebisu_defconfig
> @@ -10,7 +10,6 @@ CONFIG_SPL_TEXT_BASE=0xe6318000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_TARGET_EBISU=y
>  CONFIG_DEFAULT_DEVICE_TREE="r8a77990-ebisu-u-boot"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_FIT=y
>  CONFIG_SUPPORT_RAW_INITRD=y
>  CONFIG_USE_BOOTARGS=y
> @@ -84,4 +83,3 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_GENERIC=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig
> index 5cc0f608da2..46a7314fa90 100644
> --- a/configs/r8a77995_draak_defconfig
> +++ b/configs/r8a77995_draak_defconfig
> @@ -10,7 +10,6 @@ CONFIG_SPL_TEXT_BASE=0xe6318000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_TARGET_DRAAK=y
>  CONFIG_DEFAULT_DEVICE_TREE="r8a77995-draak-u-boot"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_FIT=y
>  CONFIG_SUPPORT_RAW_INITRD=y
>  CONFIG_USE_BOOTARGS=y
> @@ -85,4 +84,3 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_GENERIC=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig
> index 5f2f3665544..ff6e0e945e6 100644
> --- a/configs/rcar3_salvator-x_defconfig
> +++ b/configs/rcar3_salvator-x_defconfig
> @@ -9,7 +9,6 @@ CONFIG_SPL_TEXT_BASE=0xe6338000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_TARGET_SALVATOR_X=y
>  CONFIG_DEFAULT_DEVICE_TREE="r8a77950-salvator-x-u-boot"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_FIT=y
>  CONFIG_SUPPORT_RAW_INITRD=y
>  CONFIG_USE_BOOTARGS=y
> @@ -89,4 +88,3 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_GENERIC=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig
> index 03865dfc34a..df202a75983 100644
> --- a/configs/rcar3_ulcb_defconfig
> +++ b/configs/rcar3_ulcb_defconfig
> @@ -10,7 +10,6 @@ CONFIG_SPL_TEXT_BASE=0xe6338000
>  CONFIG_RCAR_GEN3=y
>  CONFIG_TARGET_ULCB=y
>  CONFIG_DEFAULT_DEVICE_TREE="r8a77950-ulcb-u-boot"
> -CONFIG_SMBIOS_PRODUCT_NAME=""
>  CONFIG_FIT=y
>  CONFIG_SUPPORT_RAW_INITRD=y
>  CONFIG_USE_BOOTARGS=y
> @@ -87,4 +86,3 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_EHCI_GENERIC=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_OF_LIBFDT_OVERLAY=y
> -CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/lib/Kconfig b/lib/Kconfig
> index c4dc2bbf8e5..dc4143fc128 100644
> --- a/lib/Kconfig
> +++ b/lib/Kconfig
> @@ -652,22 +652,6 @@ config GENERATE_SMBIOS_TABLE
>           See also SMBIOS_SYSINFO which allows SMBIOS values to be provided in
>           the devicetree.
>
> -config SMBIOS_MANUFACTURER
> -       string "SMBIOS Manufacturer"
> -       depends on GENERATE_SMBIOS_TABLE
> -       default SYS_VENDOR
> -       help
> -         The board manufacturer to store in SMBIOS structures.
> -         Change this to override the default one (CONFIG_SYS_VENDOR).
> -
> -config SMBIOS_PRODUCT_NAME
> -       string "SMBIOS Product Name"
> -       depends on GENERATE_SMBIOS_TABLE
> -       default SYS_BOARD
> -       help
> -         The product name to store in SMBIOS structures.
> -         Change this to override the default one (CONFIG_SYS_BOARD).

It seems you missed my previous comments about x86 default smbios?

> -
>  endmenu
>
>  config ASN1_COMPILER

[snip]

Regards,
Bin