X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=HDL_workflow.mdwn;h=8e3472ffa19d44f09e8a02bb966384a27dc95dd7;hb=b2a917b33ec26d7178bdf4b85e518a6bbafc3d95;hp=12df9b5210c41a4a8bf3f716d2d24a6e897ec5b7;hpb=2e4797ddd674b3df95320a4bb010bc2834b02308;p=libreriscv.git

diff --git a/HDL_workflow.mdwn b/HDL_workflow.mdwn
index 12df9b521..8e3472ffa 100644
--- a/HDL_workflow.mdwn
+++ b/HDL_workflow.mdwn
@@ -341,12 +341,13 @@ relevant unit tests pass 100%.  This ensures that people's work does not
 get "lost" or isolated and out of touch due to major branch diversion,
 and that people communicate and coordinate with each other.
 
-This is not a hard rule: under special cirmstances branches can be useful.
+This is not a hard rule: under special circumstances branches can be useful.
 They should not however be considered "routine".
 
-For advice on commit messages see
-[here](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
-and [here](https://github.com/torvalds/subsurface-for-dirk/blob/master/README.md#contributing)).
+For guidance on when branches are appropriate,
+see [[HDL_workflow/libresoc_bug_process]].
+
+For advice on commit messages see the Coding section further down on this page.
 
 ## yosys
 
@@ -757,6 +758,35 @@ out punishment".
 
 for actual code development
 
+### Copyright Notices
+
+**All code must have copyright and grant notices (where work was done
+under budget).**
+
+* [Example from soc.git repo](https://git.libre-soc.org/?p=soc.git;a=blob;f=src/soc/fu/div/experiment/goldschmidt_div_sqrt.py;h=3f7c2480742d6913859461da120099385f99d18a;hb=HEAD)
+
+Breakdown of the header in the above example:
+
+- Code was worked on by Jacob Lifshay during 2022.
+- Work was done under LibreSOC's Crypto Router
+[grant](https://libre-soc.org/nlnet_2021_crypto_router/) submitted to NLnet.
+NLnet grant code is `2021-02-052`.
+- The NLnet grant was under the
+[NLnet Assure fund](https://nlnet.nl/assure).
+- Financial support for NGI Assure comes from European Commission's
+[Next Generation Internet](https://ngi.eu/) Programme,
+grant agreement no. 957073.
+
+Template:
+
+```
+# SPDX-License-Identifier: LGPL-3-or-later
+# Copyright 202X [Name] [email]
+#
+# Funded by NLnet [Programme Name] Programme [202X-YY-ZZZ], [NLnet URL] part
+# of [EU Programme Name] 202X EU Programme [Programme Number].
+```
+
 ### Plan unit tests
 
 * plan in advance to write not just code but a full test suite for
@@ -866,13 +896,19 @@ You can avoid damaging the repositories by following some simple procedures:
 
 ### *Git commit message format*
 
-* Based on [bug #1126#c40](https://bugs.libre-soc.org/show_bug.cgi?id=1126#c40)
+* Additional articles on commit messages
+[here](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+and
+[here](https://github.com/torvalds/subsurface-for-dirk/blob/master/README.md#contributing)
+
+LibreSOC message format based on description given in
+[bug #1126#c40](https://bugs.libre-soc.org/show_bug.cgi?id=1126#c40):
 
 1. Every commit MUST start with a short title, up to 50 characters.
 2. The commit title MUST contain either subsystem, or a file path,
 or a subsystem/path, or a subsystem/subsubsystem combination, which got
 modified or introduced, and a short summary. These parts must be separated
-by the semicolon.
+by the colon.
 3. A good rule is to imagine that the short message begins with
 "if this patch is applied, it will". For example, a good title is
 "X: update Y", not "updated Y in X".
@@ -1268,6 +1304,11 @@ to me, because my background is in hardware not software engineering.
 
 # Task management guidelines
 
+* New guide for RfP submission (in-progress):
+[[HDL_workflow/rfp_submission_guide]]
+
+(This section needs to be compared with [[HDL_workflow/libresoc_bug_process]])
+
 1. Create the task in appropriate "Product" section with appropriate
   "Component" section. Most code tasks generally use "Libre-SOC's
   first SOC".