From 4b8ea25a863922024cb2562a221b1b4b9a23a82e Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Tue, 15 Feb 2022 09:22:51 -0800 Subject: [PATCH] Update .md's [ci skip] --- CONTRIBUTING.md | 6 +++--- README.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1f523835..40dfb4fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,6 +3,6 @@ Contributing to Chipyard ### Branch management: -1) github:com/ucb-bar/chipyard: master = stable release. All merges to master must go through PR. -2) github:com/ucb-bar/chipyard: dev = pre-release non-stable branch with latest features. All merges to dev must go through PR. -3) Other dependencies pointed at by Chipyard (e.g. firesim, boom): master should be the version submoduled in ucb-bar/chipyard master. +1) github:com/ucb-bar/chipyard: main = pre-release non-stable branch with latest features. All merges to main must go through PR. +2) github:com/ucb-bar/chipyard: specific tag = official chipyard release. +3) Other dependencies pointed at by Chipyard (e.g. firesim, boom): master/main should be the version submoduled in ucb-bar/chipyard main. diff --git a/README.md b/README.md index b523dfae..1f23c6f5 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ ## Quick Links -* **DOCUMENTATION**: https://chipyard.readthedocs.io/ +* **STABLE DOCUMENTATION**: https://chipyard.readthedocs.io/ * **USER QUESTION FORUM**: https://groups.google.com/forum/#!forum/chipyard * **BUGS AND FEATURE-REQUESTS**: https://github.com/ucb-bar/chipyard/issues ## Using Chipyard -To get started using Chipyard, see the documentation on the Chipyard documentation site: https://chipyard.readthedocs.io/ +To get started using Chipyard, see the stable documentation on the Chipyard documentation site: https://chipyard.readthedocs.io/ ## What is Chipyard @@ -22,7 +22,7 @@ Chipyard is actively developed in the [Berkeley Architecture Research Group][ucb ## Resources -* Chipyard Documentation: https://chipyard.readthedocs.io/ +* Chipyard Stable Documentation: https://chipyard.readthedocs.io/ * Chipyard (x FireSim) Tutorial: https://fires.im/tutorial * Chipyard Basics slides: https://fires.im/micro21-slides-pdf/02_chipyard_basics.pdf * Chipyard Tutorial Exercise slides: https://fires.im/micro21-slides-pdf/03_building_custom_socs.pdf