From nobody Fri Oct 21 20:08:01 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MvFrm32G6z4gg7T; Fri, 21 Oct 2022 20:08:08 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MvFrm2XDjz3RtD; Fri, 21 Oct 2022 20:08:08 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666382888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3rGeVRQFFGKbNa0l1Gzy/mMg+sbOILwf5WcoCye6Jgs=; b=kzv3PHz0jGY8ofnnhuEC2EZjPImZhGDh1Qy/IB9eX8jdcRCiWGHF/kDZfPfCiUpuu5yYng Zzw+MO9AS+EFmQOHimt4kYyX29GLhM8Td873h0m6TajI22gOIjzT0YsKWHoL5/V3ee1owb YGwX18NnlNeK5jSUv8o516wPLGImBt4tGuPzvNb+X29kVLRXTNsVA6ORX1l9Ru/rNNSZfl +YTcIfpqGGtTY9Gp+2XK4sOa/QgkgIYoVRwaCl+kAVws3JndGjmxHCHK/Y40Y/tX6BJ/lr 4aq6x/9E9fcxNXCpdt3XO57wKuURsHGgqX0QYu2Bh9R2XFsQB43P/2aVpwxRYA== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MvFrm0HwmzbWM; Fri, 21 Oct 2022 20:08:08 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id CB6598D4A142; Fri, 21 Oct 2022 20:08:05 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id ED8B45C3A831; Fri, 21 Oct 2022 20:08:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id c_T1zJ5VOxlJ; Fri, 21 Oct 2022 20:08:03 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 60CAC5C3A82F; Fri, 21 Oct 2022 20:08:01 +0000 (UTC) Date: Fri, 21 Oct 2022 20:08:01 +0000 (UTC) From: "Bjoern A. Zeeb" To: Andrew Turner cc: Gleb Smirnoff , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 2782ed8f6cd3 - main - dpaa2: fix standalone module build In-Reply-To: <90B2F15A-3102-4771-BD46-C5304091569C@fubar.geek.nz> Message-ID: <1pr758pp-3640-43ss-451-nqnoqs248s5p@SerrOFQ.bet> References: <202210180540.29I5eNBZ068087@gitrepo.freebsd.org> <8sps479n-9961-rq8o-52op-po77rpo9p377@mnoonqbm.arg> <90B2F15A-3102-4771-BD46-C5304091569C@fubar.geek.nz> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1098556516-637080106-1666382883=:2458" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666382888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3rGeVRQFFGKbNa0l1Gzy/mMg+sbOILwf5WcoCye6Jgs=; b=Q0cr0RRFNtOZXevLGoxEEQhQsZioEvLalXNSpv93i1N5tQD3xmAab8tgpyggH1j9jXPRCa XoRx3A56kvif0mvs8daolKTBBcC+t+aJsUSI02xicxC93ZBKBqaZepmzclnADUrH5KVfj4 4DiyS0jmC+64N/r6eX+ccJd7mHoBE2tfObhcJngMUraiqLbSOtRT2r2FkUO3R4rjId7VkJ a3rKTNuth9e0WwnHvU3ECu4x5XL8Nw5vYQRpcKFyGJPpxIxOZEELvlGSZjNbH0X8wEqqZo +N02Vr2DDuAw3w3ATHrD9lXPPbZvI1dPAwssYjc6G4WZpr81VsLbI/fFfawPGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666382888; a=rsa-sha256; cv=none; b=r0GNvPTTOePs8wgVoX9QRcGwr3xeQbRoz02AYvUmxe/TnktUiCcjyUdDb6lT0OSrLMpJbf f+ZZ52QkMlX+w7ARCkBBW498eavoTsve3hL8sBhZz6sYplF1iCJalRdXU2SGcj9fyyC2xa YsSZY6beqklwuK7tm8WqWgzUF849wk55ie6unlGOMhDJDKKIrUmj9J8SHyeEZysGwE8gEc +0IwRKfgUt87nriakBDfvWopZWlfCcVZQUH8gFijlrGU9p4DwFBYW7/eQKC0mNG5rl32UF PjFqs04ehHcZZg5T0GcYFuyKaId82iY7qzhmI7xHSsx9lzCtzp/Kj1S5c6w8rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-637080106-1666382883=:2458 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Fri, 21 Oct 2022, Andrew Turner wrote: > > >> On 21 Oct 2022, at 16:17, Bjoern A. Zeeb wrote: >> >> On Tue, 18 Oct 2022, Gleb Smirnoff wrote: >> >>> The branch main has been updated by glebius: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=2782ed8f6cd3d7f59219a783bc7fa7bbfb1fe26f >>> >>> commit 2782ed8f6cd3d7f59219a783bc7fa7bbfb1fe26f >>> Author: Gleb Smirnoff >>> AuthorDate: 2022-10-18 05:38:24 +0000 >>> Commit: Gleb Smirnoff >>> CommitDate: 2022-10-18 05:38:24 +0000 >>> >>> dpaa2: fix standalone module build >>> --- >>> sys/modules/dpaa2/Makefile | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/sys/modules/dpaa2/Makefile b/sys/modules/dpaa2/Makefile >>> index 556a1c531669..fa280452bcfa 100644 >>> --- a/sys/modules/dpaa2/Makefile >>> +++ b/sys/modules/dpaa2/Makefile >>> @@ -19,6 +19,8 @@ SRCS+= memac_mdio_common.c memac_mdio_if.c memac_mdio_if.h >>> >>> SRCS+= bus_if.h device_if.h miibus_if.h >>> SRCS+= pcib_if.h pci_if.h >>> +SRCS+= mdio_if.h >> >> What do you need this for? >> >>> +SRCS+= opt_acpi.h opt_platform.h >> >> opt_acpi gets inlcuded lines below and so does opt_platform under the >> respective OPT_ checks. Now they are there twice. > > OPT_ACPI doesn’t exist as a make variable so the ".if !empty(OPT_ACPI)” check won’t work as it is expected to work here so opt_acpi.h won’t be built. The second problem is the opt_*.h files need to be unconditionally created so they can be included in the relevant code. Then they should probably have been removed from under the .ifdefs in the same commit? We do use OPT_ACPI elsewhere in the tree as well.. hwpmc? Can't remember. How's it working there? What is currently then including these files then? Hmm I haven't used the module in a while... Should we duplicate the FDT logic for ACPI in sys/conf/kern.opts.mk so LINT-ACPI can be a better thing long-term as well? -- Bjoern A. Zeeb r15:7 --1098556516-637080106-1666382883=:2458--