From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWEAH-0005ep-AH for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWEAC-0005aS-Fk for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:12 -0400 Received: from [199.232.76.173] (port=34445 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWEAB-0005a7-QV for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:07 -0400 Received: from e2.ny.us.ibm.com ([32.97.182.142]:60200) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MWEAA-0003j7-JS for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:06 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e2.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id n6TIeSpZ010885 for ; Wed, 29 Jul 2009 14:40:28 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n6TIk1RK252390 for ; Wed, 29 Jul 2009 14:46:01 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n6TIk1JX011630 for ; Wed, 29 Jul 2009 14:46:01 -0400 From: Anthony Liguori Date: Wed, 29 Jul 2009 13:45:53 -0500 Message-Id: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 1/7] Rename pc-bios/optionrom -> roms/multiboot List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Avi Kivity , Alex Graf We'll be storing all of our rom source code in roms/ Signed-off-by: Anthony Liguori --- 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