lkl-arm: Enable raspi net_device

libos-nuse · Feb 22, 2019 · b46ddaf · b46ddaf
1 parent 4cc2a7d
commit b46ddaf
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/build.sh b/build.sh
@@ -634,6 +634,7 @@ CC="${BINDIR}/${COMPILER}" \
 	RUMPDIR="${OUTDIR}" \
 	RUMPOBJ="${RUMPOBJ}" \
 	BINDIR="${BINDIR}" \
+	OS="${OS}" \
 	${MAKE} ${STDJ} -C tests
 
 # test for executable stack

diff --git a/franken/init/fdinit.c b/franken/init/fdinit.c
@@ -110,6 +110,23 @@ franken_lkl_load_json_config(int fd)
 struct lkl_config *
 franken_lkl_get_json_config(void)
 {
+	int ret;
+
+	if (json_cfg) {
+	        return json_cfg;
+	}
+
+	json_cfg = (struct lkl_config *)malloc(sizeof(struct lkl_config));
+	if (!json_cfg) {
+	        printf("malloc error\n");
+	        return;
+	}
+	memset(json_cfg, 0, sizeof(struct lkl_config));
+
+	ret = lkl_load_config_env(json_cfg);
+	if (ret < 0) {
+	        return NULL;
+	}
 	return json_cfg;
 }
 #endif

diff --git a/platform/qemu-arm/link.ld b/platform/qemu-arm/link.ld
@@ -48,5 +48,7 @@ SECTIONS
 
 		*(.bss COMMON)
 	}
+	__iomem_start = .;
+	. = . + 0x100000000;
 	__kernel_end = .;
 }
diff --git a/rumpkernel/linux.sh b/rumpkernel/linux.sh
@@ -106,11 +106,11 @@ rumpkernel_build_test()
 	OBJDIR=${RUMPOBJ}/tests
 
 	# XXX qemu-arm still has an issue on pthread_self() during setuid
-	if [ ${OS} != "qemu-arm" ] ;
-	then
+	# if [ ${OS} != "qemu-arm" ] ;
+	# then
 		${MAKE} -C tests/iputils clean
 		CC="${BINDIR}/${COMPILER}" ${MAKE} -C tests/iputils ping ping6
 		cp tests/iputils/ping tests/iputils/ping6 ${OBJDIR}/
 		${MAKE} -C tests/iputils clean
-	fi
+	# fi
 }
diff --git a/tests/Makefile b/tests/Makefile
@@ -10,7 +10,10 @@ CFLAGS+=-g
 
 DEPS=$(LIBDIR)/libc.a
 
-OBJ=$(OBJDIR)/hello $(OBJDIR)/ctor $(OBJDIR)/cat #$(OBJDIR)/hello-pthread
+OBJ=$(OBJDIR)/hello $(OBJDIR)/ctor #$(OBJDIR)/hello-pthread
+ifneq ($(OS),qemu-arm)
+	OBJ+=$(OBJDIR)/cat
+endif
 
 default:		$(OBJ)
 
@@ -23,11 +26,11 @@ run:			$(OBJ)
 			mkfs.ext4 -F disk.img
 			RUMP_VERBOSE=1 ${REXEC} $(OBJDIR)/hello disk.img
 			${REXEC} $(OBJDIR)/ctor disk.img
+ifneq ($(wildcard $(OBJDIR)/cat),)
 			echo frankenlibc | ${REXEC} $(OBJDIR)/cat disk.img
-ifneq ($(wildcard $(OBJDIR)/ping),)
+endif
 			${REXEC} ${OBJDIR}/ping disk.img -- -c 3 127.0.0.1
 			${REXEC} ${OBJDIR}/ping6 disk.img -- -c 3 ::1
-endif
 			rm -f disk.img
 
 $(OBJDIR)/ctor:		ctor.c $(DEPS)