From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Simon Glass <sjg@chromium.org>,
Alexandru Gagniuc <mr.nuke.me@gmail.com>,
Artem Lapkin <email2tema@gmail.com>,
Joe Hershberger <joe.hershberger@ni.com>,
Leo Yu-Chi Liang <ycliang@andestech.com>,
Marek Vasut <marex@denx.de>, Michal Simek <michal.simek@amd.com>
Subject: [PATCH 7/8] image: Correct indentation in select_ramdisk()
Date: Sun, 28 Aug 2022 12:32:52 -0600 [thread overview]
Message-ID: <20220828183253.822815-8-sjg@chromium.org> (raw)
In-Reply-To: <20220828183253.822815-1-sjg@chromium.org>
Finish off the refactoring by correcting the indent levels. Note that this
does not include any functional changes.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
boot/image-board.c | 140 ++++++++++++++++++++++-----------------------
1 file changed, 69 insertions(+), 71 deletions(-)
diff --git a/boot/image-board.c b/boot/image-board.c
index 7c0948b592a..7a17ffb7f7f 100644
--- a/boot/image-board.c
+++ b/boot/image-board.c
@@ -347,8 +347,8 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch,
else
default_addr = image_load_addr;
- if (fit_parse_conf(select, default_addr,
- &rd_addr, &fit_uname_config)) {
+ if (fit_parse_conf(select, default_addr, &rd_addr,
+ &fit_uname_config)) {
debug("* ramdisk: config '%s' from image at 0x%08lx\n",
fit_uname_config, rd_addr);
done_select = true;
@@ -362,82 +362,80 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch,
}
}
if (!done_select) {
- rd_addr = hextoul(select, NULL);
- debug("* ramdisk: cmdline image address = 0x%08lx\n",
- rd_addr);
+ rd_addr = hextoul(select, NULL);
+ debug("* ramdisk: cmdline image address = 0x%08lx\n", rd_addr);
}
- if (CONFIG_IS_ENABLED(FIT) && !select) {
- /* use FIT configuration provided in first bootm
- * command argument. If the property is not defined,
- * quit silently (with -ENOPKG)
- */
- rd_addr = map_to_sysmem(images->fit_hdr_os);
- rd_noffset = fit_get_node_from_config(images,
- FIT_RAMDISK_PROP,
- rd_addr);
- if (rd_noffset == -ENOENT)
- return -ENOPKG;
- else if (rd_noffset < 0)
- return rd_noffset;
- }
-
- /*
- * Check if there is an initrd image at the
- * address provided in the second bootm argument
- * check image type, for FIT images get FIT node.
+ if (CONFIG_IS_ENABLED(FIT) && !select) {
+ /* use FIT configuration provided in first bootm
+ * command argument. If the property is not defined,
+ * quit silently (with -ENOPKG)
*/
- buf = map_sysmem(rd_addr, 0);
- switch (genimg_get_format(buf)) {
- case IMAGE_FORMAT_LEGACY:
- if (CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)) {
- const image_header_t *rd_hdr;
+ rd_addr = map_to_sysmem(images->fit_hdr_os);
+ rd_noffset = fit_get_node_from_config(images, FIT_RAMDISK_PROP,
+ rd_addr);
+ if (rd_noffset == -ENOENT)
+ return -ENOPKG;
+ else if (rd_noffset < 0)
+ return rd_noffset;
+ }
- printf("## Loading init Ramdisk from Legacy Image at %08lx ...\n",
- rd_addr);
+ /*
+ * Check if there is an initrd image at the
+ * address provided in the second bootm argument
+ * check image type, for FIT images get FIT node.
+ */
+ buf = map_sysmem(rd_addr, 0);
+ switch (genimg_get_format(buf)) {
+ case IMAGE_FORMAT_LEGACY:
+ if (CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)) {
+ const image_header_t *rd_hdr;
- bootstage_mark(BOOTSTAGE_ID_CHECK_RAMDISK);
- rd_hdr = image_get_ramdisk(rd_addr, arch,
- images->verify);
+ printf("## Loading init Ramdisk from Legacy Image at %08lx ...\n",
+ rd_addr);
- if (!rd_hdr)
- return -ENOENT;
+ bootstage_mark(BOOTSTAGE_ID_CHECK_RAMDISK);
+ rd_hdr = image_get_ramdisk(rd_addr, arch,
+ images->verify);
- *rd_datap = image_get_data(rd_hdr);
- *rd_lenp = image_get_data_size(rd_hdr);
- done = true;
- }
- break;
- case IMAGE_FORMAT_FIT:
- if (CONFIG_IS_ENABLED(FIT)) {
- rd_noffset = fit_image_load(images, rd_addr,
- &fit_uname_ramdisk, &fit_uname_config,
- arch, IH_TYPE_RAMDISK,
- BOOTSTAGE_ID_FIT_RD_START,
- FIT_LOAD_OPTIONAL_NON_ZERO,
- rd_datap, rd_lenp);
- if (rd_noffset < 0)
- return rd_noffset;
-
- images->fit_hdr_rd = map_sysmem(rd_addr, 0);
- images->fit_uname_rd = fit_uname_ramdisk;
- images->fit_noffset_rd = rd_noffset;
- done = true;
- }
- break;
- case IMAGE_FORMAT_ANDROID:
- if (IS_ENABLED(CONFIG_ANDROID_BOOT_IMAGE)) {
- void *ptr = map_sysmem(images->os.start, 0);
- int ret;
-
- ret = android_image_get_ramdisk(ptr, rd_datap,
- rd_lenp);
- unmap_sysmem(ptr);
- if (ret)
- return ret;
- done = true;
- }
- break;
+ if (!rd_hdr)
+ return -ENOENT;
+
+ *rd_datap = image_get_data(rd_hdr);
+ *rd_lenp = image_get_data_size(rd_hdr);
+ done = true;
+ }
+ break;
+ case IMAGE_FORMAT_FIT:
+ if (CONFIG_IS_ENABLED(FIT)) {
+ rd_noffset = fit_image_load(images, rd_addr,
+ &fit_uname_ramdisk,
+ &fit_uname_config,
+ arch, IH_TYPE_RAMDISK,
+ BOOTSTAGE_ID_FIT_RD_START,
+ FIT_LOAD_OPTIONAL_NON_ZERO,
+ rd_datap, rd_lenp);
+ if (rd_noffset < 0)
+ return rd_noffset;
+
+ images->fit_hdr_rd = map_sysmem(rd_addr, 0);
+ images->fit_uname_rd = fit_uname_ramdisk;
+ images->fit_noffset_rd = rd_noffset;
+ done = true;
+ }
+ break;
+ case IMAGE_FORMAT_ANDROID:
+ if (IS_ENABLED(CONFIG_ANDROID_BOOT_IMAGE)) {
+ void *ptr = map_sysmem(images->os.start, 0);
+ int ret;
+
+ ret = android_image_get_ramdisk(ptr, rd_datap, rd_lenp);
+ unmap_sysmem(ptr);
+ if (ret)
+ return ret;
+ done = true;
}
+ break;
+ }
if (!done) {
if (IS_ENABLED(CONFIG_SUPPORT_RAW_INITRD)) {
--
2.37.2.672.g94769d06f0-goog
next prev parent reply other threads:[~2022-08-28 18:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-28 18:32 [PATCH 0/8] image: Refactor ramdisk code to avoid #ifdef Simon Glass
2022-08-28 18:32 ` [PATCH 1/8] image: Fix up ANDROID_BOOT_IMAGE ramdisk code Simon Glass
2022-08-28 18:32 ` [PATCH 2/8] image: Track when ramdisk processing is completed Simon Glass
2022-08-28 18:32 ` [PATCH 3/8] image: Drop #ifdefs for LEGACY_IMAGE_FORMAT Simon Glass
2022-08-28 18:32 ` [PATCH 4/8] image: Drop one #ifdef for FIT Simon Glass
2022-08-28 18:32 ` [PATCH 5/8] image: Drop another " Simon Glass
2022-08-28 18:32 ` [PATCH 6/8] image: Drop remaining FIT #ifdef Simon Glass
2022-08-28 18:32 ` Simon Glass [this message]
2022-08-28 18:32 ` [PATCH 8/8] image: Drop some other #ifdefs in image-board.c Simon Glass
2022-09-14 16:22 ` Heinrich Schuchardt
2022-09-14 17:10 ` Simon Glass
2022-09-14 15:53 ` [PATCH 0/8] image: Refactor ramdisk code to avoid #ifdef Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220828183253.822815-8-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=email2tema@gmail.com \
--cc=joe.hershberger@ni.com \
--cc=marex@denx.de \
--cc=michal.simek@amd.com \
--cc=mr.nuke.me@gmail.com \
--cc=narmstrong@baylibre.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=ycliang@andestech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).