diff options
| author | Stuart Hayes <stuart.w.hayes@gmail.com> | 2018-09-26 17:50:19 -0400 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-09-27 05:18:15 -0400 |
| commit | c48e2ffd717ca4a67b4938bb60d110b7eeed39c4 (patch) | |
| tree | e10693c4b4ce9a6ed3c70190781f9956049bcb0e /drivers | |
| parent | 12c956c4f32e08799de452abe1e1ec6021b1e41f (diff) | |
firmware: dell_rbu: Move dell_rbu to drivers/platform/x86
Move dell_rbu to the more appropriate directory drivers/platform/x86.
Signed-off-by: Stuart Hayes <stuart.w.hayes@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/firmware/Makefile | 1 | ||||
| -rw-r--r-- | drivers/platform/x86/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/platform/x86/Makefile | 1 | ||||
| -rw-r--r-- | drivers/platform/x86/dell_rbu.c (renamed from drivers/firmware/dell_rbu.c) | 0 |
5 files changed, 13 insertions, 13 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 6e83880046d7..02f39d20efce 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig | |||
| @@ -145,18 +145,6 @@ config EFI_PCDP | |||
| 145 | See DIG64_HCDPv20_042804.pdf available from | 145 | See DIG64_HCDPv20_042804.pdf available from |
| 146 | <http://www.dig64.org/specifications/> | 146 | <http://www.dig64.org/specifications/> |
| 147 | 147 | ||
| 148 | config DELL_RBU | ||
| 149 | tristate "BIOS update support for DELL systems via sysfs" | ||
| 150 | depends on X86 | ||
| 151 | select FW_LOADER | ||
| 152 | select FW_LOADER_USER_HELPER | ||
| 153 | help | ||
| 154 | Say m if you want to have the option of updating the BIOS for your | ||
| 155 | DELL system. Note you need a Dell OpenManage or Dell Update package (DUP) | ||
| 156 | supporting application to communicate with the BIOS regarding the new | ||
| 157 | image for the image update to take effect. | ||
| 158 | See <file:Documentation/dell_rbu.txt> for more details on the driver. | ||
| 159 | |||
| 160 | config DCDBAS | 148 | config DCDBAS |
| 161 | tristate "Dell Systems Management Base Driver" | 149 | tristate "Dell Systems Management Base Driver" |
| 162 | depends on X86 | 150 | depends on X86 |
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index e18a041cfc53..61887ba9df1d 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile | |||
| @@ -11,7 +11,6 @@ obj-$(CONFIG_DMI) += dmi_scan.o | |||
| 11 | obj-$(CONFIG_DMI_SYSFS) += dmi-sysfs.o | 11 | obj-$(CONFIG_DMI_SYSFS) += dmi-sysfs.o |
| 12 | obj-$(CONFIG_EDD) += edd.o | 12 | obj-$(CONFIG_EDD) += edd.o |
| 13 | obj-$(CONFIG_EFI_PCDP) += pcdp.o | 13 | obj-$(CONFIG_EFI_PCDP) += pcdp.o |
| 14 | obj-$(CONFIG_DELL_RBU) += dell_rbu.o | ||
| 15 | obj-$(CONFIG_DCDBAS) += dcdbas.o | 14 | obj-$(CONFIG_DCDBAS) += dcdbas.o |
| 16 | obj-$(CONFIG_DMIID) += dmi-id.o | 15 | obj-$(CONFIG_DMIID) += dmi-id.o |
| 17 | obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o | 16 | obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o |
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 1fca33c97e8a..097212c712f7 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
| @@ -230,6 +230,18 @@ config DELL_RBTN | |||
| 230 | To compile this driver as a module, choose M here: the module will | 230 | To compile this driver as a module, choose M here: the module will |
| 231 | be called dell-rbtn. | 231 | be called dell-rbtn. |
| 232 | 232 | ||
| 233 | config DELL_RBU | ||
| 234 | tristate "BIOS update support for DELL systems via sysfs" | ||
| 235 | depends on X86 | ||
| 236 | select FW_LOADER | ||
| 237 | select FW_LOADER_USER_HELPER | ||
| 238 | help | ||
| 239 | Say m if you want to have the option of updating the BIOS for your | ||
| 240 | DELL system. Note you need a Dell OpenManage or Dell Update package (DUP) | ||
| 241 | supporting application to communicate with the BIOS regarding the new | ||
| 242 | image for the image update to take effect. | ||
| 243 | See <file:Documentation/dell_rbu.txt> for more details on the driver. | ||
| 244 | |||
| 233 | 245 | ||
| 234 | config FUJITSU_LAPTOP | 246 | config FUJITSU_LAPTOP |
| 235 | tristate "Fujitsu Laptop Extras" | 247 | tristate "Fujitsu Laptop Extras" |
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index e6d1becf81ce..8843f8e22127 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile | |||
| @@ -23,6 +23,7 @@ obj-$(CONFIG_DELL_WMI_AIO) += dell-wmi-aio.o | |||
| 23 | obj-$(CONFIG_DELL_WMI_LED) += dell-wmi-led.o | 23 | obj-$(CONFIG_DELL_WMI_LED) += dell-wmi-led.o |
| 24 | obj-$(CONFIG_DELL_SMO8800) += dell-smo8800.o | 24 | obj-$(CONFIG_DELL_SMO8800) += dell-smo8800.o |
| 25 | obj-$(CONFIG_DELL_RBTN) += dell-rbtn.o | 25 | obj-$(CONFIG_DELL_RBTN) += dell-rbtn.o |
| 26 | obj-$(CONFIG_DELL_RBU) += dell_rbu.o | ||
| 26 | obj-$(CONFIG_ACER_WMI) += acer-wmi.o | 27 | obj-$(CONFIG_ACER_WMI) += acer-wmi.o |
| 27 | obj-$(CONFIG_ACER_WIRELESS) += acer-wireless.o | 28 | obj-$(CONFIG_ACER_WIRELESS) += acer-wireless.o |
| 28 | obj-$(CONFIG_ACERHDF) += acerhdf.o | 29 | obj-$(CONFIG_ACERHDF) += acerhdf.o |
diff --git a/drivers/firmware/dell_rbu.c b/drivers/platform/x86/dell_rbu.c index ccefa84f7305..ccefa84f7305 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/platform/x86/dell_rbu.c | |||
