From nobody Tue Jan 24 22:10:17 2023 X-Original-To: dev-commits-src-branches@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 4P1h3t54lTz3bdv9; Tue, 24 Jan 2023 22:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h3t18vCz4JXY; Tue, 24 Jan 2023 22:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jeSyizR8JL9oSMljU/GTPRvx6IFiZ1iPUpqWVBtP7gY=; b=LwjaKNSIonFF6tnvsG7piBQiYHzGyEQhhSsHhaYUM+i3Oh5h/ws19m7/soW0W9lfPGZA8Y SqKE/yKeTM8prNzlU+qTiwk7L49cA2gOb0b4Cnh5gmU7G+cex0/TQrU/jnAC9UPqgO0t1y /G8Z1STz0o2AjFnnckLFTpI1QqDja7UIXmmUnva8n4auheeW5qr6sUZngeBE64xfqpbN0X EZrSkhHDfG/8rZGmP5oBAiLegRJs/WOOeXcEJIOh4k/ZMz9xGz78VSNFpy53O/r+T5hTzP lOqSO7pO9w1NLGCElBCJk23gmUePo8F/l2DYtCTdXLTABcW6EbTwZiaTqgxaDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jeSyizR8JL9oSMljU/GTPRvx6IFiZ1iPUpqWVBtP7gY=; b=hRJNst7MvUyKLRqHOPfoLO/3mFNlbNIwI9BWVrzCDR5jV6PBVn3LW0mfxMZ/TIsDBOQGr+ ghTfq83aow19R2MbLO9tXhOoZtTd0k5lfqrmtgbtJtAhHWhyd33yuOjyxSSgfavOdt/EzT XlAiAC7nvGX6LuyUxTXFMADA2vl6s2C/wATywvTtMqnrUuqFCIus/v7vawacyHwsv4oWbW fCElATLbzEZCdJYT3/4SKFxWfkvRwsMPX1qoRZl6a2I0BBnPbcDXBl3JHtdZI9vwL3nvQ2 suu0viUyeKwCEBCzxK5yhU1MQ/RQyudNSJeeAgPBx7hjL9JDUZvD290aHf2+rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598218; a=rsa-sha256; cv=none; b=uiPnpany6t5b23iHs7NYObkr1qokGRd1Rf5IZ3i9OjstBPecnoaGxv+/nruAP4086oTeH1 y5OVQqjfq9aRBMj1Pbjjm0SJt3RVfPzRqev/o3DDO7By3Z1QTQS0j1CBAtpO8lEpRnr91Z 41zlpGgFH/Qu4pmIRkHppfCh5R+OhNDntipwBNCMim6dip/+UPDT0PKnrNslsKmlmyspbV WElPWJBK589sr805fv4EAHCxoTiacEUc5qsMzsfo8vNXaK8bMYSQ4isgERnsiVvb2w+KxT d8KvQKsJzOBjpycX2On2EGlzLHgyFf1xJ3mAARGd5JGh1WC+Jxd9gjABhkhRtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h3t0FBSzQWc; Tue, 24 Jan 2023 22:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMAHDB079848; Tue, 24 Jan 2023 22:10:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAHnJ079847; Tue, 24 Jan 2023 22:10:17 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:17 GMT Message-Id: <202301242210.30OMAHnJ079847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8eba35cfe13f - stable/13 - stand/uboot: Fix building of ubldr.bin List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8eba35cfe13f9e7d95aced51696afdd1fe2d57d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8eba35cfe13f9e7d95aced51696afdd1fe2d57d9 commit 8eba35cfe13f9e7d95aced51696afdd1fe2d57d9 Author: Warner Losh AuthorDate: 2022-02-07 20:14:48 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:20 +0000 stand/uboot: Fix building of ubldr.bin Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D34189 (cherry picked from commit 27e64c99e4d61fc16e11fc9416553a54c1628a84) --- stand/uboot/Makefile | 9 +++++++-- stand/uboot/arch/powerpc/Makefile.inc | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index aed2121bd507..052c9615bfc2 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -15,9 +15,9 @@ LOADER_DISK_SUPPORT?= yes .include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" -.if ${MK_PIE} == "yes" +LOADER_UBLDR_BIN?= yes +.if ${LOADER_UBLDR_BIN} != "no" FILES+= ubldr ubldr.bin -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .else PROG= ubldr .endif @@ -75,6 +75,11 @@ CFLAGS+= -I${FDTSRC} CFLAGS+= -DDISK_DEBUG .endif +.if ${LOADER_UBLDR_BIN} != "no" +OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +ubldr ubldr.bin ubldr.pie: ${OBJS} +.endif + DPADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA} diff --git a/stand/uboot/arch/powerpc/Makefile.inc b/stand/uboot/arch/powerpc/Makefile.inc index 01c7a0c6ac8c..226cfc2f7369 100644 --- a/stand/uboot/arch/powerpc/Makefile.inc +++ b/stand/uboot/arch/powerpc/Makefile.inc @@ -3,4 +3,4 @@ SRCS+= start.S conf.c ppc64_elf_freebsd.c .PATH: ${SYSDIR}/libkern SRCS+= ucmpdi2.c -MK_PIE= no +LOADER_UBLDR_BIN= no