x86: galileo: Use devicetree for SMBIOS settings

Add settings and enable the default sysinfo driver so that these can come
from the device tree.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts
index 5de4568679a46d0c5a3b001d0050d45f6f34d77e..501047124ee1186a41af63441178d3525e83e800 100644 (file)
--- a/arch/x86/dts/galileo.dts
+++ b/arch/x86/dts/galileo.dts
@@ -164,4 +164,32 @@
                };
        };
 
+       smbios {
+               compatible = "u-boot,sysinfo-smbios";
+
+               /*
+                * Override the default product name U-Boot reports in the
+                * SMBIOS table, to be compatible with the Intel provided UEFI
+                * BIOS, as Linux kernel drivers
+                * (drivers/mfd/intel_quark_i2c_gpio.c and
+                * drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c) make use of
+                * it to do different board level configuration.
+                *
+                * This can be "Galileo" for GEN1 Galileo board.
+                */
+               smbios {
+                       system {
+                               product = "GalileoGen2";
+                       };
+
+                       baseboard {
+                               product = "GalileoGen2";
+                       };
+
+                       chassis {
+                               product = "GalileoGen2";
+                       };
+               };
+       };
+
 };

diff --git a/board/intel/galileo/Kconfig b/board/intel/galileo/Kconfig
index 1416c891e86447fb013fb30edd63a9777cce0047..fb8d94fb5b15dc104377646a1b0007efa22ede89 100644 (file)
--- a/board/intel/galileo/Kconfig
+++ b/board/intel/galileo/Kconfig
@@ -22,15 +22,4 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select BOARD_ROMSIZE_KB_1024
        select SPI_FLASH_WINBOND
 
-config SMBIOS_PRODUCT_NAME
-       default "GalileoGen2"
-       help
-         Override the default product name U-Boot reports in the SMBIOS
-         table, to be compatible with the Intel provided UEFI BIOS, as
-         Linux kernel drivers (drivers/mfd/intel_quark_i2c_gpio.c and
-         drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c) make use of
-         it to do different board level configuration.
-
-         This can be "Galileo" for GEN1 Galileo board.
-
 endif