From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 7 Oct 2008 23:26:05 +0000 (-0500)
Subject: Merge branch '64bit' into 64bit-right
X-Git-Tag: 1.0~3^2~5
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=452885dcf15a56694ba283a079877ac38b545b0f

Merge branch '64bit' into 64bit-right

Conflicts:
	geekos/build/Makefile
	geekos/src/geekos/net.c
---

452885dcf15a56694ba283a079877ac38b545b0f
diff --cc geekos/build/Makefile
index 1877773,0601b6d..210b39a
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@@ -141,14 -141,8 +141,8 @@@ COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=co
  V3_LD_FLAGS := -L./palacios/
  #V3_LIBS := -lxed -lv3vee
  V3_LIBS := ./palacios/libxed.a ./palacios/libv3vee.a ./palacios/libxed.a ./palacios/libv3vee.a
 -
 +V3_OBJS := ./palacios/libxed.a ./palacios/libv3vee.a ./palacios/vm_kernel
  
- 
- 
- 
- 
  ifeq ($(UIP),ON)
  	UIP_C_SRCS := psock.c timer.c uip_arp.c uip.c uip-fw.c uiplib.c uip-neighbor.c uip-split.c resolv.c
  	UIP_C_OBJS := $(UIP_C_SRCS:%.c=net/%.o)
@@@ -158,8 -152,8 +152,13 @@@ els
  endif
  
  ifeq ($(LWIP),ON)
++<<<<<<< HEAD:geekos/build/Makefile
 +	LWIP_OBJS := lwip
 +	CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip  -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG
++=======
+ 	LWIP_OBJS := lwip/*.o
+ 	CC_LWIP_OPTS := -I$(PROJECT_ROOT)/include/lwip  -I$(PROJECT_ROOT)/include/lwip/ipv4 -I$(PROJECT_ROOT)/include/libc -DLWIP_DEBUG -DLWIP
++>>>>>>> 64bit:geekos/build/Makefile
  else
  	LWIP_OBJS := 
  	CC_LWIP_OPTS :=
diff --cc geekos/src/geekos/net.c
index a97de89,9487d69..0716519
--- a/geekos/src/geekos/net.c
+++ b/geekos/src/geekos/net.c
@@@ -69,10 -72,11 +74,13 @@@ void Init_Network() 
  
    //initial a network application
    ping_init();
+ 
+ #endif
+ 
  }
  
 +#endif
 +
  
  #if 0
  void test_network() {