From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 1 Jun 2016 15:01:55 +0000 (+0200)
Subject: x86: enable DMI and DMI_SYSFS
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b8b23e0e648405a0af7443b7d9412f47dd9a44d4;p=openwrt%2Fstaging%2Fnbd.git

x86: enable DMI and DMI_SYSFS

Enable support for DMI decoding in the kernel so that we can access
manufacturer and model information via sysfs.

Also remove redundant per-subtarget DMI overrides and preset a few
previously unset symbols popping up due to the now enabled DMI support.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/target/linux/x86/config-4.4 b/target/linux/x86/config-4.4
index 5b540313c6..13f1f9c53e 100644
--- a/target/linux/x86/config-4.4
+++ b/target/linux/x86/config-4.4
@@ -98,7 +98,10 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DELL_RBU is not set
-# CONFIG_DMI is not set
+CONFIG_DMI=y
+CONFIG_DMIID=y
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_DMI_SYSFS=y
 CONFIG_DNOTIFY=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_EARLY_PRINTK=y
@@ -133,6 +136,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
+# CONFIG_GEOS is not set
 CONFIG_GLOB=y
 # CONFIG_GOOGLE_FIRMWARE is not set
 # CONFIG_HANGCHECK_TIMER is not set
@@ -251,6 +255,7 @@ CONFIG_KALLSYMS=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_M486=y
 # CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index 61ce22c380..2ef610f7ab 100644
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -52,10 +52,6 @@ CONFIG_CLKDEV_LOOKUP=y
 CONFIG_COMMON_CLK=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DMI=y
-# CONFIG_DMIID is not set
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-# CONFIG_DMI_SYSFS is not set
 CONFIG_DRM=y
 CONFIG_DRM_AMDGPU=y
 # CONFIG_DRM_AMDGPU_CIK is not set
@@ -116,7 +112,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FUJITSU_LAPTOP is not set
-# CONFIG_GEOS is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_HAVE_CLK=y
@@ -149,7 +144,6 @@ CONFIG_ISO9660_FS=y
 # CONFIG_JOLIET is not set
 # CONFIG_LANCE is not set
 # CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_MFD_CORE=y
 CONFIG_MFD_INTEL_LPSS=y
diff --git a/target/linux/x86/geode/config-default b/target/linux/x86/geode/config-default
index 785df47fca..fdfa9b412f 100644
--- a/target/linux/x86/geode/config-default
+++ b/target/linux/x86/geode/config-default
@@ -10,10 +10,6 @@ CONFIG_ALIX=y
 CONFIG_CS5535_CLOCK_EVENT_SRC=y
 CONFIG_CS5535_MFGPT=y
 CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_DMI=y
-# CONFIG_DMIID is not set
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-# CONFIG_DMI_SYSFS is not set
 # CONFIG_EISA is not set
 # CONFIG_EL3 is not set
 CONFIG_GEODE_WDT=y
@@ -35,7 +31,6 @@ CONFIG_I2C_ALGOPCF=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_ISA=y
 # CONFIG_LANCE is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_M486 is not set
 # CONFIG_MDA_CONSOLE is not set