Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

[u-boot] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 65cbb9cc660da3a4c4b763a610beb8ddc7c3aa1f..29d2307fa5653cb88b80416b2b04f41974079e3f 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -464,6 +464,22 @@ config GENERATE_SMBIOS_TABLE
 
          Check http://www.dmtf.org/standards/smbios for details.
 
+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 MAX_PIRQ_LINKS