From owner-dev-commits-src-main@freebsd.org Fri Jun 11 20:30:49 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1DF2466480A; Fri, 11 Jun 2021 20:30:49 +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 4G1stJ5XMpz4fTD; Fri, 11 Jun 2021 20:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A22182951D; Fri, 11 Jun 2021 20:30:48 +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 15BKUmgI026043; Fri, 11 Jun 2021 20:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15BKUmu8026042; Fri, 11 Jun 2021 20:30:48 GMT (envelope-from git) Date: Fri, 11 Jun 2021 20:30:48 GMT Message-Id: <202106112030.15BKUmu8026042@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: 7700494d9603 - main - mtk: Add printing of CPU model 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: 7700494d9603605fba5d1e402b3c8c0234d942b1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2021 20:30:49 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7700494d9603605fba5d1e402b3c8c0234d942b1 commit 7700494d9603605fba5d1e402b3c8c0234d942b1 Author: Warner Losh AuthorDate: 2021-06-11 20:13:31 +0000 Commit: Warner Losh CommitDate: 2021-06-11 20:28:54 +0000 mtk: Add printing of CPU model Add the line that's in other foo_machdep.c file where the CPU model is reported. This was part of github pull request 459, but in a different way. The rest of that pull request was either committed or not relevant. I did it in a more correct way. Submitted by: Priit Trees Sponsored by: Netflix --- sys/mips/mediatek/mtk_machdep.c | 1 + sys/mips/mediatek/mtk_soc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/mips/mediatek/mtk_machdep.c b/sys/mips/mediatek/mtk_machdep.c index bfffaee634bd..e4406eacf6a5 100644 --- a/sys/mips/mediatek/mtk_machdep.c +++ b/sys/mips/mediatek/mtk_machdep.c @@ -258,6 +258,7 @@ platform_start(__register_t a0 __unused, __register_t a1 __unused, printf("FDT DTB at: 0x%08x\n", (uint32_t)dtbp); + printf("CPU model: %s\n", cpu_model); printf("CPU clock: %4dMHz\n", mtk_soc_get_cpuclk()/(1000*1000)); printf("Timer clock: %4dMHz\n", timer_clk/(1000*1000)); printf("UART clock: %4dMHz\n\n", mtk_soc_get_uartclk()/(1000*1000)); diff --git a/sys/mips/mediatek/mtk_soc.c b/sys/mips/mediatek/mtk_soc.c index 9fd307a92a67..96ce0bc0f12f 100644 --- a/sys/mips/mediatek/mtk_soc.c +++ b/sys/mips/mediatek/mtk_soc.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include