Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 364ac5b5836055c2a49f986769b2d925f230f093

Authored by Axel Lin
Committed by Tom Rini
1 parent 1fddd7b63c
Exists in v2017.01-smarct4x and in 37 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-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_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, 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

image: Convert to use fdt_for_each_subnode macro 

Use fdt_for_each_subnode macro to simplify the code a bit.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Simon Glass <sjg@chromium.org>

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

... ... @@ -1010,9 +1010,7 @@
1010 1010 }
1011 1011  
1012 1012 /* Process all hash subnodes of the component image node */
1013   - for (noffset = fdt_first_subnode(fit, image_noffset);
1014   - noffset >= 0;
1015   - noffset = fdt_next_subnode(fit, noffset)) {
  1013 + fdt_for_each_subnode(fit, noffset, image_noffset) {
1016 1014 const char *name = fit_get_name(fit, noffset, NULL);
1017 1015  
1018 1016 /*
... ... @@ -212,9 +212,7 @@
212 212 int ret;
213 213  
214 214 /* Process all hash subnodes of the component image node */
215   - for (noffset = fdt_first_subnode(fit, image_noffset);
216   - noffset >= 0;
217   - noffset = fdt_next_subnode(fit, noffset)) {
  215 + fdt_for_each_subnode(fit, noffset, image_noffset) {
218 216 const char *name = fit_get_name(fit, noffset, NULL);
219 217  
220 218 if (!strncmp(name, FIT_SIG_NODENAME,
... ... @@ -262,9 +260,7 @@
262 260 return 0;
263 261 }
264 262  
265   - for (noffset = fdt_first_subnode(sig_blob, sig_node);
266   - noffset >= 0;
267   - noffset = fdt_next_subnode(sig_blob, noffset)) {
  263 + fdt_for_each_subnode(sig_blob, noffset, sig_node) {
268 264 const char *required;
269 265 int ret;
270 266  
... ... @@ -397,9 +393,7 @@
397 393 int ret;
398 394  
399 395 /* Process all hash subnodes of the component conf node */
400   - for (noffset = fdt_first_subnode(fit, conf_noffset);
401   - noffset >= 0;
402   - noffset = fdt_next_subnode(fit, noffset)) {
  396 + fdt_for_each_subnode(fit, noffset, conf_noffset) {
403 397 const char *name = fit_get_name(fit, noffset, NULL);
404 398  
405 399 if (!strncmp(name, FIT_SIG_NODENAME,
... ... @@ -444,9 +438,7 @@
444 438 return 0;
445 439 }
446 440  
447   - for (noffset = fdt_first_subnode(sig_blob, sig_node);
448   - noffset >= 0;
449   - noffset = fdt_next_subnode(sig_blob, noffset)) {
  441 + fdt_for_each_subnode(sig_blob, noffset, sig_node) {
450 442 const char *required;
451 443 int ret;
452 444