All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set
@ 2017-01-23 15:51 Cédric Schieli
  2017-01-23 17:53 ` Rick Altherr
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Cédric Schieli @ 2017-01-23 15:51 UTC (permalink / raw)
  To: u-boot

In commit c2e7e72, the ramdisk relocation code was moved from
image_setup_linux to do_bootm, leaving the bootz and booti cases broken.

This patch fixes both by adding the BOOTM_STATE_RAMDISK state in their
call to do_bootm_states if CONFIG_SYS_BOOT_RAMDISK_HIGH is set.

Signed-off-by: C?dric Schieli <cschieli@gmail.com>
---

 cmd/booti.c | 3 +++
 cmd/bootz.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/cmd/booti.c b/cmd/booti.c
index 6c1c998..2d879f3 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -132,6 +132,9 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	images.os.os = IH_OS_LINUX;
 	ret = do_bootm_states(cmdtp, flag, argc, argv,
+#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
+			      BOOTM_STATE_RAMDISK |
+#endif
 			      BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
 			      BOOTM_STATE_OS_GO,
 			      &images, 1);
diff --git a/cmd/bootz.c b/cmd/bootz.c
index 9648fe9..ceff01b 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -76,6 +76,9 @@ int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	images.os.os = IH_OS_LINUX;
 	ret = do_bootm_states(cmdtp, flag, argc, argv,
+#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
+			      BOOTM_STATE_RAMDISK |
+#endif
 			      BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO |
 			      BOOTM_STATE_OS_GO,
 			      &images, 1);
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set
  2017-01-23 15:51 [U-Boot] [PATCH] bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set Cédric Schieli
@ 2017-01-23 17:53 ` Rick Altherr
  2017-01-24  2:37 ` Masahiro Yamada
  2017-01-25  2:15 ` [U-Boot] " Tom Rini
  2 siblings, 0 replies; 4+ messages in thread
From: Rick Altherr @ 2017-01-23 17:53 UTC (permalink / raw)
  To: u-boot

Whoops.  Thank you for catching that.

Reviewed-by: Rick Altherr <raltherr@google.com>

On Mon, Jan 23, 2017 at 7:51 AM, C?dric Schieli <cschieli@gmail.com> wrote:

> In commit c2e7e72, the ramdisk relocation code was moved from
> image_setup_linux to do_bootm, leaving the bootz and booti cases broken.
>
> This patch fixes both by adding the BOOTM_STATE_RAMDISK state in their
> call to do_bootm_states if CONFIG_SYS_BOOT_RAMDISK_HIGH is set.
>
> Signed-off-by: C?dric Schieli <cschieli@gmail.com>
> ---
>
>  cmd/booti.c | 3 +++
>  cmd/bootz.c | 3 +++
>  2 files changed, 6 insertions(+)
>
> diff --git a/cmd/booti.c b/cmd/booti.c
> index 6c1c998..2d879f3 100644
> --- a/cmd/booti.c
> +++ b/cmd/booti.c
> @@ -132,6 +132,9 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc,
> char * const argv[])
>
>         images.os.os = IH_OS_LINUX;
>         ret = do_bootm_states(cmdtp, flag, argc, argv,
> +#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
> +                             BOOTM_STATE_RAMDISK |
> +#endif
>                               BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO
> |
>                               BOOTM_STATE_OS_GO,
>                               &images, 1);
> diff --git a/cmd/bootz.c b/cmd/bootz.c
> index 9648fe9..ceff01b 100644
> --- a/cmd/bootz.c
> +++ b/cmd/bootz.c
> @@ -76,6 +76,9 @@ int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char
> * const argv[])
>
>         images.os.os = IH_OS_LINUX;
>         ret = do_bootm_states(cmdtp, flag, argc, argv,
> +#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
> +                             BOOTM_STATE_RAMDISK |
> +#endif
>                               BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO
> |
>                               BOOTM_STATE_OS_GO,
>                               &images, 1);
> --
> 2.10.2
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set
  2017-01-23 15:51 [U-Boot] [PATCH] bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set Cédric Schieli
  2017-01-23 17:53 ` Rick Altherr
@ 2017-01-24  2:37 ` Masahiro Yamada
  2017-01-25  2:15 ` [U-Boot] " Tom Rini
  2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2017-01-24  2:37 UTC (permalink / raw)
  To: u-boot

2017-01-24 0:51 GMT+09:00 C?dric Schieli <cschieli@gmail.com>:
> In commit c2e7e72, the ramdisk relocation code was moved from
> image_setup_linux to do_bootm, leaving the bootz and booti cases broken.
>
> This patch fixes both by adding the BOOTM_STATE_RAMDISK state in their
> call to do_bootm_states if CONFIG_SYS_BOOT_RAMDISK_HIGH is set.
>
> Signed-off-by: C?dric Schieli <cschieli@gmail.com>


Tested-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Thanks!



-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [U-Boot] bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set
  2017-01-23 15:51 [U-Boot] [PATCH] bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set Cédric Schieli
  2017-01-23 17:53 ` Rick Altherr
  2017-01-24  2:37 ` Masahiro Yamada
@ 2017-01-25  2:15 ` Tom Rini
  2 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2017-01-25  2:15 UTC (permalink / raw)
  To: u-boot

On Mon, Jan 23, 2017 at 04:51:45PM +0100, C?dric Schieli wrote:

> In commit c2e7e72, the ramdisk relocation code was moved from
> image_setup_linux to do_bootm, leaving the bootz and booti cases broken.
> 
> This patch fixes both by adding the BOOTM_STATE_RAMDISK state in their
> call to do_bootm_states if CONFIG_SYS_BOOT_RAMDISK_HIGH is set.
> 
> Signed-off-by: C?dric Schieli <cschieli@gmail.com>
> Reviewed-by: Rick Altherr <raltherr@google.com>
> Tested-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170124/e6ea2ca1/attachment.sig>

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-25  2:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-23 15:51 [U-Boot] [PATCH] bootz/booti: relocate ramdisk if CONFIG_SYS_BOOT_RAMDISK_HIGH set Cédric Schieli
2017-01-23 17:53 ` Rick Altherr
2017-01-24  2:37 ` Masahiro Yamada
2017-01-25  2:15 ` [U-Boot] " Tom Rini

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.