From owner-svn-src-head@freebsd.org Tue Sep 12 23:58:39 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF093E25EB8; Tue, 12 Sep 2017 23:58:39 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8A97769C86; Tue, 12 Sep 2017 23:58:39 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8CNwcSA096914; Tue, 12 Sep 2017 23:58:38 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8CNwcPp096912; Tue, 12 Sep 2017 23:58:38 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201709122358.v8CNwcPp096912@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Tue, 12 Sep 2017 23:58:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323512 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: sbruno X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 323512 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Sep 2017 23:58:39 -0000 Author: sbruno Date: Tue Sep 12 23:58:38 2017 New Revision: 323512 URL: https://svnweb.freebsd.org/changeset/base/323512 Log: Leave the Cavium Liquid IO driver exist in files, not files.amd64 Submitted by: imp Modified: head/sys/conf/files head/sys/conf/files.amd64 Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Sep 12 23:46:33 2017 (r323511) +++ head/sys/conf/files Tue Sep 12 23:58:38 2017 (r323512) @@ -2216,6 +2216,62 @@ dev/le/if_le_pci.c optional le pci dev/le/lance.c optional le dev/led/led.c standard dev/lge/if_lge.c optional lge +dev/liquidio/base/cn23xx_pf_device.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/base/lio_console.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/base/lio_ctrl.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/base/lio_device.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/base/lio_droq.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/base/lio_mem_ops.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/base/lio_request_manager.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/base/lio_response_manager.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/lio_core.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/lio_ioctl.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/lio_main.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/lio_rss.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/lio_rxtx.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +dev/liquidio/lio_sysctl.c optional lio \ + compile-with "${NORMAL_C} \ + -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" +lio.c optional lio \ + compile-with "${AWK} -f $S/tools/fw_stub.awk lio_23xx_nic.bin.fw:lio_23xx_nic.bin -mlio_23xx_nic.bin -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "lio.c" +lio_23xx_nic.bin.fw.fwo optional lio \ + dependency "lio_23xx_nic.bin.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "lio_23xx_nic.bin.fw.fwo" +lio_23xx_nic.bin.fw optional lio \ + dependency "$S/contrib/dev/liquidio/lio_23xx_nic.bin.uu" \ + compile-with "${NORMAL_FW}" \ + no-obj no-implicit-rule \ + clean "lio_23xx_nic.bin.fw" dev/lmc/if_lmc.c optional lmc dev/malo/if_malo.c optional malo dev/malo/if_malohal.c optional malo Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Tue Sep 12 23:46:33 2017 (r323511) +++ head/sys/conf/files.amd64 Tue Sep 12 23:58:38 2017 (r323512) @@ -328,62 +328,6 @@ dev/hyperv/vmbus/vmbus_res.c optional hyperv dev/hyperv/vmbus/vmbus_xact.c optional hyperv dev/hyperv/vmbus/amd64/hyperv_machdep.c optional hyperv dev/hyperv/vmbus/amd64/vmbus_vector.S optional hyperv -dev/liquidio/base/cn23xx_pf_device.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/base/lio_console.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/base/lio_ctrl.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/base/lio_device.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/base/lio_droq.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/base/lio_mem_ops.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/base/lio_request_manager.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/base/lio_response_manager.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/lio_core.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/lio_ioctl.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/lio_main.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/lio_rss.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/lio_rxtx.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -dev/liquidio/lio_sysctl.c optional lio \ - compile-with "${NORMAL_C} \ - -I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP" -lio.c optional lio \ - compile-with "${AWK} -f $S/tools/fw_stub.awk lio_23xx_nic.bin.fw:lio_23xx_nic.bin -mlio_23xx_nic.bin -c${.TARGET}" \ - no-implicit-rule before-depend local \ - clean "lio.c" -lio_23xx_nic.bin.fw.fwo optional lio \ - dependency "lio_23xx_nic.bin.fw" \ - compile-with "${NORMAL_FWO}" \ - no-implicit-rule \ - clean "lio_23xx_nic.bin.fw.fwo" -lio_23xx_nic.bin.fw optional lio \ - dependency "$S/contrib/dev/liquidio/lio_23xx_nic.bin.uu" \ - compile-with "${NORMAL_FW}" \ - no-obj no-implicit-rule \ - clean "lio_23xx_nic.bin.fw" dev/nctgpio/nctgpio.c optional nctgpio dev/nfe/if_nfe.c optional nfe pci dev/ntb/if_ntb/if_ntb.c optional if_ntb