[Qemu-devel] [PATCH 1/7] Rename pc-bios/optionrom -> roms/multiboot

[Anthony Liguori]

We'll be storing all of our rom source code in roms/

Signed-off-by: Anthony Liguori <address@hidden>
---
 configure                                         |    6 +++---
 {pc-bios/optionrom => roms/multiboot}/Makefile    |    4 ++--
 {pc-bios/optionrom => roms/multiboot}/multiboot.S |    0
 {pc-bios/optionrom => roms/multiboot}/signrom.sh  |    0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename {pc-bios/optionrom => roms/multiboot}/Makefile (79%)
 rename {pc-bios/optionrom => roms/multiboot}/multiboot.S (100%)
 rename {pc-bios/optionrom => roms/multiboot}/signrom.sh (100%)

diff --git a/configure b/configure
index 8160bed..264cc7b 100755
--- a/configure
+++ b/configure
@@ -1743,7 +1743,7 @@ echo "TOOLS=$tools" >> $config_host_mak
 roms=
 if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
         "$targetos" != "Darwin" ; then
-  roms="pc-bios/optionrom"
+  roms="roms/multiboot"
 fi
 echo "ROMS=$roms" >> $config_host_mak
 
@@ -2111,11 +2111,11 @@ done # for target in $targets
 
 # build tree in object directory if source path is different from current one
 if test "$source_path_used" = "yes" ; then
-    DIRS="tests tests/cris slirp audio block pc-bios/optionrom"
+    DIRS="tests tests/cris slirp audio block roms/multiboot"
     FILES="Makefile tests/Makefile"
     FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
     FILES="$FILES tests/test-mmap.c"
-    FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps pc-bios/video.x"
+    FILES="$FILES roms/multiboot/Makefile pc-bios/keymaps pc-bios/video.x"
     for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb 
$source_path/pc-bios/openbios-*; do
         FILES="$FILES pc-bios/`basename $bios_file`"
     done
diff --git a/pc-bios/optionrom/Makefile b/roms/multiboot/Makefile
similarity index 79%
rename from pc-bios/optionrom/Makefile
rename to roms/multiboot/Makefile
index ace142d..c6b5ca4 100644
--- a/pc-bios/optionrom/Makefile
+++ b/roms/multiboot/Makefile
@@ -3,7 +3,7 @@ all: build-all
 include ../../config-host.mak
 include $(SRC_PATH)/rules.mak
 
-VPATH=$(SRC_PATH)/pc-bios/optionrom
+VPATH=$(SRC_PATH)/roms/multiboot
 
 CPPFLAGS = -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
 CPPFLAGS += -I$(SRC_PATH)
@@ -18,7 +18,7 @@ build-all: multiboot.bin
        $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"  Building 
$(TARGET_DIR)$@")
 
 %.bin: %.raw
-       $(call quiet-command,$(SRC_PATH)/pc-bios/optionrom/signrom.sh $< $@,"  
Signing $(TARGET_DIR)$@")
+       $(call quiet-command,$(SRC_PATH)/roms/multiboot/signrom.sh $< $@,"  
Signing $(TARGET_DIR)$@")
 
 clean:
        $(RM) *.o *.img *.bin *~
diff --git a/pc-bios/optionrom/multiboot.S b/roms/multiboot/multiboot.S
similarity index 100%
rename from pc-bios/optionrom/multiboot.S
rename to roms/multiboot/multiboot.S
diff --git a/pc-bios/optionrom/signrom.sh b/roms/multiboot/signrom.sh
similarity index 100%
rename from pc-bios/optionrom/signrom.sh
rename to roms/multiboot/signrom.sh
-- 
1.6.2.5