From nobody Thu Aug 11 16:27:49 2022 X-Original-To: dev-commits-src-all@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 4M3XKL1Xzqz4YsBq; Thu, 11 Aug 2022 16:27:50 +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 4M3XKL16Jvz3qNT; Thu, 11 Aug 2022 16:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235270; 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=Md3gPorRbYMD8f6ogaSLEZ+3tqPwmvYJJ89BgfDQxlE=; b=VqAC0G+i85CRmxDsaeBuw6rsisCdVl+y2Nipn6D7uWaUhRa69Jv7X0awSryNsR6lbV07ef LU2evYjWidYxjKsTYHmvn+kE9PATavILzCgYwMP4XHt/sYGRflvPcaam5k+gSyl8SeyMv+ gDGq9Igu6hfq5JOJmUuu8zmZBCcDEelTqfvOles7n2clBR9dc5m4gTynz7HU39iL4MF/Gq S48Ta5JEIAZIDFGb/xixe9l+yJX6RgBnWEY8MZWDW7chIAjTtIBnk4y6chmGCi3gaBKXdn 5nuzozbbhuUl+/wIeh5QVJ8I2YAXWrHYmByIfiSD6WvocJgJrYT3tFiaBJxong== 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 4M3XKL0DLBzyCD; Thu, 11 Aug 2022 16:27:50 +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 27BGRnVP055556; Thu, 11 Aug 2022 16:27:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BGRnMt055555; Thu, 11 Aug 2022 16:27:49 GMT (envelope-from git) Date: Thu, 11 Aug 2022 16:27:49 GMT Message-Id: <202208111627.27BGRnMt055555@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: add8154e451f - main - stand: uboot_fmtdev can be reduced to devformat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: add8154e451f441778fb9c2fb7d10d281dea9611 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235270; 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=Md3gPorRbYMD8f6ogaSLEZ+3tqPwmvYJJ89BgfDQxlE=; b=URa4t1V2sVOu3T11ax0T0aUu6hULGq0hQrmzdLQR+bi9PcSNF+M2WBOYdhq00cHcrjjw3y Qc/OIINA90a3uYxyy5AyGhq0j+PVgvjAA/cOn/TPWPQ+3tCDYtMQZ0yJT7wjpwkiP9V4gE FbiUpnt+t/uTD0Pvp3YPQ0v8Mkv4BPksNQLmHgowa6+ECrlqqmURrB5VprX572IGXMQ33I U6rRT7gme86NRdS0vvHNVLz3huJ/hzft0DaQ4vmdvkGDZICOi+Ha8s8pJSIB7BaTkQapj3 9amjx7kaJPW4t0UVE5nNUWznruCz0dvLKXcJKiVsFjhOs6wl9qUIv5x821EnYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660235270; a=rsa-sha256; cv=none; b=jRW2UKM4njEMy78Pd2wvdpD6koZ8aoU8XSh0jdvDu6+cfhsaMbpv91NdWgT27lIY5AOjt+ b9Y0oRv/riiLR5YadJhBp5IHqM9ih2Zh5kFyK7GDgiOmcOgdKhQ/lIZTpAdQkohnYhO1MV ZHE0H81l1WG34KGM2a3pjUFk4g+s0ppPdd26zwpa63Ipa3z/VbqzjXZwHT0Td/gqdy6mZ5 IcpoqCZsiIDMZHPcFn1NQ9yRAQTaYqVyKMMkOCxnjiWJLkznbAPHc/WQ291u6kBSfgfWVP enzeH0HU4lUS9iqF4+wVWum6wHnNkuZHy87WW0IEmHADZop4NVcSEPN82iZiQQ== 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=add8154e451f441778fb9c2fb7d10d281dea9611 commit add8154e451f441778fb9c2fb7d10d281dea9611 Author: Warner Losh AuthorDate: 2022-08-11 15:08:52 +0000 Commit: Warner Losh CommitDate: 2022-08-11 16:27:17 +0000 stand: uboot_fmtdev can be reduced to devformat devformat produces the same output as uboot_fmtdev, so just use it to reduce on the dependencies. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35926 --- stand/uboot/devicename.c | 23 ----------------------- stand/uboot/libuboot.h | 1 - stand/uboot/main.c | 2 +- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/stand/uboot/devicename.c b/stand/uboot/devicename.c index b6b0e6e40639..b73a7694f14a 100644 --- a/stand/uboot/devicename.c +++ b/stand/uboot/devicename.c @@ -160,29 +160,6 @@ fail: } -char * -uboot_fmtdev(void *vdev) -{ - struct uboot_devdesc *dev = (struct uboot_devdesc *)vdev; - static char buf[128]; - - switch(dev->dd.d_dev->dv_type) { - case DEVT_NONE: - strcpy(buf, "(no device)"); - break; - - case DEVT_DISK: -#ifdef LOADER_DISK_SUPPORT - return (disk_fmtdev(vdev)); -#endif - - case DEVT_NET: - sprintf(buf, "%s%d:", dev->dd.d_dev->dv_name, dev->dd.d_unit); - break; - } - return(buf); -} - /* * Set currdev to suit the value being supplied in (value). */ diff --git a/stand/uboot/libuboot.h b/stand/uboot/libuboot.h index 18a12c216d7e..b9039bcf7fdf 100644 --- a/stand/uboot/libuboot.h +++ b/stand/uboot/libuboot.h @@ -50,7 +50,6 @@ struct uboot_devdesc { #endif int uboot_getdev(void **vdev, const char *devspec, const char **path); -char *uboot_fmtdev(void *vdev); int uboot_setcurrdev(struct env_var *ev, int flags, const void *value); extern int devs_no; diff --git a/stand/uboot/main.c b/stand/uboot/main.c index 6648dc607c11..573995663fe4 100644 --- a/stand/uboot/main.c +++ b/stand/uboot/main.c @@ -533,7 +533,7 @@ main(int argc, char **argv) return (0xbadef1ce); } - ldev = uboot_fmtdev(&currdev); + ldev = devformat(&currdev.dd); env_setenv("currdev", EV_VOLATILE, ldev, uboot_setcurrdev, env_nounset); env_setenv("loaddev", EV_VOLATILE, ldev, env_noset, env_nounset); printf("Booting from %s\n", ldev);