From patchwork Mon Sep 19 19:08:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 671916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sdFnn4GbMz9s5g for ; Tue, 20 Sep 2016 05:10:05 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sdFnm5jVfzDsfX for ; Tue, 20 Sep 2016 05:10:04 +1000 (AEST) X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sdFmF4XBZzDsfZ for ; Tue, 20 Sep 2016 05:08:45 +1000 (AEST) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A5EABC05A284; Mon, 19 Sep 2016 19:08:43 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-20.ams2.redhat.com [10.36.116.20]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8JJ8Wpb021894; Mon, 19 Sep 2016 15:08:42 -0400 From: Thomas Huth To: slof@lists.ozlabs.org Date: Mon, 19 Sep 2016 21:08:29 +0200 Message-Id: <1474312112-27835-8-git-send-email-thuth@redhat.com> In-Reply-To: <1474312112-27835-1-git-send-email-thuth@redhat.com> References: <1474312112-27835-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 19 Sep 2016 19:08:43 +0000 (UTC) Subject: [SLOF] [PATCH v2 07/10] Do not link libnet to net-snk anymore, and remove net-snk from board-qemu X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" Since libnet is now linked to Paflof directly, we do not have to link it into net-snk anymore. So for board-qemu, we can now even exclude net-snk completely from the build (for board-js2x, it is still required for the biosemu, so we can not erase the net-snk folder completely yet). Signed-off-by: Thomas Huth --- board-qemu/Makefile | 2 +- board-qemu/romfs/boot_rom.ffs | 1 - clients/net-snk/Makefile | 2 +- clients/net-snk/app/Makefile | 2 +- clients/net-snk/app/main.c | 5 ----- lib/libnet/Makefile | 3 +-- lib/libnet/netload.c | 2 +- 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/board-qemu/Makefile b/board-qemu/Makefile index 78639cc..7208fcc 100644 --- a/board-qemu/Makefile +++ b/board-qemu/Makefile @@ -10,7 +10,7 @@ # * IBM Corporation - initial implementation # ****************************************************************************/ -BOARD_TARGETS = tools_build romfs_build clients_build stage1 subdirs +BOARD_TARGETS = tools_build romfs_build stage1 subdirs SUBDIRS = slof diff --git a/board-qemu/romfs/boot_rom.ffs b/board-qemu/romfs/boot_rom.ffs index 3cdb7d3..0248115 100644 --- a/board-qemu/romfs/boot_rom.ffs +++ b/board-qemu/romfs/boot_rom.ffs @@ -17,4 +17,3 @@ stage1 board-qemu/llfw/stage1.bin 1 0x100 xvect slof/xvect.bin 0 0 ofw_main board-qemu/slof/paflof 0 0 bootinfo board-qemu/llfw/Cboot.bin 0 0 -snk clients/net-snk.client 0 0 diff --git a/clients/net-snk/Makefile b/clients/net-snk/Makefile index 1cab7ae..c0bb73a 100644 --- a/clients/net-snk/Makefile +++ b/clients/net-snk/Makefile @@ -17,7 +17,7 @@ include $(TOP)/make.rules OBJS = kernel/kernel.o oflib/oflib.o libc/libc-glue.o app/app.o .PHONY : subdirs clean depend mrproper -CLIENTLIBS = $(LIBCMNDIR)/libelf.a $(LIBCMNDIR)/libnet.a $(LIBCMNDIR)/libc.a +CLIENTLIBS = $(LIBCMNDIR)/libelf.a $(LIBCMNDIR)/libc.a all: .depend subdirs $(MAKE) client diff --git a/clients/net-snk/app/Makefile b/clients/net-snk/app/Makefile index 52d446c..2da02b9 100644 --- a/clients/net-snk/app/Makefile +++ b/clients/net-snk/app/Makefile @@ -16,7 +16,7 @@ export TOP endif include $(TOP)/make.rules -CFLAGS +=$(ADDCFLAGS) -I$(LIBCMNDIR)/libnet +CFLAGS +=$(ADDCFLAGS) OBJS = main.o diff --git a/clients/net-snk/app/main.c b/clients/net-snk/app/main.c index 22aeba7..17c16b6 100644 --- a/clients/net-snk/app/main.c +++ b/clients/net-snk/app/main.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #ifdef SNK_BIOSEMU_APPS @@ -31,10 +30,6 @@ main(int argc, char *argv[]) int i; of_set_callback((void *) &_callback_entry); - if (strcmp(argv[0], "netboot") == 0 && argc >= 5) - return netboot(argc, argv); - if (strcmp(argv[0], "ping") == 0) - return ping(argc, argv); #ifdef SNK_BIOSEMU_APPS // BIOS Emulator applications if (strcmp(argv[0], "biosemu") == 0) diff --git a/lib/libnet/Makefile b/lib/libnet/Makefile index 2c9b7c2..83ac1e5 100644 --- a/lib/libnet/Makefile +++ b/lib/libnet/Makefile @@ -16,8 +16,7 @@ ifndef TOP endif include $(TOP)/make.rules -CFLAGS += -I. -I.. -I../libc/include -CFLAGS += -I../../clients/net-snk/app/netapps -I../../clients/net-snk/include +CFLAGS += -I. -I.. -I../libc/include -I$(TOP)/include SRCS = ethernet.c ipv4.c udp.c tcp.c dns.c bootp.c dhcp.c tftp.c \ ipv6.c dhcpv6.c icmpv6.c ndp.c netload.c ping.c args.c diff --git a/lib/libnet/netload.c b/lib/libnet/netload.c index 1b7c1bc..6429405 100644 --- a/lib/libnet/netload.c +++ b/lib/libnet/netload.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "args.h" #include "netapps.h"