Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit de152b9bf8a43a361762bcad3188c6aaffca0a6e

Authored by Igor Grinberg
Committed by Stefano Babic
1 parent 82b54b972b
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

env: clean env_nand.c checkpatch and code style 

Cleanup the env_nand.c checkpatch warnings, errors and coding style.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>

Showing 1 changed file with 46 additions and 53 deletions Side-by-side Diff

... ... @@ -44,10 +44,11 @@
44 44 #if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND)
45 45 #define CMD_SAVEENV
46 46 #elif defined(CONFIG_ENV_OFFSET_REDUND)
47   -#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND
  47 +#error CONFIG_ENV_OFFSET_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND
48 48 #endif
49 49  
50   -#if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE)
  50 +#if defined(CONFIG_ENV_SIZE_REDUND) && \
  51 + (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE)
51 52 #error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
52 53 #endif
53 54  
54 55  
55 56  
56 57  
... ... @@ -57,20 +58,19 @@
57 58  
58 59 char *env_name_spec = "NAND";
59 60  
60   -
61 61 #if defined(ENV_IS_EMBEDDED)
62 62 env_t *env_ptr = &environment;
63 63 #elif defined(CONFIG_NAND_ENV_DST)
64 64 env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST;
65 65 #else /* ! ENV_IS_EMBEDDED */
66   -env_t *env_ptr = 0;
  66 +env_t *env_ptr;
67 67 #endif /* ENV_IS_EMBEDDED */
68 68  
69 69 DECLARE_GLOBAL_DATA_PTR;
70 70  
71   -uchar env_get_char_spec (int index)
  71 +uchar env_get_char_spec(int index)
72 72 {
73   - return ( *((uchar *)(gd->env_addr + index)) );
  73 + return *((uchar *)(gd->env_addr + index));
74 74 }
75 75  
76 76 /*
77 77  
78 78  
79 79  
80 80  
... ... @@ -95,16 +95,14 @@
95 95 env_t *tmp_env2;
96 96  
97 97 tmp_env2 = (env_t *)((ulong)env_ptr + CONFIG_ENV_SIZE);
98   - crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
  98 + crc2_ok = crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc;
99 99 #endif
100   -
101 100 tmp_env1 = env_ptr;
  101 + crc1_ok = crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc;
102 102  
103   - crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
104   -
105 103 if (!crc1_ok && !crc2_ok) {
106   - gd->env_addr = 0;
107   - gd->env_valid = 0;
  104 + gd->env_addr = 0;
  105 + gd->env_valid = 0;
108 106  
109 107 return 0;
110 108 } else if (crc1_ok && !crc2_ok) {
111 109  
112 110  
113 111  
... ... @@ -115,13 +113,13 @@
115 113 gd->env_valid = 2;
116 114 } else {
117 115 /* both ok - check serial */
118   - if(tmp_env1->flags == 255 && tmp_env2->flags == 0)
  116 + if (tmp_env1->flags == 255 && tmp_env2->flags == 0)
119 117 gd->env_valid = 2;
120   - else if(tmp_env2->flags == 255 && tmp_env1->flags == 0)
  118 + else if (tmp_env2->flags == 255 && tmp_env1->flags == 0)
121 119 gd->env_valid = 1;
122   - else if(tmp_env1->flags > tmp_env2->flags)
  120 + else if (tmp_env1->flags > tmp_env2->flags)
123 121 gd->env_valid = 1;
124   - else if(tmp_env2->flags > tmp_env1->flags)
  122 + else if (tmp_env2->flags > tmp_env1->flags)
125 123 gd->env_valid = 2;
126 124 else /* flags are equal - almost impossible */
127 125 gd->env_valid = 1;
128 126  
... ... @@ -137,11 +135,11 @@
137 135 gd->env_addr = (ulong)env_ptr->data;
138 136  
139 137 #else /* ENV_IS_EMBEDDED || CONFIG_NAND_ENV_DST */
140   - gd->env_addr = (ulong)&default_environment[0];
141   - gd->env_valid = 1;
  138 + gd->env_addr = (ulong)&default_environment[0];
  139 + gd->env_valid = 1;
142 140 #endif /* ENV_IS_EMBEDDED || CONFIG_NAND_ENV_DST */
143 141  
144   - return (0);
  142 + return 0;
145 143 }
146 144  
147 145 #ifdef CMD_SAVEENV
... ... @@ -154,7 +152,6 @@
154 152 size_t end = offset + CONFIG_ENV_RANGE;
155 153 size_t amount_saved = 0;
156 154 size_t blocksize, len;
157   -
158 155 u_char *char_ptr;
159 156  
160 157 blocksize = nand_info[0].erasesize;
161 158  
... ... @@ -165,9 +162,9 @@
165 162 offset += blocksize;
166 163 } else {
167 164 char_ptr = &buf[amount_saved];
168   - if (nand_write(&nand_info[0], offset, &len,
169   - char_ptr))
  165 + if (nand_write(&nand_info[0], offset, &len, char_ptr))
170 166 return 1;
  167 +
171 168 offset += blocksize;
172 169 amount_saved += len;
173 170 }
174 171  
175 172  
... ... @@ -201,18 +198,17 @@
201 198 error("Cannot export environment: errno = %d\n", errno);
202 199 return 1;
203 200 }
204   - env_new.crc = crc32(0, env_new.data, ENV_SIZE);
205   - env_new.flags = ++env_flags; /* increase the serial */
  201 + env_new.crc = crc32(0, env_new.data, ENV_SIZE);
  202 + env_new.flags = ++env_flags; /* increase the serial */
206 203  
207   - if(gd->env_valid == 1) {
  204 + if (gd->env_valid == 1) {
208 205 puts("Erasing redundant NAND...\n");
209 206 nand_erase_options.offset = CONFIG_ENV_OFFSET_REDUND;
210 207 if (nand_erase_opts(&nand_info[0], &nand_erase_options))
211 208 return 1;
212 209  
213 210 puts("Writing to redundant NAND... ");
214   - ret = writeenv(CONFIG_ENV_OFFSET_REDUND,
215   - (u_char *)&env_new);
  211 + ret = writeenv(CONFIG_ENV_OFFSET_REDUND, (u_char *)&env_new);
216 212 } else {
217 213 puts("Erasing NAND...\n");
218 214 nand_erase_options.offset = CONFIG_ENV_OFFSET;
... ... @@ -220,8 +216,7 @@
220 216 return 1;
221 217  
222 218 puts("Writing to NAND... ");
223   - ret = writeenv(CONFIG_ENV_OFFSET,
224   - (u_char *)&env_new);
  219 + ret = writeenv(CONFIG_ENV_OFFSET, (u_char *)&env_new);
225 220 }
226 221 if (ret) {
227 222 puts("FAILED!\n");
228 223  
... ... @@ -230,14 +225,14 @@
230 225  
231 226 puts("done\n");
232 227  
233   - gd->env_valid = (gd->env_valid == 2 ? 1 : 2);
  228 + gd->env_valid = gd->env_valid == 2 ? 1 : 2;
234 229  
235 230 return ret;
236 231 }
237 232 #else /* ! CONFIG_ENV_OFFSET_REDUND */
238 233 int saveenv(void)
239 234 {
240   - int ret = 0;
  235 + int ret = 0;
241 236 env_t env_new;
242 237 ssize_t len;
243 238 char *res;
... ... @@ -256,7 +251,7 @@
256 251 error("Cannot export environment: errno = %d\n", errno);
257 252 return 1;
258 253 }
259   - env_new.crc = crc32(0, env_new.data, ENV_SIZE);
  254 + env_new.crc = crc32(0, env_new.data, ENV_SIZE);
260 255  
261 256 puts("Erasing Nand...\n");
262 257 if (nand_erase_opts(&nand_info[0], &nand_erase_options))
263 258  
264 259  
... ... @@ -274,17 +269,17 @@
274 269 #endif /* CONFIG_ENV_OFFSET_REDUND */
275 270 #endif /* CMD_SAVEENV */
276 271  
277   -int readenv(size_t offset, u_char * buf)
  272 +int readenv(size_t offset, u_char *buf)
278 273 {
279 274 size_t end = offset + CONFIG_ENV_RANGE;
280 275 size_t amount_loaded = 0;
281 276 size_t blocksize, len;
282   -
283 277 u_char *char_ptr;
284 278  
285 279 blocksize = nand_info[0].erasesize;
286 280 if (!blocksize)
287 281 return 1;
  282 +
288 283 len = min(blocksize, CONFIG_ENV_SIZE);
289 284  
290 285 while (amount_loaded < CONFIG_ENV_SIZE && offset < end) {
291 286  
292 287  
... ... @@ -292,12 +287,15 @@
292 287 offset += blocksize;
293 288 } else {
294 289 char_ptr = &buf[amount_loaded];
295   - if (nand_read_skip_bad(&nand_info[0], offset, &len, char_ptr))
  290 + if (nand_read_skip_bad(&nand_info[0], offset,
  291 + &len, char_ptr))
296 292 return 1;
  293 +
297 294 offset += blocksize;
298 295 amount_loaded += len;
299 296 }
300 297 }
  298 +
301 299 if (amount_loaded != CONFIG_ENV_SIZE)
302 300 return 1;
303 301  
304 302  
... ... @@ -308,14 +306,14 @@
308 306 int get_nand_env_oob(nand_info_t *nand, unsigned long *result)
309 307 {
310 308 struct mtd_oob_ops ops;
311   - uint32_t oob_buf[ENV_OFFSET_SIZE/sizeof(uint32_t)];
  309 + uint32_t oob_buf[ENV_OFFSET_SIZE / sizeof(uint32_t)];
312 310 int ret;
313 311  
314   - ops.datbuf = NULL;
315   - ops.mode = MTD_OOB_AUTO;
316   - ops.ooboffs = 0;
317   - ops.ooblen = ENV_OFFSET_SIZE;
318   - ops.oobbuf = (void *) oob_buf;
  312 + ops.datbuf = NULL;
  313 + ops.mode = MTD_OOB_AUTO;
  314 + ops.ooboffs = 0;
  315 + ops.ooblen = ENV_OFFSET_SIZE;
  316 + ops.oobbuf = (void *)oob_buf;
319 317  
320 318 ret = nand->read_oob(nand, ENV_OFFSET_SIZE, &ops);
321 319 if (ret) {
322 320  
323 321  
... ... @@ -345,13 +343,10 @@
345 343  
346 344 tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE);
347 345 tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
348   -
349   - if ((tmp_env1 == NULL) || (tmp_env2 == NULL)) {
  346 + if (tmp_env1 == NULL || tmp_env2 == NULL) {
350 347 puts("Can't allocate buffers for environment\n");
351   - free(tmp_env1);
352   - free(tmp_env2);
353 348 set_default_env("!malloc() failed");
354   - return;
  349 + goto done;
355 350 }
356 351  
357 352 if (readenv(CONFIG_ENV_OFFSET, (u_char *) tmp_env1))
358 353  
359 354  
... ... @@ -360,14 +355,12 @@
360 355 if (readenv(CONFIG_ENV_OFFSET_REDUND, (u_char *) tmp_env2))
361 356 puts("No Valid Redundant Environment Area found\n");
362 357  
363   - crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
364   - crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
  358 + crc1_ok = crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc;
  359 + crc2_ok = crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc;
365 360  
366 361 if (!crc1_ok && !crc2_ok) {
367   - free(tmp_env1);
368   - free(tmp_env2);
369 362 set_default_env("!bad CRC");
370   - return;
  363 + goto done;
371 364 } else if (crc1_ok && !crc2_ok) {
372 365 gd->env_valid = 1;
373 366 } else if (!crc1_ok && crc2_ok) {
... ... @@ -384,7 +377,6 @@
384 377 gd->env_valid = 2;
385 378 else /* flags are equal - almost impossible */
386 379 gd->env_valid = 1;
387   -
388 380 }
389 381  
390 382 free(env_ptr);
... ... @@ -397,6 +389,7 @@
397 389 env_flags = ep->flags;
398 390 env_import((char *)ep, 0);
399 391  
  392 +done:
400 393 free(tmp_env1);
401 394 free(tmp_env2);
402 395  
... ... @@ -408,7 +401,7 @@
408 401 * device i.e., nand_dev_desc + 0. This is also the behaviour using
409 402 * the new NAND code.
410 403 */
411   -void env_relocate_spec (void)
  404 +void env_relocate_spec(void)
412 405 {
413 406 #if !defined(ENV_IS_EMBEDDED)
414 407 int ret;