From nobody Tue Dec 5 19:30:48 2023 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 4Sl9cS2VkCz53Mdx; Tue, 5 Dec 2023 19:30:48 +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 4Sl9cS238hz4HsP; Tue, 5 Dec 2023 19:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804648; 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=dmernacJYMASDCi+cayC+hccwCZtkV3UWGGKu8fbosQ=; b=Z/aHxPekXxOlrXuTcayoam46DT5TxR21KIXaHv1ScWiqI5wMLSaVVCXr376CGWChVTiUHK ozk1baay5NCXkKghLzOLtUGTruPUjnqusvA9/pzcUlfP04r1Xcrnz0KK33OP3av3+6YjS0 DoyvlsPRWyC+cieV9c1dZ//ZGMHWkaan+c7zZ5wUFdu2mnh5FfUQKHeaGAPNGSvebSH0cc E13P8M+glWznoFa6hogEZGWPRsVz+dYP8Fj73GhbPdeTP0MIknH0GLeTr0tyHEBSS1Q6oj wxevDrDt50/OBom5thbTu0iFbfX5VLuB1xJ9ZrUZau/wPkvAwhQAWpzdBmzJ/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701804648; a=rsa-sha256; cv=none; b=K7ZJvSwOoGIfW60i9JXtgF22IeVlyZ1VwRQEMLiQySCcRvVzHFY1mFTHbuTJA3Zi4aIgHn 93slct7N6t6z21pp8k4JRHmqYkh6vVSqbujDc/LxAUPUA05Ad1om3ZkHKOYF+swXltQ27Y ieI2U+e5TMX35tzm/OQk6Lmt9KNzS9K4apInmniTsT2Es3GsdqOYufKDScwFRaJZzcrlEe ElioAERPH+nxdRYi0tX9/5eIaabs8K3UUNA84MkMbJU+eiujZBz4ZTx9Buy95z7EofGnLi ARZaj4jgtT8lHE7IhJRHVmdj9BmMYTuJphnLkuRYnvLAdzAfghQ4gEaW1BMMmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701804648; 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=dmernacJYMASDCi+cayC+hccwCZtkV3UWGGKu8fbosQ=; b=U0iHZiir1UGOuni23nazhAEWfNd6gzCm7pASMIsExFUpH05D9SpTkMW9XqkHJlS+Gm6My2 dWzhmEaUOxjWht/5/SL7SGCgUldSwi5b5ODUj+DpNW0hBA6FXZhRNdOkB96B1mI71GpiE6 9z01uVolTQf1UkC6sXKMnqUm1ETf2oq/n8cSnh60j9sSuM/gBxWZs5qIYxUPj3Gaviylnh JGCDBfpjxLQLlHuUTl8/JrUS4eORHhSZYEXb6bjI8/DARWJ9yNOrHQpIdomtA3uYqT0LL7 LIdGD6aswSm9hQ7RoOPWlZUJjxGI3CFONND6iwOmNLsVr03qn+k4Fz0wkxipyQ== 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 4Sl9cS17Fyz7fb; Tue, 5 Dec 2023 19:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5JUml5020439; Tue, 5 Dec 2023 19:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5JUml5020436; Tue, 5 Dec 2023 19:30:48 GMT (envelope-from git) Date: Tue, 5 Dec 2023 19:30:48 GMT Message-Id: <202312051930.3B5JUml5020436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: bd79cafe70c8 - main - riscv: tweak SoC-specific conf organization 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd79cafe70c8ce510110ba6488b0705bfddfdd33 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bd79cafe70c8ce510110ba6488b0705bfddfdd33 commit bd79cafe70c8ce510110ba6488b0705bfddfdd33 Author: Mitchell Horne AuthorDate: 2023-12-05 19:28:59 +0000 Commit: Mitchell Horne CommitDate: 2023-12-05 19:30:18 +0000 riscv: tweak SoC-specific conf organization Hide some lines from the main GENERIC files by mimicking arm64's model. I do not have any intention of creating a std.riscv or SIFIVE configuration file at this time. Reviewed by: jrtc27 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42910 --- sys/riscv/conf/GENERIC | 18 +++--------------- sys/riscv/conf/std.allwinner | 7 +++++++ sys/riscv/conf/std.sifive | 15 +++++++++++++++ sys/riscv/sifive/std.sifive | 2 -- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index fd871315b27e..6fcb3f1a78b7 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -142,11 +142,9 @@ device vt device kbdmux # RTC -device da9063_rtc # Dialog Semiconductor DA9063 RTC device goldfish_rtc # QEMU RTC # Ethernet drivers -device cgem # Cadence GEM Gigabit Ethernet device device miibus # MII bus support device xae # Xilinx AXI Ethernet MAC @@ -161,9 +159,6 @@ device gpio device spibus device spigen -# Power management controllers -device da9063_pmic # Dialog Semiconductor DA9063 PMIC - # Uncomment for memory disk # options MD_ROOT # options MD_ROOT_SIZE=32768 # 32MB ram disk @@ -209,18 +204,11 @@ device bpf # Berkeley packet filter # Flattened Device Tree options FDT -makeoptions MODULES_EXTRA+="dtb/sifive" # I2C support device iicbus # Bus support, required for iicoc below. device iicoc # OpenCores I2C controller support -# Allwinner device drivers -device aw_wdog # Allwinner Watchdog -files "../allwinner/files.allwinner" - -# SiFive device drivers -device fu740_pci_dw -device sifive_gpio -device sifive_spi -include "../sifive/std.sifive" +# Include SoC specific configuration +include "std.allwinner" +include "std.sifive" diff --git a/sys/riscv/conf/std.allwinner b/sys/riscv/conf/std.allwinner new file mode 100644 index 000000000000..a781164d0632 --- /dev/null +++ b/sys/riscv/conf/std.allwinner @@ -0,0 +1,7 @@ +# +# Allwinner SoC support +# + +device aw_wdog # Allwinner Watchdog + +files "../allwinner/files.allwinner" diff --git a/sys/riscv/conf/std.sifive b/sys/riscv/conf/std.sifive new file mode 100644 index 000000000000..ab20b235c44c --- /dev/null +++ b/sys/riscv/conf/std.sifive @@ -0,0 +1,15 @@ +# +# SiFive SoC support +# + +device cgem # Cadence GEM Gigabit Ethernet device +device da9063_pmic # Dialog Semiconductor DA9063 PMIC +device da9063_rtc # Dialog Semiconductor DA9063 RTC +device fu740_pci_dw +device sifive_gpio +device sifive_spi + +# DTBs +makeoptions MODULES_EXTRA+="dtb/sifive" + +files "../sifive/files.sifive" diff --git a/sys/riscv/sifive/std.sifive b/sys/riscv/sifive/std.sifive deleted file mode 100644 index 261085d98cff..000000000000 --- a/sys/riscv/sifive/std.sifive +++ /dev/null @@ -1,2 +0,0 @@ - -files "../sifive/files.sifive"