[Xen-changelog] [xen master] tools/firmware: Rename bios.bin to seabios.bin

[patchbot@xxxxxxx]

commit b2f2ced591060588a45cdc7881a7335ba42b9cc5
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Mon Sep 5 11:36:45 2016 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Mon Sep 5 11:53:16 2016 +0100

    tools/firmware: Rename bios.bin to seabios.bin
    
    bios.bin as a name is far too generic.  Rename it to seabios.bin.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    [ wei: fix up conflict, rerun autogen.sh ]
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/configure         | 2 +-
 tools/configure.ac      | 2 +-
 tools/firmware/Makefile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/configure b/tools/configure
index 998090a..7b22305 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4453,7 +4453,7 @@ if test "x$seabios" = "xy"; then :
 
 
 cat >>confdefs.h <<_ACEOF
-#define SEABIOS_PATH "${seabios_path:-$XENFIRMWAREDIR/bios.bin}"
+#define SEABIOS_PATH "${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"
 _ACEOF
 
 
diff --git a/tools/configure.ac b/tools/configure.ac
index 1fb4a55..f010d72 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -224,7 +224,7 @@ AC_ARG_WITH([system-seabios],
 ],[])
 AS_IF([test "x$seabios" = "xy"], [
     AC_DEFINE_UNQUOTED([SEABIOS_PATH],
-                       ["${seabios_path:-$XENFIRMWAREDIR/bios.bin}"],
+                       ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"],
                        [SeaBIOS path])
 ])
 
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index cf09ad2..b840c6a 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -42,7 +42,7 @@ install: all
        [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR)
        [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
 ifeq ($(CONFIG_SEABIOS),y)
-       $(INSTALL_DATA) seabios-dir/out/bios.bin $(INST_DIR)/bios.bin
+       $(INSTALL_DATA) seabios-dir/out/bios.bin $(INST_DIR)/seabios.bin
 endif
 ifeq ($(CONFIG_OVMF),y)
        $(INSTALL_DATA) ovmf-dir/ovmf.bin $(INST_DIR)/ovmf.bin
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog