9a848adf45
The netboot firmware so far simply jumped directly into the OS kernel after the download has been completed. This, however, bears the risk that the virtio-net device still might be active in the background and incoming packets are still placed into the buffers - which could destroy memory of the now-running Linux kernel in case it did not take over the device fast enough. Also the SCLP console is not put into a well-defined state here. We should hand over the system in a clean state when jumping into the kernel, so let's use the same mechanism as it's done in the main s390-ccw firmware and reset the machine with diag308 into a clean state before jumping into the OS kernel code. To be able to share the code with the main s390-ccw firmware, the related functions are now extracted from bootmap.c into a new file called jump2ipl.c. Since we now also set the boot device schid at address 184 for the network boot device, this patch also slightly changes the way how we detect the entry points for non-ELF binary images: The code now looks for the "S390EP" magic first and then jumps to 0x10000 in case it has been found. This is necessary for booting from network devices, since the normal kernel code (where the PSW at ddress 0 points to) tries to do a block load from the boot device. This of course fails for a virtio-net device and causes the kernel to abort with a panic-PSW silently. Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
61 lines
2.1 KiB
Makefile
61 lines
2.1 KiB
Makefile
|
|
SLOF_DIR := $(SRC_PATH)/roms/SLOF
|
|
|
|
NETOBJS := start.o sclp.o virtio.o virtio-net.o jump2ipl.o netmain.o \
|
|
libnet.a libc.a
|
|
|
|
LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
|
|
LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
|
|
|
|
NETLDFLAGS := $(LDFLAGS) -Ttext=0x7800000
|
|
|
|
$(NETOBJS): QEMU_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
|
|
|
|
s390-netboot.elf: $(NETOBJS)
|
|
$(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $(NETOBJS),"BUILD","$(TARGET_DIR)$@")
|
|
|
|
s390-netboot.img: s390-netboot.elf
|
|
$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
|
|
|
|
# libc files:
|
|
|
|
LIBC_CFLAGS := $(QEMU_CFLAGS) $(LIBC_INC) $(LIBNET_INC)
|
|
|
|
CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
|
|
%.o : $(SLOF_DIR)/lib/libc/ctype/%.c
|
|
$(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
|
|
|
|
STRING_OBJS = strcat.o strchr.o strcmp.o strcpy.o strlen.o strncmp.o strncpy.o \
|
|
strstr.o memset.o memcpy.o memmove.o memcmp.o
|
|
%.o : $(SLOF_DIR)/lib/libc/string/%.c
|
|
$(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
|
|
|
|
STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o
|
|
%.o : $(SLOF_DIR)/lib/libc/stdlib/%.c
|
|
$(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
|
|
|
|
STDIO_OBJS = sprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
|
|
printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
|
|
%.o : $(SLOF_DIR)/lib/libc/stdio/%.c
|
|
$(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
|
|
|
|
sbrk.o: $(SLOF_DIR)/slof/sbrk.c
|
|
$(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
|
|
|
|
LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o
|
|
|
|
libc.a: $(LIBCOBJS)
|
|
$(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
|
|
|
|
# libnet files:
|
|
|
|
LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
|
|
dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o
|
|
LIBNETCFLAGS := $(QEMU_CFLAGS) -DDHCPARCH=0x1F $(LIBC_INC) $(LIBNET_INC)
|
|
|
|
%.o : $(SLOF_DIR)/lib/libnet/%.c
|
|
$(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
|
|
|
|
libnet.a: $(LIBNETOBJS)
|
|
$(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
|