Hi Simon,
On Thu, Oct 22, 2020 at 10:23 PM Simon Glass <s...@chromium.org> wrote:
>
> Now that we can use devicetree to specify this information, drop the old
> CONFIG options.
>
> Signed-off-by: Simon Glass <s...@chromium.org>
> ---
>
> (no changes since v3)
>
> 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 | 35 ++++++++++++-----------------
> 12 files changed, 14 insertions(+), 56 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 ab2fa3cc706..9414665aca4 100644
> --- a/lib/Kconfig
> +++ b/lib/Kconfig
> @@ -647,22 +647,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).
> -
> endmenu
>
> config ASN1_COMPILER
> diff --git a/lib/smbios.c b/lib/smbios.c
> index 87dd4be415d..7b0c692b852 100644
> --- a/lib/smbios.c
> +++ b/lib/smbios.c
> @@ -65,25 +65,23 @@ static int smbios_add_string(char *start, const char *str)
> }
>
> /**
> - * smbios_add_prop_default() - Add a property from the device tree or default
> + * smbios_add_prop_default() - Add a property from the device tree
> *
> * @start: string area start address
> * @node: node containing the information to write (ofnode_null() if
> none)
> * @prop: property to write
> - * @def: default string if the node has no such property
> * @return 0 if not found, else SMBIOS string number (1 or more)
> */
> -static int smbios_add_prop_default(char *start, ofnode node, const char
> *prop,
> - const char *def)
> +static int smbios_add_prop_default(char *start, ofnode node, const char
> *prop)
I think we should drop the smbios_add_prop_default() API and just use
smbios_add_prop().
> {
> - const char *str = NULL;
>
> - if (IS_ENABLED(CONFIG_OF_CONTROL))
> + if (IS_ENABLED(CONFIG_OF_CONTROL)) {
> + const char *str;
> +
> str = ofnode_read_string(node, prop);
> - if (str)
> - return smbios_add_string(start, str);
> - else if (def)
> - return smbios_add_string(start, def);
> + if (str)
> + return smbios_add_string(start, str);
> + }
>
> return 0;
> }
> @@ -98,7 +96,7 @@ static int smbios_add_prop_default(char *start, ofnode
> node, const char *prop,
> */
> static int smbios_add_prop(char *start, ofnode node, const char *prop)
> {
> - return smbios_add_prop_default(start, node, prop, NULL);
> + return smbios_add_prop_default(start, node, prop);
> }
>
> /**
> @@ -169,10 +167,8 @@ static int smbios_write_type1(ulong *current, int
> handle, ofnode node)
> t = map_sysmem(*current, len);
> memset(t, 0, sizeof(struct smbios_type1));
> fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle);
> - t->manufacturer = smbios_add_prop_default(t->eos, node, "manufactuer",
> - CONFIG_SMBIOS_MANUFACTURER);
> - t->product_name = smbios_add_prop_default(t->eos, node, "product",
> - CONFIG_SMBIOS_PRODUCT_NAME);
> + t->manufacturer = smbios_add_prop_default(t->eos, node,
> "manufactuer");
use smbios_add_prop()
> + t->product_name = smbios_add_prop_default(t->eos, node, "product");
> t->version = smbios_add_prop(t->eos, node, "version");
> if (serial_str) {
> t->serial_number = smbios_add_string(t->eos, serial_str);
> @@ -198,10 +194,8 @@ static int smbios_write_type2(ulong *current, int
> handle, ofnode node)
> t = map_sysmem(*current, len);
> memset(t, 0, sizeof(struct smbios_type2));
> fill_smbios_header(t, SMBIOS_BOARD_INFORMATION, len, handle);
> - t->manufacturer = smbios_add_prop_default(t->eos, node, "manufactuer",
> - CONFIG_SMBIOS_MANUFACTURER);
> - t->product_name = smbios_add_prop_default(t->eos, node, "product",
> - CONFIG_SMBIOS_PRODUCT_NAME);
> + t->manufacturer = smbios_add_prop_default(t->eos, node,
> "manufactuer");
> + t->product_name = smbios_add_prop_default(t->eos, node, "product");
> t->asset_tag_number = smbios_add_prop(t->eos, node, "asset-tag");
> t->feature_flags = SMBIOS_BOARD_FEATURE_HOSTING;
> t->board_type = SMBIOS_BOARD_MOTHERBOARD;
> @@ -221,8 +215,7 @@ static int smbios_write_type3(ulong *current, int handle,
> ofnode node)
> t = map_sysmem(*current, len);
> memset(t, 0, sizeof(struct smbios_type3));
> fill_smbios_header(t, SMBIOS_SYSTEM_ENCLOSURE, len, handle);
> - t->manufacturer = smbios_add_prop_default(t->eos, node, "manufactuer",
> - CONFIG_SMBIOS_MANUFACTURER);
> + t->manufacturer = smbios_add_prop_default(t->eos, node,
> "manufactuer");
> t->chassis_type = SMBIOS_ENCLOSURE_DESKTOP;
> t->bootup_state = SMBIOS_STATE_SAFE;
> t->power_supply_state = SMBIOS_STATE_SAFE;
> --
Regards,
Bin
