From nobody Mon Feb 07 20:20:02 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 D552219AB004; Mon, 7 Feb 2022 20:20:02 +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 4JsyDf5f7Sz4T36; Mon, 7 Feb 2022 20:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644265202; 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=oEx6+/bNIApdUhBB3jgHcpV5DCVW2LT5hWCofeTXY1U=; b=rr+yUpg1V2/+Bn3sVhHJgXkRLcTq4PvuSpnbceZTMTTqN/zY+DrLM1R2oNjEqnTmU01JKu v+9+AY1UdHWN6Idm1nvgX42sgTLbNT1EV7FZspQ35ywM4YWWK3kq2ljEI+ZtzyWhl+X+/F I8id1y7pHroSugNDZ6iNVvGQhVuOfXTZCfP2ZVgvu9h7yBLXYfgL44Go4jTiX2uZh1Tl7r 7Vak1XLZ+A1Lnfc/MgusofeEwxCLJg+Vl9cSaHPOlu8Eti/GiCMgkjI5ag0niU99VE4Gny 1Gx5fyR1qQLrgqydgMhgZl9S5r/dmlk/OYXl8wBNujzVmIB3Sj6pxAj918Hq7g== 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 A239B3F7A; Mon, 7 Feb 2022 20:20:02 +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 217KK2ai099960; Mon, 7 Feb 2022 20:20:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217KK2Yl099957; Mon, 7 Feb 2022 20:20:02 GMT (envelope-from git) Date: Mon, 7 Feb 2022 20:20:02 GMT Message-Id: <202202072020.217KK2Yl099957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 27e64c99e4d6 - main - stand/uboot: Fix building of ubldr.bin 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: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27e64c99e4d61fc16e11fc9416553a54c1628a84 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644265202; 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=oEx6+/bNIApdUhBB3jgHcpV5DCVW2LT5hWCofeTXY1U=; b=o1TUD1byIb+jcqwNtwd8whPKKb/ZGp3jHhk801MVH5lz69VOur0v7Nj0Kk8gvRYzySiALD rOWLww0xyQy7b907/GQ6bgCSlCsm7vHT2LTiBX8H0S1R/gexItuNbJ3nmtqVLYoKgiLGBO cMrMLmw0XKCEINMQkvK/ebs+ab4urFzBtMlNnNR2SMZFgrQPTCByLZYvIKXIDHR3vRkCYM bOdjRL/AR3arz2fGi2wz+gBVYV4WNXVBz95VcIILg6GQN1PsOkmkk5HiJjDNGdRubPyIIA d1fZfrZowOidL6I/Qgi+71F7wzY+v20uCuWkwASLNZCMbe4szzePRMLa0fOsYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644265202; a=rsa-sha256; cv=none; b=QteV72wsOI5EuOYNUFpH8ZDQc7uocPyxb9TGNa+NjTnQL4UHu9AX+2nJ/NW7OFT+v/W45O 1BzoQJ3SjMXo07sLidze5vJdNIwgTV/TUxpfuT/F82e+/JxsgpikMMb6XVw3gv8RwneYAY I4ljmB1bh4le2Oj6eJ6GfWqXFUXxwjLD0nq6JgpbrJL4ofENchh3PZnbClcqJPqNItHPNw hcUjlb7hWg7xLEhn9QFK6DhbBxGzftbiE4fN3wO5vdvZ7JpC52pgqNVzPWeAsNgF/5sUzs ulAXekmHr4f/JLk+QUG27FtMg3z4OVtf2iPhR5oJYv7pznHP0dKm0JWh/mT55A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=27e64c99e4d61fc16e11fc9416553a54c1628a84 commit 27e64c99e4d61fc16e11fc9416553a54c1628a84 Author: Warner Losh AuthorDate: 2022-02-07 20:14:48 +0000 Commit: Warner Losh CommitDate: 2022-02-07 20:14:48 +0000 stand/uboot: Fix building of ubldr.bin Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D34189 --- 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