Merge branch 'lwip_dev' of ssh://palacios@localhost/home/palacios/palacios into lwip_dev

diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..f172999
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1 @@
+TODO: decide on license, fill me in

diff --git a/RUNNING.LINUX b/RUNNING.LINUX
index ac768b1..b65a73a 100644 (file)
--- a/RUNNING.LINUX
+++ b/RUNNING.LINUX
@@ -16,7 +16,7 @@ the necessary support of AMD SVM virtualization extensions.
 
 If you would like to install qemu, a copy is in the repository:
 
-export DEVROOT=/path/to/your/vmm-dev
+export DEVROOT=/path/to/your/vmm-tools
 
 untar $DEVROOT/utils/qemu-0.9.1.tar.gz and follow instructions for
 building and installing it.  Notice that you can use the --prefix

diff --git a/RUNNING.WINDOWS b/RUNNING.WINDOWS
index 86396a2..b6e5f8d 100644 (file)
--- a/RUNNING.WINDOWS
+++ b/RUNNING.WINDOWS
@@ -17,7 +17,7 @@ the necessary support of AMD SVM virtualization extensions.
 If you would like to install qemu, a copy is in the repository.  
 Here is how to install it. 
 
-export DEVROOT=/path/to/your/vmm-dev
+export DEVROOT=/path/to/your/vmm-tools
 cd $DEVROOT/devtools
 unzip $DEVROOT/utils/Qemu-0.9.1-windows.zip
 export QEMU=$DEVROOT/devtools/Qemu-0.9.1-windows

diff --git a/SETUP.LINUX b/SETUP.LINUX
index 3a40f4e..b1f6d39 100644 (file)
--- a/SETUP.LINUX
+++ b/SETUP.LINUX
@@ -12,9 +12,6 @@ cd $DEVROOT/vmm-hack1/build
 
 export PATH=$PATH:$LOCATION/bin
 
-ln -s ../src/vmboot/rombios/BIOS-bochs-latest rombios
-ln -s ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
-
 make world
 
-This should succeed, leaving you with a vmm.img file.
\ No newline at end of file
+This should succeed, leaving you with a vmm.img file.

diff --git a/SETUP.WINDOWS b/SETUP.WINDOWS
index d97af5a..92bfff8 100644 (file)
--- a/SETUP.WINDOWS
+++ b/SETUP.WINDOWS
@@ -69,9 +69,6 @@ Now test:
 cd $DEVROOT/vmm-hack1/build
 export PATH=$PATH:$LOCATION/bin
 
-ln -s ../src/vmboot/rombios/BIOS-bochs-latest rombios
-ln -s ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
-
 make world
 
 This should succeed, leaving you with a vmm.img file.

diff --git a/misc/test_vm/build/Makefile b/misc/test_vm/build/Makefile
index df39370..786d43a 100644 (file)
--- a/misc/test_vm/build/Makefile
+++ b/misc/test_vm/build/Makefile
@@ -122,7 +122,7 @@ COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o)
 
 # Uncomment if cross compiling
 #TARGET_CC_PREFIX := i386-elf-
-TARGET_CC_PREFIX :=  $(PROJECT_ROOT)/../devtools/i386/bin/i386-elf-
+TARGET_CC_PREFIX :=  $(PROJECT_ROOT)/../../devtools/i386/bin/i386-elf-
 
 # Target C compiler.  gcc 2.95.2 or later should work.
 TARGET_CC := $(TARGET_CC_PREFIX)gcc
@@ -150,7 +150,7 @@ TARGET_NM := $(TARGET_CC_PREFIX)nm
 TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy
 
 # Nasm (http://nasm.sourceforge.net)
-NASM := $(PROJECT_ROOT)/../devtools/bin/nasm
+NASM := $(PROJECT_ROOT)/../../devtools/bin/nasm
 #NASM := /opt/vmm-tools/bin/nasm
 
 AS = as --32

diff --git a/misc/test_vm/build/common/.ignore b/misc/test_vm/build/common/.ignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/misc/test_vm/build/geekos/.ignore b/misc/test_vm/build/geekos/.ignore
new file mode 100644 (file)
index 0000000..e69de29