From nobody Mon Feb 07 20:20:03 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 4AEF819AB087; Mon, 7 Feb 2022 20:20:04 +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 4JsyDh0Cbjz4T8W; Mon, 7 Feb 2022 20:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644265204; 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=sAzyXLxLKhJnJOWy0cdpxRaZPEh0CbYYPa7i/8qPT/M=; b=Pt19GHWjufUF1T9m0LA0a+TpMQd4Kvc6O82SM17wVTfjQB/AoI6ZZkt1gkYkXz+yj/3oP6 08brjpEbpq5nn1WP0ZHacT6+zu9NELyHM0jRecxcLTdNxPqbD3uQ6MWYi+/UDsBuzpeTIo SrA75Y7VUBugOrnthCY03Cccm092+KZmrhD8Xt47ZM/19t766pbJzEwMEgU0kuuwI8Maij svAGXGfhlMdnx/QGu/dyWXxNsBk1poYkPPaA4YBh1HphTd6Sgw+hEMxjP/cd67RUIULbI6 gxdj5zo4qdp/mwiAYzCF6hksNcJ4XTOSczpQWQT98tNn+3WzAUN7eNbSUPlrNg== 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 C2A223F7B; Mon, 7 Feb 2022 20:20:03 +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 217KK3Vr000275; Mon, 7 Feb 2022 20:20:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217KK39f000273; Mon, 7 Feb 2022 20:20:03 GMT (envelope-from git) Date: Mon, 7 Feb 2022 20:20:03 GMT Message-Id: <202202072020.217KK39f000273@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: c00673ea1eed - main - nanobsd: Stop copying ubldr 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: c00673ea1eed31cb1fcedd4a105562ddd4545f7c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644265204; 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=sAzyXLxLKhJnJOWy0cdpxRaZPEh0CbYYPa7i/8qPT/M=; b=H3hS/6brgXaONsK2bsR9bGu5IP9tciCioW1ehv3SKkTc9CJNdWzZvDnewCbDd2w5xEU4m0 r49GmK6XE8YPMXWm4nEtEMQ4J7K2Rtk5SGlPJ71cpbmjfPbG9X2q66a+TzNRNRnA16WBbj 5oooPPOcfRD5SEqkODr5TCOePOwaKO3O8/p/Zov2qFEokQbD9VPcvdlBwKsABIOESZYZUu 8EC0xZCrAFvzz7fDzI3/zF0lbx/kEFZKRgWoOMKyUiaoZkiWTUPGnkX08t9gybh8U0TffN GHk91w1me7yAdxiy09iBA82oQxgfqoodzsozlqWSrpwGJSLynh79LZox/JznYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644265204; a=rsa-sha256; cv=none; b=iLEhA6MrYgQVTraNutinIdGZqcSBLdOKVtX40A3z7QNvJhQbYKkCDgs40FZIs5/QagznW8 Ps0wXM/w8vE6eGyj5SgrREbznIHc6d7gz+XXwTxG6RhF20dunY4sTMcNOaLt+e9Jt1DsYs sfAun/cFACVIal7Qs2GFIwxmPf6dbsxqyrYPsSoU5bbIPBU3qGIzZrdKkBv6BO7TAhtxFU RSoItmc6SKS/Q8WJaEXRnerSzcJconAhkGm7Tr0I0d0eBABhGxeqTazO8Y0+MXtbCcr87s tkMVcnBvQ98mtewcvAlutN0KoVJ2BxSZKahNkZUo/F9NWLa2X83DqMJ/VThVhw== 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=c00673ea1eed31cb1fcedd4a105562ddd4545f7c commit c00673ea1eed31cb1fcedd4a105562ddd4545f7c Author: Warner Losh AuthorDate: 2022-02-07 20:15:03 +0000 Commit: Warner Losh CommitDate: 2022-02-07 20:15:03 +0000 nanobsd: Stop copying ubldr manu@ removed support for loading ubldr* from uboot last year. No need to copy them to the image. This may be needed for some 32-bit platforms in theory, but those platforms weren't ever the target for nanobsd that I'm aware of. Should there be platforms where this is used, we can add it to building those platforms. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D34191 --- tools/tools/nanobsd/embedded/common | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 3b8faff5e252..2d60940038a9 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -452,11 +452,6 @@ dos_boot_part ( ) ( chdir $f cp ${d}/* . - # Also copy ubldr. u-boot will load it and it will load the kernel - # from the ufs partition - cp ${NANO_WORLDDIR}/boot/ubldr . - cp ${NANO_WORLDDIR}/boot/ubldr.bin . - # We have to touch the saveenv file touch uEnv.txt