diff options
| -rw-r--r-- | arch/x86/cpu/mp_init.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/acpi_table.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/cpu.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/qemu.c | 2 | ||||
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/Makefile | 2 | ||||
| -rw-r--r-- | cmd/qfw.c | 2 | ||||
| -rw-r--r-- | configs/qemu-x86_defconfig | 2 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/misc/qfw.c (renamed from drivers/misc/qemu_fw_cfg.c) | 2 | ||||
| -rw-r--r-- | include/qfw.h (renamed from include/qemu_fw_cfg.h) | 0 |
12 files changed, 11 insertions, 11 deletions
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index c44a286e5b..8207274879 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -11,7 +11,7 @@ #include <dm.h> #include <errno.h> #include <malloc.h> -#include <qemu_fw_cfg.h> +#include <qfw.h> #include <asm/atomic.h> #include <asm/cpu.h> #include <asm/interrupt.h> diff --git a/arch/x86/cpu/qemu/acpi_table.c b/arch/x86/cpu/qemu/acpi_table.c index b17fa03bc8..5bb1756c53 100644 --- a/arch/x86/cpu/qemu/acpi_table.c +++ b/arch/x86/cpu/qemu/acpi_table.c @@ -8,7 +8,7 @@ #include <command.h> #include <errno.h> #include <malloc.h> -#include <qemu_fw_cfg.h> +#include <qfw.h> #include <asm/io.h> #include <asm/tables.h> #include <asm/e820.h> diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c index 4d2989a708..b1a965e715 100644 --- a/arch/x86/cpu/qemu/cpu.c +++ b/arch/x86/cpu/qemu/cpu.c @@ -8,7 +8,7 @@ #include <cpu.h> #include <dm.h> #include <errno.h> -#include <qemu_fw_cfg.h> +#include <qfw.h> #include <asm/cpu.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index c29add39b2..680e558ee8 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -6,7 +6,7 @@ #include <common.h> #include <pci.h> -#include <qemu_fw_cfg.h> +#include <qfw.h> #include <asm/irq.h> #include <asm/post.h> #include <asm/processor.h> diff --git a/cmd/Kconfig b/cmd/Kconfig index 08b761f6db..c5a7a59064 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -593,7 +593,7 @@ config CMD_SOUND sound init - set up sound system sound play - play a sound -config CMD_QEMU_FW_CFG +config CMD_QFW bool "qfw" depends on X86 select QFW diff --git a/cmd/Makefile b/cmd/Makefile index ff4fc5b98e..9ce7861f82 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -105,7 +105,7 @@ endif obj-y += pcmcia.o obj-$(CONFIG_CMD_PORTIO) += portio.o obj-$(CONFIG_CMD_PXE) += pxe.o -obj-$(CONFIG_CMD_QEMU_FW_CFG) += qfw.o +obj-$(CONFIG_CMD_QFW) += qfw.o obj-$(CONFIG_CMD_READ) += read.o obj-$(CONFIG_CMD_REGINFO) += reginfo.o obj-$(CONFIG_CMD_REISER) += reiser.o @@ -7,7 +7,7 @@ #include <common.h> #include <command.h> #include <errno.h> -#include <qemu_fw_cfg.h> +#include <qfw.h> /* * This function prepares kernel for zboot. It loads kernel data diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index a813e5b438..45bb3ec0e9 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -20,7 +20,7 @@ CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_PING=y CONFIG_CMD_TIME=y -CONFIG_CMD_QEMU_FW_CFG=y +CONFIG_CMD_QFW=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index fa537002d4..c40f6b577f 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -142,6 +142,6 @@ config QFW bool help Hidden option to enable QEMU fw_cfg interface. This will be selected by - either CONFIG_CMD_QEMU_FW_CFG or CONFIG_GENERATE_ACPI_TABLE. + either CONFIG_CMD_QFW or CONFIG_GENERATE_ACPI_TABLE. endmenu diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 4893086b72..98704f2085 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -43,4 +43,4 @@ obj-$(CONFIG_PCA9551_LED) += pca9551_led.o obj-$(CONFIG_RESET) += reset-uclass.o obj-$(CONFIG_FSL_DEVICE_DISABLE) += fsl_devdis.o obj-$(CONFIG_WINBOND_W83627) += winbond_w83627.o -obj-$(CONFIG_QFW) += qemu_fw_cfg.o +obj-$(CONFIG_QFW) += qfw.o diff --git a/drivers/misc/qemu_fw_cfg.c b/drivers/misc/qfw.c index 0f72549321..59d9376d76 100644 --- a/drivers/misc/qemu_fw_cfg.c +++ b/drivers/misc/qfw.c @@ -8,7 +8,7 @@ #include <command.h> #include <errno.h> #include <malloc.h> -#include <qemu_fw_cfg.h> +#include <qfw.h> #include <asm/io.h> #include <linux/list.h> diff --git a/include/qemu_fw_cfg.h b/include/qfw.h index b0b3b5945e..b0b3b5945e 100644 --- a/include/qemu_fw_cfg.h +++ b/include/qfw.h |