Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 2790bf69dc12fb9aeb9836904e5f57c7f83d5552

Authored by Wolfgang Denk
1 parent 34921d04b8
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Prepare v2012.04 

Also tiny style cleanup to tools/patman/README

Signed-off-by: Wolfgang Denk <wd@denx.de>

Showing 2 changed files with 35 additions and 35 deletions Side-by-side Diff

... ... @@ -24,7 +24,7 @@
24 24 VERSION = 2012
25 25 PATCHLEVEL = 04
26 26 SUBLEVEL =
27   -EXTRAVERSION = -rc3
  27 +EXTRAVERSION =
28 28 ifneq "$(SUBLEVEL)" ""
29 29 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
30 30 else
... ... @@ -10,7 +10,7 @@
10 10 #
11 11 # This program is distributed in the hope that it will be useful,
12 12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
13   -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  13 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 14 # GNU General Public License for more details.
15 15 #
16 16 # You should have received a copy of the GNU General Public License
17 17  
18 18  
19 19  
20 20  
21 21  
22 22  
23 23  
24 24  
25 25  
26 26  
... ... @@ -116,68 +116,68 @@
116 116 commit. Most can only appear once in the whole series.
117 117  
118 118 Series-to: email / alias
119   - Email address / alias to send patch series to (you can add this
120   - multiple times)
  119 + Email address / alias to send patch series to (you can add this
  120 + multiple times)
121 121  
122 122 Series-cc: email / alias, ...
123   - Email address / alias to Cc patch series to (you can add this
124   - multiple times)
  123 + Email address / alias to Cc patch series to (you can add this
  124 + multiple times)
125 125  
126 126 Series-version: n
127   - Sets the version number of this patch series
  127 + Sets the version number of this patch series
128 128  
129 129 Series-prefix: prefix
130   - Sets the subject prefix. Normally empty but it can be RFC for
131   - RFC patches, or RESEND if you are being ignored.
  130 + Sets the subject prefix. Normally empty but it can be RFC for
  131 + RFC patches, or RESEND if you are being ignored.
132 132  
133 133 Cover-letter:
134 134 This is the patch set title
135 135 blah blah
136 136 more blah blah
137 137 END
138   - Sets the cover letter contents for the series. The first line
139   - will become the subject of the cover letter
  138 + Sets the cover letter contents for the series. The first line
  139 + will become the subject of the cover letter
140 140  
141 141 Series-notes:
142 142 blah blah
143 143 blah blah
144 144 more blah blah
145 145 END
146   - Sets some notes for the patch series, which you don't want in
147   - the commit messages, but do want to send, The notes are joined
148   - together and put after the cover letter. Can appear multiple
149   - times.
  146 + Sets some notes for the patch series, which you don't want in
  147 + the commit messages, but do want to send, The notes are joined
  148 + together and put after the cover letter. Can appear multiple
  149 + times.
150 150  
151 151 Signed-off-by: Their Name <email>
152   - A sign-off is added automatically to your patches (this is
153   - probably a bug). If you put this tag in your patches, it will
154   - override the default signoff that patman automatically adds.
  152 + A sign-off is added automatically to your patches (this is
  153 + probably a bug). If you put this tag in your patches, it will
  154 + override the default signoff that patman automatically adds.
155 155  
156 156 Tested-by: Their Name <email>
157 157 Acked-by: Their Name <email>
158   - These indicate that someone has acked or tested your patch.
159   - When you get this reply on the mailing list, you can add this
160   - tag to the relevant commit and the script will include it when
161   - you send out the next version. If 'Tested-by:' is set to
162   - yourself, it will be removed. No one will believe you.
  158 + These indicate that someone has acked or tested your patch.
  159 + When you get this reply on the mailing list, you can add this
  160 + tag to the relevant commit and the script will include it when
  161 + you send out the next version. If 'Tested-by:' is set to
  162 + yourself, it will be removed. No one will believe you.
163 163  
164 164 Series-changes: n
165 165 - Guinea pig moved into its cage
166 166 - Other changes ending with a blank line
167 167 <blank line>
168   - This can appear in any commit. It lists the changes for a
169   - particular version n of that commit. The change list is
170   - created based on this information. Each commit gets its own
171   - change list and also the whole thing is repeated in the cover
172   - letter (where duplicate change lines are merged).
  168 + This can appear in any commit. It lists the changes for a
  169 + particular version n of that commit. The change list is
  170 + created based on this information. Each commit gets its own
  171 + change list and also the whole thing is repeated in the cover
  172 + letter (where duplicate change lines are merged).
173 173  
174   - By adding your change lists into your commits it is easier to
175   - keep track of what happened. When you amend a commit, remember
176   - to update the log there and then, knowing that the script will
177   - do the rest.
  174 + By adding your change lists into your commits it is easier to
  175 + keep track of what happened. When you amend a commit, remember
  176 + to update the log there and then, knowing that the script will
  177 + do the rest.
178 178  
179 179 Cc: Their Name <email>
180   - This copies a single patch to another email address.
  180 + This copies a single patch to another email address.
181 181  
182 182 Various other tags are silently removed, like these Chrome OS and
183 183 Gerrit tags:
... ... @@ -205,7 +205,7 @@
205 205 >>>>
206 206 commit 10212537b85ff9b6e09c82045127522c0f0db981
207 207 Author: Mike Frysinger <vapier@gentoo.org>
208   -Date: Mon Nov 7 23:18:44 2011 -0500
  208 +Date: Mon Nov 7 23:18:44 2011 -0500
209 209  
210 210 x86: arm: add a git mailrc file for maintainers
211 211  
... ... @@ -304,7 +304,7 @@
304 304 Also, the patch on the list that you were waiting for has been merged,
305 305 so you can drop your wip commit. So you resync with upstream:
306 306  
307   - git fetch origin (or whatever upstream is called)
  307 + git fetch origin (or whatever upstream is called)
308 308 git rebase origin/master
309 309  
310 310 and use git rebase -i to edit the commits, dropping the wip one. You add