Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 018f530323b2cc41be05be5b12375d3648f06554

Authored by Simon Glass
Committed by Tom Rini
1 parent 382bee57f1
Exists in smarc_8mq_lf_v2020.04 and in 19 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, 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-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.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

env: Rename common functions related to setenv() 

We are now using an env_ prefix for environment functions. Rename these
commonly used functions, for consistency. Also add function comments in
common.h.

Suggested-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>

Showing 37 changed files with 79 additions and 63 deletions Side-by-side Diff

... ... @@ -663,7 +663,7 @@
663 663 return;
664 664 }
665 665  
666   - setenv_hex("api_address", (unsigned long)sig);
  666 + env_set_hex("api_address", (unsigned long)sig);
667 667 debugf("API sig @ 0x%lX\n", (unsigned long)sig);
668 668 memcpy(sig->magic, API_SIG_MAGIC, 8);
669 669 sig->version = API_SIG_VERSION;
arch/arm/mach-tegra/tegra186/nvtboot_board.c
Diff comments   View file @ 018f530
... ... @@ -15,7 +15,7 @@
15 15 {
16 16 int ret;
17 17  
18   - ret = setenv_hex("fdt_addr", nvtboot_boot_x0);
  18 + ret = env_set_hex("fdt_addr", nvtboot_boot_x0);
19 19 if (ret) {
20 20 printf("Failed to set fdt_addr to point at DTB: %d\n", ret);
21 21 return ret;
arch/arm/mach-uniphier/mmc-first-dev.c
Diff comments   View file @ 018f530
... ... @@ -35,7 +35,7 @@
35 35 if (dev < 0)
36 36 return CMD_RET_FAILURE;
37 37  
38   - setenv_ulong("mmc_first_dev", dev);
  38 + env_set_ulong("mmc_first_dev", dev);
39 39 return CMD_RET_SUCCESS;
40 40 }
41 41  
board/boundary/nitrogen6x/nitrogen6x.c
Diff comments   View file @ 018f530
... ... @@ -1021,7 +1021,7 @@
1021 1021 #ifdef CONFIG_CMD_BMODE
1022 1022 add_board_boot_modes(board_boot_modes);
1023 1023 #endif
1024   - setenv_hex("reset_cause", get_imx_reset_cause());
  1024 + env_set_hex("reset_cause", get_imx_reset_cause());
1025 1025 return 0;
1026 1026 }
board/engicam/common/board.c
Diff comments   View file @ 018f530
... ... @@ -21,7 +21,7 @@
21 21 char mmcblk[32];
22 22 u32 dev_no = mmc_get_env_dev();
23 23  
24   - setenv_ulong("mmcdev", dev_no);
  24 + env_set_ulong("mmcdev", dev_no);
25 25  
26 26 /* Set mmcblk env */
27 27 sprintf(mmcblk, "/dev/mmcblk%dp2 rootwait rw", dev_no);
board/freescale/qemu-ppce500/qemu-ppce500.c
Diff comments   View file @ 018f530
... ... @@ -211,10 +211,10 @@
211 211 /* -kernel boot */
212 212 prop = fdt_getprop(fdt, chosen, "qemu,boot-kernel", &len);
213 213 if (prop && (len >= 8))
214   - setenv_hex("qemu_kernel_addr", *prop);
  214 + env_set_hex("qemu_kernel_addr", *prop);
215 215  
216 216 /* Give the user a variable for the host fdt */
217   - setenv_hex("fdt_addr_r", (ulong)fdt);
  217 + env_set_hex("fdt_addr_r", (ulong)fdt);
218 218  
219 219 return 0;
220 220 }
board/grinn/liteboard/board.c
Diff comments   View file @ 018f530
... ... @@ -168,7 +168,7 @@
168 168 if (!check_mmc_autodetect())
169 169 return;
170 170  
171   - setenv_ulong("mmcdev", dev_no);
  171 + env_set_ulong("mmcdev", dev_no);
172 172  
173 173 /* Set mmcblk env */
174 174 sprintf(mmcblk, "/dev/mmcblk%dp2 rootwait rw",
board/raspberrypi/rpi/rpi.c
Diff comments   View file @ 018f530
... ... @@ -266,7 +266,7 @@
266 266 if (fdt_magic(fw_dtb_pointer) != FDT_MAGIC)
267 267 return;
268 268  
269   - setenv_hex("fdt_addr", fw_dtb_pointer);
  269 + env_set_hex("fdt_addr", fw_dtb_pointer);
270 270 }
271 271  
272 272 /*
... ... @@ -646,7 +646,7 @@
646 646 return;
647 647 }
648 648 /* otherwise assume .scr format (mkimage-type script) */
649   - setenv_hex("fel_scriptaddr", spl->fel_script_address);
  649 + env_set_hex("fel_scriptaddr", spl->fel_script_address);
650 650 }
651 651  
652 652 /*
... ... @@ -80,7 +80,7 @@
80 80  
81 81 printf("\n%ld bytes read\n", size);
82 82  
83   - setenv_hex("filesize", size);
  83 + env_set_hex("filesize", size);
84 84  
85 85 return 0;
86 86 }
... ... @@ -138,7 +138,7 @@
138 138 if (size > 0) {
139 139 printf("### CRAMFS load complete: %d bytes loaded to 0x%lx\n",
140 140 size, offset);
141   - setenv_hex("filesize", size);
  141 + env_set_hex("filesize", size);
142 142 } else {
143 143 printf("### CRAMFS LOAD ERROR<%x> for %s!\n", size, filename);
144 144 }
... ... @@ -43,7 +43,7 @@
43 43  
44 44 buf = map_sysmem(addr, 0);
45 45 working_fdt = buf;
46   - setenv_hex("fdtaddr", addr);
  46 + env_set_hex("fdtaddr", addr);
47 47 }
48 48  
49 49 /*
... ... @@ -373,7 +373,7 @@
373 373 }
374 374 if (subcmd[0] == 's') {
375 375 /* get the num nodes at this level */
376   - setenv_ulong(var, curIndex + 1);
  376 + env_set_ulong(var, curIndex + 1);
377 377 } else {
378 378 /* node index not found */
379 379 printf("libfdt node not found\n");
... ... @@ -512,7 +512,7 @@
512 512 if (size > 0) {
513 513 printf("### %s load complete: %d bytes loaded to 0x%lx\n",
514 514 fsname, size, offset);
515   - setenv_hex("filesize", size);
  515 + env_set_hex("filesize", size);
516 516 } else {
517 517 printf("### %s LOAD ERROR<%x> for %s!\n", fsname, size, filename);
518 518 }
... ... @@ -182,7 +182,7 @@
182 182 start_addr, end_addr, size, size
183 183 );
184 184 flush_cache(start_addr, size);
185   - setenv_hex("filesize", size);
  185 + env_set_hex("filesize", size);
186 186 return (addr);
187 187 case SREC_START:
188 188 break;
... ... @@ -529,7 +529,7 @@
529 529 flush_cache(offset, size);
530 530  
531 531 printf("## Total Size = 0x%08x = %d Bytes\n", size, size);
532   - setenv_hex("filesize", size);
  532 + env_set_hex("filesize", size);
533 533  
534 534 return offset;
535 535 }
... ... @@ -1000,7 +1000,7 @@
1000 1000 flush_cache(offset, ALIGN(size, ARCH_DMA_MINALIGN));
1001 1001  
1002 1002 printf("## Total Size = 0x%08x = %d Bytes\n", size, size);
1003   - setenv_hex("filesize", size);
  1003 + env_set_hex("filesize", size);
1004 1004  
1005 1005 return offset;
1006 1006 }
... ... @@ -42,7 +42,7 @@
42 42 return 1;
43 43 printf("Uncompressed size: %ld = %#lX\n", (ulong)src_len,
44 44 (ulong)src_len);
45   - setenv_hex("filesize", src_len);
  45 + env_set_hex("filesize", src_len);
46 46  
47 47 return 0;
48 48 }
... ... @@ -239,7 +239,7 @@
239 239 dev = list_entry(dentry, struct mtd_device, link);
240 240 if (dev == current_mtd_dev) {
241 241 mtddevnum += current_mtd_partnum;
242   - setenv_ulong("mtddevnum", mtddevnum);
  242 + env_set_ulong("mtddevnum", mtddevnum);
243 243 break;
244 244 }
245 245 mtddevnum += dev->num_parts;
... ... @@ -305,9 +305,9 @@
305 305 printf(" bbt options 0x%08x\n", chip->bbt_options);
306 306  
307 307 /* Set geometry info */
308   - setenv_hex("nand_writesize", mtd->writesize);
309   - setenv_hex("nand_oobsize", mtd->oobsize);
310   - setenv_hex("nand_erasesize", mtd->erasesize);
  308 + env_set_hex("nand_writesize", mtd->writesize);
  309 + env_set_hex("nand_oobsize", mtd->oobsize);
  310 + env_set_hex("nand_erasesize", mtd->erasesize);
311 311 }
312 312  
313 313 static int raw_access(struct mtd_info *mtd, ulong addr, loff_t off,
... ... @@ -304,7 +304,7 @@
304 304 * @param value Value to set it to
305 305 * @return 0 if ok, 1 on error
306 306 */
307   -int setenv_ulong(const char *varname, ulong value)
  307 +int env_set_ulong(const char *varname, ulong value)
308 308 {
309 309 /* TODO: this should be unsigned */
310 310 char *str = simple_itoa(value);
... ... @@ -319,7 +319,7 @@
319 319 * @param value Value to set it to
320 320 * @return 0 if ok, 1 on error
321 321 */
322   -int setenv_hex(const char *varname, ulong value)
  322 +int env_set_hex(const char *varname, ulong value)
323 323 {
324 324 char str[17];
325 325  
... ... @@ -957,7 +957,7 @@
957 957 envp->flags = ACTIVE_FLAG;
958 958 #endif
959 959 }
960   - setenv_hex("filesize", len + offsetof(env_t, data));
  960 + env_set_hex("filesize", len + offsetof(env_t, data));
961 961  
962 962 return 0;
963 963  
... ... @@ -157,7 +157,7 @@
157 157 load_addr = addr;
158 158  
159 159 printf ("\n%ld bytes read\n", filelen);
160   - setenv_hex("filesize", filelen);
  160 + env_set_hex("filesize", filelen);
161 161  
162 162 return filelen;
163 163 }
... ... @@ -314,7 +314,7 @@
314 314  
315 315 /* plain assignment: "setexpr name value" */
316 316 if (argc == 3) {
317   - setenv_hex(argv[1], a);
  317 + env_set_hex(argv[1], a);
318 318 return 0;
319 319 }
320 320  
... ... @@ -370,7 +370,7 @@
370 370 return 1;
371 371 }
372 372  
373   - setenv_hex(argv[1], value);
  373 + env_set_hex(argv[1], value);
374 374  
375 375 return 0;
376 376 }
... ... @@ -231,7 +231,7 @@
231 231 default:
232 232 return -1;
233 233 }
234   - if (setenv_ulong(*vars, value))
  234 + if (env_set_ulong(*vars, value))
235 235 return -1;
236 236 }
237 237  
... ... @@ -624,7 +624,7 @@
624 624 &key_handle);
625 625 if (!err) {
626 626 printf("Key handle is 0x%x\n", key_handle);
627   - setenv_hex("key_handle", key_handle);
  627 + env_set_hex("key_handle", key_handle);
628 628 }
629 629  
630 630 return report_return_code(err);
... ... @@ -46,9 +46,9 @@
46 46 used = min(avail, (size_t)needed);
47 47 printf("Function trace dumped to %08lx, size %#zx\n",
48 48 (ulong)map_to_sysmem(buff + buff_ptr), used);
49   - setenv_hex("profbase", map_to_sysmem(buff));
50   - setenv_hex("profsize", buff_size);
51   - setenv_hex("profoffset", buff_ptr + used);
  49 + env_set_hex("profbase", map_to_sysmem(buff));
  50 + env_set_hex("profsize", buff_size);
  51 + env_set_hex("profoffset", buff_ptr + used);
52 52  
53 53 return 0;
54 54 }
... ... @@ -71,9 +71,9 @@
71 71 printf("Call list dumped to %08lx, size %#zx\n",
72 72 (ulong)map_to_sysmem(buff + buff_ptr), used);
73 73  
74   - setenv_hex("profbase", map_to_sysmem(buff));
75   - setenv_hex("profsize", buff_size);
76   - setenv_hex("profoffset", buff_ptr + used);
  74 + env_set_hex("profbase", map_to_sysmem(buff));
  75 + env_set_hex("profsize", buff_size);
  76 + env_set_hex("profoffset", buff_ptr + used);
77 77  
78 78 return 0;
79 79 }
... ... @@ -29,7 +29,7 @@
29 29 return 1;
30 30  
31 31 printf("Uncompressed size: %ld = 0x%lX\n", src_len, src_len);
32   - setenv_hex("filesize", src_len);
  32 + env_set_hex("filesize", src_len);
33 33  
34 34 return 0;
35 35 }
... ... @@ -251,8 +251,8 @@
251 251  
252 252 flush_cache(dest, len);
253 253  
254   - setenv_hex("fileaddr", data);
255   - setenv_hex("filesize", len);
  254 + env_set_hex("fileaddr", data);
  255 + env_set_hex("filesize", len);
256 256  
257 257 return 0;
258 258 }
... ... @@ -115,7 +115,7 @@
115 115 load_addr = addr;
116 116  
117 117 printf("%llu bytes read\n", zfile.size);
118   - setenv_hex("filesize", zfile.size);
  118 + env_set_hex("filesize", zfile.size);
119 119  
120 120 return 0;
121 121 }
... ... @@ -30,7 +30,7 @@
30 30 return 1;
31 31  
32 32 printf("Compressed size: %ld = 0x%lX\n", dst_len, dst_len);
33   - setenv_hex("filesize", dst_len);
  33 + env_set_hex("filesize", dst_len);
34 34  
35 35 return 0;
36 36 }
... ... @@ -278,12 +278,12 @@
278 278 /* Add an env variable to point to a kernel payload, if available */
279 279 addr = fdtdec_get_config_int(gd->fdt_blob, "kernel-offset", 0);
280 280 if (addr)
281   - setenv_addr("kernaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
  281 + env_set_addr("kernaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
282 282  
283 283 /* Add an env variable to point to a root disk, if available */
284 284 addr = fdtdec_get_config_int(gd->fdt_blob, "rootdisk-offset", 0);
285 285 if (addr)
286   - setenv_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
  286 + env_set_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr));
287 287 #endif /* CONFIG_OF_CONTROL && CONFIG_SYS_TEXT_BASE */
288 288 }
289 289  
... ... @@ -300,7 +300,7 @@
300 300 bootcount = bootcount_load();
301 301 bootcount++;
302 302 bootcount_store(bootcount);
303   - setenv_ulong("bootcount", bootcount);
  303 + env_set_ulong("bootcount", bootcount);
304 304 bootlimit = getenv_ulong("bootlimit", 10, 0);
305 305 #endif /* CONFIG_BOOTCOUNT_LIMIT */
306 306  
... ... @@ -486,7 +486,7 @@
486 486 else
487 487 set_default_env(NULL);
488 488 #ifdef CONFIG_OF_CONTROL
489   - setenv_addr("fdtcontroladdr", gd->fdt_blob);
  489 + env_set_addr("fdtcontroladdr", gd->fdt_blob);
490 490 #endif
491 491  
492 492 /* Initialize from environment */
... ... @@ -645,8 +645,8 @@
645 645 ret = boot_ramdisk_high(&images->lmb, images->rd_start,
646 646 rd_len, &images->initrd_start, &images->initrd_end);
647 647 if (!ret) {
648   - setenv_hex("initrd_start", images->initrd_start);
649   - setenv_hex("initrd_end", images->initrd_end);
  648 + env_set_hex("initrd_start", images->initrd_start);
  649 + env_set_hex("initrd_end", images->initrd_end);
650 650 }
651 651 }
652 652 #endif
... ... @@ -23,7 +23,7 @@
23 23 /* Don't start if "autostart" is set to "no" */
24 24 s = getenv("autostart");
25 25 if ((s != NULL) && !strcmp(s, "no")) {
26   - setenv_hex("filesize", images->os.image_len);
  26 + env_set_hex("filesize", images->os.image_len);
27 27 return 0;
28 28 }
29 29 appl = (int (*)(int, char * const []))images->ep;
drivers/bootcount/bootcount_env.c
Diff comments   View file @ 018f530
... ... @@ -13,7 +13,7 @@
13 13 int upgrade_available = getenv_ulong("upgrade_available", 10, 0);
14 14  
15 15 if (upgrade_available) {
16   - setenv_ulong("bootcount", a);
  16 + env_set_ulong("bootcount", a);
17 17 env_save();
18 18 }
19 19 }
... ... @@ -418,7 +418,7 @@
418 418 rc = fman_upload_firmware(index, &reg->fm_imem, addr);
419 419 if (rc)
420 420 return rc;
421   - setenv_addr("fman_ucode", addr);
  421 + env_set_addr("fman_ucode", addr);
422 422  
423 423 fm_init_muram(index, &reg->muram);
424 424 fm_init_qmi(&reg->fm_qmi_common);
... ... @@ -682,7 +682,7 @@
682 682  
683 683 printf("Found %d device(s).\n", scsi_max_devs);
684 684 #ifndef CONFIG_SPL_BUILD
685   - setenv_ulong("scsidevs", scsi_max_devs);
  685 + env_set_ulong("scsidevs", scsi_max_devs);
686 686 #endif
687 687 return 0;
688 688 }
... ... @@ -348,7 +348,7 @@
348 348 if (fs_size(argv[3], &size) < 0)
349 349 return CMD_RET_FAILURE;
350 350  
351   - setenv_hex("filesize", size);
  351 + env_set_hex("filesize", size);
352 352  
353 353 return 0;
354 354 }
... ... @@ -417,8 +417,8 @@
417 417 }
418 418 puts("\n");
419 419  
420   - setenv_hex("fileaddr", addr);
421   - setenv_hex("filesize", len_read);
  420 + env_set_hex("fileaddr", addr);
  421 + env_set_hex("filesize", len_read);
422 422  
423 423 return 0;
424 424 }
... ... @@ -941,7 +941,7 @@
941 941  
942 942 err = ubifs_read(filename, (void *)(uintptr_t)addr, 0, size, &actread);
943 943 if (err == 0) {
944   - setenv_hex("filesize", actread);
  944 + env_set_hex("filesize", actread);
945 945 printf("Done\n");
946 946 }
947 947  
... ... @@ -349,18 +349,34 @@
349 349 */
350 350 int env_set(const char *varname, const char *value);
351 351  
352   -int setenv_ulong(const char *varname, ulong value);
353   -int setenv_hex(const char *varname, ulong value);
354 352 /**
355   - * setenv_addr - Set an environment variable to an address in hex
  353 + * env_set_ulong() - set an environment variable to an integer
356 354 *
  355 + * @varname: Variable to adjust
  356 + * @value: Value to set for the variable (will be converted to a string)
  357 + * @return 0 if OK, 1 on error
  358 + */
  359 +int env_set_ulong(const char *varname, ulong value);
  360 +
  361 +/**
  362 + * env_set_hex() - set an environment variable to a hex value
  363 + *
  364 + * @varname: Variable to adjust
  365 + * @value: Value to set for the variable (will be converted to a hex string)
  366 + * @return 0 if OK, 1 on error
  367 + */
  368 +int env_set_hex(const char *varname, ulong value);
  369 +
  370 +/**
  371 + * env_set_addr - Set an environment variable to an address in hex
  372 + *
357 373 * @varname: Environment variable to set
358 374 * @addr: Value to set it to
359 375 * @return 0 if ok, 1 on error
360 376 */
361   -static inline int setenv_addr(const char *varname, const void *addr)
  377 +static inline int env_set_addr(const char *varname, const void *addr)
362 378 {
363   - return setenv_hex(varname, (ulong)addr);
  379 + return env_set_hex(varname, (ulong)addr);
364 380 }
365 381  
366 382 #ifdef CONFIG_AUTO_COMPLETE
... ... @@ -616,8 +616,8 @@
616 616 if (net_boot_file_size > 0) {
617 617 printf("Bytes transferred = %d (%x hex)\n",
618 618 net_boot_file_size, net_boot_file_size);
619   - setenv_hex("filesize", net_boot_file_size);
620   - setenv_hex("fileaddr", load_addr);
  619 + env_set_hex("filesize", net_boot_file_size);
  620 + env_set_hex("fileaddr", load_addr);
621 621 }
622 622 if (protocol != NETCONS)
623 623 eth_halt();