All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeffy Chen <jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
To: u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org
Cc: Albert Aribaud
	<albert.u.boot-LhW3hqR2+23R7s880joybQ@public.gmane.org>,
	Joe Hershberger <joe.hershberger-acOepvfBmUk@public.gmane.org>,
	Jan Kiszka <jan.kiszka-kv7WeFo6aLtBDgjK7y7TUQ@public.gmane.org>,
	sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org,
	Jeffy Chen <jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
	linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	Peng Fan <Peng.Fan-KZfg59tc24xl57MIdRCFDg@public.gmane.org>,
	Tom Warren <twarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>,
	York Sun <yorksun-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
Subject: [PATCH v4 2/6] ARM: bootm: Try to use relocated ramdisk
Date: Wed, 13 Jan 2016 16:53:16 +0800	[thread overview]
Message-ID: <1452675200-15941-3-git-send-email-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <1452675200-15941-1-git-send-email-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>

After boot_ramdisk_high(), ramdisk would be relocated to
initrd_start & initrd_end, so use them instead of rd_start & rd_end.

Signed-off-by: Jeffy Chen <jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
Acked-by: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>

---

Changes in v4: None
Changes in v3: None
Changes in v2:
Add comments.

 arch/arm/lib/bootm.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index a477cae..0838d89 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -225,7 +225,17 @@ static void boot_prep_linux(bootm_headers_t *images)
 		if (BOOTM_ENABLE_MEMORY_TAGS)
 			setup_memory_tags(gd->bd);
 		if (BOOTM_ENABLE_INITRD_TAG) {
-			if (images->rd_start && images->rd_end) {
+			/*
+			 * In boot_ramdisk_high(), it may relocate ramdisk to
+			 * a specified location. And set images->initrd_start &
+			 * images->initrd_end to relocated ramdisk's start/end
+			 * addresses. So use them instead of images->rd_start &
+			 * images->rd_end when possible.
+			 */
+			if (images->initrd_start && images->initrd_end) {
+				setup_initrd_tag(gd->bd, images->initrd_start,
+						 images->initrd_end);
+			} else if (images->rd_start && images->rd_end) {
 				setup_initrd_tag(gd->bd, images->rd_start,
 						 images->rd_end);
 			}
-- 
2.1.4

WARNING: multiple messages have this Message-ID (diff)
From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 2/6] ARM: bootm: Try to use relocated ramdisk
Date: Wed, 13 Jan 2016 16:53:16 +0800	[thread overview]
Message-ID: <1452675200-15941-3-git-send-email-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <1452675200-15941-1-git-send-email-jeffy.chen@rock-chips.com>

After boot_ramdisk_high(), ramdisk would be relocated to
initrd_start & initrd_end, so use them instead of rd_start & rd_end.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>

---

Changes in v4: None
Changes in v3: None
Changes in v2:
Add comments.

 arch/arm/lib/bootm.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index a477cae..0838d89 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -225,7 +225,17 @@ static void boot_prep_linux(bootm_headers_t *images)
 		if (BOOTM_ENABLE_MEMORY_TAGS)
 			setup_memory_tags(gd->bd);
 		if (BOOTM_ENABLE_INITRD_TAG) {
-			if (images->rd_start && images->rd_end) {
+			/*
+			 * In boot_ramdisk_high(), it may relocate ramdisk to
+			 * a specified location. And set images->initrd_start &
+			 * images->initrd_end to relocated ramdisk's start/end
+			 * addresses. So use them instead of images->rd_start &
+			 * images->rd_end when possible.
+			 */
+			if (images->initrd_start && images->initrd_end) {
+				setup_initrd_tag(gd->bd, images->initrd_start,
+						 images->initrd_end);
+			} else if (images->rd_start && images->rd_end) {
 				setup_initrd_tag(gd->bd, images->rd_start,
 						 images->rd_end);
 			}
-- 
2.1.4

  parent reply	other threads:[~2016-01-13  8:53 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-13  8:53 [PATCH v4 0/6] rockchip: kylin: Boot with android boot image Jeffy Chen
2016-01-13  8:53 ` [U-Boot] " Jeffy Chen
     [not found] ` <1452675200-15941-1-git-send-email-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-01-13  8:53   ` [PATCH v4 1/6] common/image-fdt.c: Make boot_get_fdt() perform a check for Android images Jeffy Chen
2016-01-13  8:53     ` [U-Boot] " Jeffy Chen
2016-01-13 15:21     ` Tom Rini
2016-01-13 15:21       ` [U-Boot] " Tom Rini
2016-01-14  1:47       ` Jeffy Chen
2016-01-14  1:47         ` Jeffy Chen
2016-01-13  8:53   ` Jeffy Chen [this message]
2016-01-13  8:53     ` [U-Boot] [PATCH v4 2/6] ARM: bootm: Try to use relocated ramdisk Jeffy Chen
2016-01-13 15:27     ` Tom Rini
2016-01-13 15:27       ` [U-Boot] " Tom Rini
2016-01-13  8:53   ` [PATCH v4 3/6] rockchip: rk3036: Bind GPIO banks Jeffy Chen
2016-01-13  8:53     ` [U-Boot] " Jeffy Chen
2016-01-13 15:28     ` Tom Rini
2016-01-13 15:28       ` [U-Boot] " Tom Rini
2016-01-13  8:53   ` [PATCH v4 4/6] rockchip: kylin: Add default gpt partition table Jeffy Chen
2016-01-13  8:53     ` [U-Boot] " Jeffy Chen
2016-01-13 15:28     ` Tom Rini
2016-01-13 15:28       ` [U-Boot] " Tom Rini
2016-01-13  8:53   ` [PATCH v4 5/6] rockchip: kylin: Enable boot with android boot image Jeffy Chen
2016-01-13  8:53     ` [U-Boot] " Jeffy Chen
2016-01-13 15:28     ` Tom Rini
2016-01-13 15:28       ` [U-Boot] " Tom Rini
2016-01-14  2:31       ` Jeffy Chen
2016-01-14  2:31         ` Jeffy Chen
2016-01-14 16:22         ` Tom Rini
2016-01-14 16:22           ` [U-Boot] " Tom Rini
2016-01-15  0:53           ` Jeffy Chen
2016-01-15  0:53             ` [U-Boot] " Jeffy Chen
2016-01-15  0:59             ` Tom Rini
2016-01-15  0:59               ` [U-Boot] " Tom Rini
2016-01-15  2:20               ` Jeffy Chen
2016-01-15  2:20                 ` [U-Boot] " Jeffy Chen
2016-01-15 14:42                 ` Tom Rini
2016-01-15 14:42                   ` [U-Boot] " Tom Rini
2016-01-15 15:42                   ` Daniel Schwierzeck
2016-01-15 15:42                     ` [U-Boot] " Daniel Schwierzeck
2016-01-16  1:18                     ` Simon Glass
2016-01-16  1:18                       ` [U-Boot] " Simon Glass
     [not found]                       ` <CAPnjgZ1SUJDVPFVXgJjEYgom7tEdaORUAjQ8QfQ8jCpw=NtcJQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-01-22  3:13                         ` Simon Glass
2016-01-22  3:13                           ` Simon Glass
2016-01-25 16:57                     ` Tom Rini
2016-01-25 16:57                       ` [U-Boot] " Tom Rini
     [not found]                 ` <5698577B.8040209-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-01-25 19:07                   ` Tom Rini
2016-01-25 19:07                     ` Tom Rini
2016-02-02  7:13                     ` Jeffy Chen
2016-02-02  7:13                       ` [U-Boot] " Jeffy Chen
     [not found]                       ` <56B056FD.70006-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-02-19 20:55                         ` Simon Glass
2016-02-19 20:55                           ` Simon Glass
2016-01-13  8:53   ` [PATCH v4 6/6] rockchip: kylin: Check fastboot request Jeffy Chen
2016-01-13  8:53     ` [U-Boot] " Jeffy Chen
     [not found]     ` <1452675200-15941-7-git-send-email-jeffy.chen-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-01-13 15:28       ` Tom Rini
2016-01-13 15:28         ` 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=1452675200-15941-3-git-send-email-jeffy.chen@rock-chips.com \
    --to=jeffy.chen-tnx95d0mmh7dzftrwevzcw@public.gmane.org \
    --cc=Peng.Fan-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
    --cc=albert.u.boot-LhW3hqR2+23R7s880joybQ@public.gmane.org \
    --cc=jan.kiszka-kv7WeFo6aLtBDgjK7y7TUQ@public.gmane.org \
    --cc=joe.hershberger-acOepvfBmUk@public.gmane.org \
    --cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
    --cc=twarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
    --cc=u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org \
    --cc=yorksun-KZfg59tc24xl57MIdRCFDg@public.gmane.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.