From patchwork Mon May 23 02:37:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Yan X-Patchwork-Id: 625023 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3rCjQW2N4yz9t45 for ; Mon, 23 May 2016 12:38:27 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=prCSXBMU; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D68CFA7519; Mon, 23 May 2016 04:38:16 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id riRR7G61Xkao; Mon, 23 May 2016 04:38:16 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 163BD4BA35; Mon, 23 May 2016 04:37:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C3E154B98A for ; Mon, 23 May 2016 04:37:37 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 099MJYq-ZgOb for ; Mon, 23 May 2016 04:37:37 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pa0-f68.google.com (mail-pa0-f68.google.com [209.85.220.68]) by theia.denx.de (Postfix) with ESMTPS id 4109B4B951 for ; Mon, 23 May 2016 04:37:35 +0200 (CEST) Received: by mail-pa0-f68.google.com with SMTP id xm6so16412463pab.3 for ; Sun, 22 May 2016 19:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=EvcoSRSWZDAmYwsZUAU9s/dEgR2VDpbKQ7lgPAI5Gwg=; b=prCSXBMUrpZfWY1JQ7cdxAvApt2v1L8apKkeKq9DTeWp97TC9BAsHEUSDCx4UQS+6k IYPBGkk4tiKif4Qr9V+0q9qj6W0A+XF1ItMtB1+cKBPCB7O6YaPU6iMakag0ErFHVCfU xHuxzCgK6P0PYgBUXRNn1icV/uIRyt279cmcf5UmKkYDrviJcBD8J8/A/GSQBgxARzpt zLBsc7SUTTw4y4RyNmZBOLEdq2Ni+pXLVHySMEhSxEnxVhARuX56hYqH3RjawuLpFFaL wy0iBcboRSfqHcx/n0bNy8XbkcPCcutXZjVnUJiqeIA60CPcQGabKpoEtLsgg6Ur+AP3 2fgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=EvcoSRSWZDAmYwsZUAU9s/dEgR2VDpbKQ7lgPAI5Gwg=; b=db7GVH0yXraTQxnGIKbfGO7TRxppG0PrsevnZt/jr5d8qRn/SQHDv8aSKBL7ntjZs0 yyAQWMZM3zz72Ab0xsbru+p0YHusf9azs8ooIeYUtX6Yv5CSJmwodg7N8ypfgthAvNmp iPSdQpaTh8MKAfU6pcyEK83eXOyd0nvplyVXNXspCc8hIzhomwWO0fq4Cbu/eocLcw8N VD0anrjxWMfJBXce9dZu6SNwjpyTAedjnyh1PeqyFTbZS+gvfPaMqD0aRROe8FKRJZno YQJrBJ1C1X0dSBDJhfA7PK0kVlPen/Q4t6ZpmU1poLDv+Q6JR4nFLG+vc6rRV83minXR NkqA== X-Gm-Message-State: AOPr4FUbGjEbBD6BU/0ecOCzcORKyVYO/CMUN7xpVWp+IAr4paktrt1VoOq3C2ugYqS34w== X-Received: by 10.66.237.35 with SMTP id uz3mr23948353pac.145.1463971054181; Sun, 22 May 2016 19:37:34 -0700 (PDT) Received: from pa-dbc1131.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id u127sm42109384pfb.82.2016.05.22.19.37.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 May 2016 19:37:33 -0700 (PDT) From: Miao Yan To: u-boot@lists.denx.de, trini@konsulko.com, sjg@chromium.org, bmeng.cn@gmail.com Date: Sun, 22 May 2016 19:37:17 -0700 Message-Id: <1463971042-24531-9-git-send-email-yanmiaobest@gmail.com> X-Mailer: git-send-email 2.6.3.444.gfd13a2e In-Reply-To: <1463971042-24531-1-git-send-email-yanmiaobest@gmail.com> References: <1463971042-24531-1-git-send-email-yanmiaobest@gmail.com> Subject: [U-Boot] [PATCH v3 08/13] cmd: qfw: rename qemu_fw_cfg.[c|h] to qfw.[c|h] X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Make file names consistent with CONFIG_QFW and CONFIG_CMD_QFW Signed-off-by: Miao Yan Reviewed-by: Bin Meng --- Changes in v3: - squash with patch v2 #13 arch/x86/cpu/mp_init.c | 2 +- arch/x86/cpu/qemu/acpi_table.c | 2 +- arch/x86/cpu/qemu/cpu.c | 2 +- arch/x86/cpu/qemu/qemu.c | 2 +- cmd/Kconfig | 2 +- cmd/Makefile | 2 +- cmd/qfw.c | 2 +- configs/qemu-x86_defconfig | 2 +- drivers/misc/Kconfig | 2 +- drivers/misc/Makefile | 2 +- drivers/misc/{qemu_fw_cfg.c => qfw.c} | 2 +- include/{qemu_fw_cfg.h => qfw.h} | 0 12 files changed, 11 insertions(+), 11 deletions(-) rename drivers/misc/{qemu_fw_cfg.c => qfw.c} (99%) rename include/{qemu_fw_cfg.h => qfw.h} (100%) diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index c44a286..8207274 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/cpu/qemu/acpi_table.c b/arch/x86/cpu/qemu/acpi_table.c index b17fa03..5bb1756 100644 --- a/arch/x86/cpu/qemu/acpi_table.c +++ b/arch/x86/cpu/qemu/acpi_table.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c index 4d2989a..b1a965e 100644 --- a/arch/x86/cpu/qemu/cpu.c +++ b/arch/x86/cpu/qemu/cpu.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index c29add3..680e558 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/cmd/Kconfig b/cmd/Kconfig index 08b761f..c5a7a59 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 0b7f7a2..1bbd14f 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 diff --git a/cmd/qfw.c b/cmd/qfw.c index 37f1aa6..c6730bf 100644 --- a/cmd/qfw.c +++ b/cmd/qfw.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include /* * This function prepares kernel for zboot. It loads kernel data diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index a813e5b..45bb3ec 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 fa53700..c40f6b5 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 4893086..98704f2 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 similarity index 99% rename from drivers/misc/qemu_fw_cfg.c rename to drivers/misc/qfw.c index 0f72549..59d9376 100644 --- a/drivers/misc/qemu_fw_cfg.c +++ b/drivers/misc/qfw.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/qemu_fw_cfg.h b/include/qfw.h similarity index 100% rename from include/qemu_fw_cfg.h rename to include/qfw.h