From 0acf8c26bee726f8fc2dd2903a768dbce38f2700 Mon Sep 17 00:00:00 2001
From: lr <1234@qq.com>
Date: Thu, 16 May 2024 21:03:01 +0800
Subject: [PATCH] modify makefile

---
 .../XiZi_AIoT/services/lib/ipc/Makefile       |  2 +-
 Ubiquitous/XiZi_AIoT/services/net/Makefile    |  2 +-
 .../XiZi_AIoT/services/net/libnet/Makefile    |  2 +-
 .../services/net/net_server/Makefile          | 60 ++++++++++++++++++-
 .../services/net/net_server/core/Makefile     |  4 +-
 .../net/net_server/core/ipv4/Makefile         |  2 +-
 .../services/net/net_server/core/sys.c        |  3 +
 .../XiZi_AIoT/services/net/net_server/lwip.mk |  1 +
 8 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile
index 01eb7ec78..fbcfc9073 100644
--- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile
@@ -23,7 +23,7 @@ INC_DIR = 	-I$(KERNEL_ROOT)/services/lib/ipc \
 			-I$(KERNEL_ROOT)/services/app
 
 all: libipc.o session.o
-	@mv $^ ../../app
+	@mv $^ $(KERNEL_ROOT)/services/app
 
 %.o: %.c
 	@echo "cc $^"
diff --git a/Ubiquitous/XiZi_AIoT/services/net/Makefile b/Ubiquitous/XiZi_AIoT/services/net/Makefile
index d2b359025..ee1bebccc 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/Makefile
@@ -1,3 +1,3 @@
-SRC_DIR := net_server libnet
+SRC_DIR := libnet net_server
 
 include $(KERNEL_ROOT)/compiler.mk
diff --git a/Ubiquitous/XiZi_AIoT/services/net/libnet/Makefile b/Ubiquitous/XiZi_AIoT/services/net/libnet/Makefile
index 31c9a0ea8..b676efc52 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/libnet/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/libnet/Makefile
@@ -24,7 +24,7 @@ INC_DIR = 	-I$(KERNEL_ROOT)/services/net/libnet \
 			-I$(KERNEL_ROOT)/services/app
 
 net_server: lwip_service.o
-	@mv $^ ../../app
+	@mv $^ $(KERNEL_ROOT)/services/net/net_server
 
 %.o: %.c
 	@echo "cc $^"
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/Makefile b/Ubiquitous/XiZi_AIoT/services/net/net_server/Makefile
index 090d09f42..62852565b 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/Makefile
@@ -1,7 +1,63 @@
 include $(KERNEL_ROOT)/services/net/net_server/lwip.mk
 
-net_server: lwip_server.o COMPILER
-	@echo "generate $^"
+api = api_lib.o \
+	  api_msg.o \
+	  err.o \
+	  if_api.o \
+	  netbuf.o \
+	  netdb.o \
+	  netifapi.o \
+	  sockets.o \
+	  tcpip.o 
+
+core = altcp_alloc.o \
+	   altcp_tcp.o \
+	   altcp.o \
+	   def.o \
+	   dns.o \
+	   inet_chksum.o \
+	   init.o \
+	   ip.o \
+	   mem.o \
+	   memp.o \
+	   netif.o \
+	   pbuf.o \
+	   raw.o \
+	   stats.o \
+	   sys.o \
+	   tcp_in.o \
+	   tcp_out.o \
+	   tcp.o \
+	   timeouts.o \
+	   udp.o
+
+ipv4 = autoip.o \
+	   dhcp.o \
+	   etharp.o \
+	   icmp.o \
+	   igmp.o \
+	   ip4_addr.o \
+	   ip4_frag.o \
+	   ip4.o 
+
+netif = bridgeif.o \
+        ethernet.o \
+		zepif.o
+
+
+libserial = $(KERNEL_ROOT)/services/app/libserial.o
+printf = $(KERNEL_ROOT)/services/app/printf.o
+libmem = $(KERNEL_ROOT)/services/app/libmem.o
+usyscall = $(KERNEL_ROOT)/services/app/usyscall.o 
+arch_usyscall = $(KERNEL_ROOT)/services/app/arch_usyscall.o
+session = $(KERNEL_ROOT)/services/app/session.o
+libipc = $(KERNEL_ROOT)/services/app/libipc.o
+
+lwip: COMPILER lwip_server.o
+	@${ld} ${user_ldflags} -e main -o $@ ${api} ${core} ${ipv4} ${netif} lwip_service.o lwip_server.o \
+		${board_specs} ${libserial} ${printf} ${libmem} ${usyscall} ${arch_usyscall} ${arch_usyscall} \
+		${session} ${libipc}
+	@${objdump} -S $@ > $@.asm
 
 %.o: %.c
 	@echo "cc $^"
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/Makefile b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/Makefile
index c1e3301aa..4886d0ac4 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/Makefile
@@ -15,14 +15,14 @@ objs += altcp_alloc.o \
 		stats.o \
 		sys.o \
 		tcp_in.o \
-		tcp_out.c \
+		tcp_out.o \
 		tcp.o \
 		timeouts.o \
 		udp.o
 
 core: ${objs} COMPILER
 	@echo "generate $^"
-	@mv $^ $(KERNEL_ROOT)/services/net/net_server
+	@mv ${objs} $(KERNEL_ROOT)/services/net/net_server
 	
 %.o: %.c
 	@echo "cc $^"
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/ipv4/Makefile b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/ipv4/Makefile
index d35005ef2..29ca4a51b 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/ipv4/Makefile
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/ipv4/Makefile
@@ -12,7 +12,7 @@ objs += autoip.o \
 ip4: ${objs}
 	@echo "generate $^"
 	@mv $^ $(KERNEL_ROOT)/services/net/net_server
-
+	
 %.o: %.c
 	@echo "cc $^"
 	@${cc} ${cflags} ${c_useropts} ${INC_DIR} -o $@ -c $^
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/sys.c b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/sys.c
index 5f08352bf..7e73b33a2 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/core/sys.c
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/core/sys.c
@@ -146,3 +146,6 @@ sys_msleep(u32_t ms)
 #endif /* sys_msleep */
 
 #endif /* !NO_SYS */
+u32_t sys_now(void){
+  return 1;
+}
\ No newline at end of file
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk b/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk
index 29fab7380..c77a83f97 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk
@@ -7,6 +7,7 @@ ifeq ($(BOARD), zynq7000-zc702)
 toolchain ?= arm-xilinx-eabi-
 user_ldflags = --start-group,-lgcc,-lc,--end-group
 cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie
+board_specs = stub.o
 #cflags = -Wall -g -std=c11 
 endif
 cc = ${toolchain}gcc