diff mbox

[U-Boot,v4,7/8] x86: qemu: adjust ramdisk load address

Message ID 1451530525-30913-8-git-send-email-yanmiaobest@gmail.com
State Superseded
Delegated to: Bin Meng
Headers show

Commit Message

Miao Yan Dec. 31, 2015, 2:55 a.m. UTC
By default, ramdisk load address is defined to 02000000 in
env string. When loading bzImage to 100000 (default address), there's
a chance that the ramdisk header would be overwritten by
the kernel. Thus increase the gap and make ramdisk load at 04000000
by default.

Signed-off-by: Miao Yan <yanmiaobest@gmail.com>
---
 include/configs/qemu-x86.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

Simon Glass Dec. 31, 2015, 5:08 a.m. UTC | #1
Hi Miao,

On 30 December 2015 at 19:55, Miao Yan <yanmiaobest@gmail.com> wrote:
> By default, ramdisk load address is defined to 02000000 in
> env string. When loading bzImage to 100000 (default address), there's
> a chance that the ramdisk header would be overwritten by
> the kernel. Thus increase the gap and make ramdisk load at 04000000
> by default.
>
> Signed-off-by: Miao Yan <yanmiaobest@gmail.com>
> ---
>  include/configs/qemu-x86.h | 13 +++++++++++++
>  1 file changed, 13 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>

But you add other env options here to. Can you mention more of these
in the commit message too?

>
> diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
> index 4258dcb..657b8af 100644
> --- a/include/configs/qemu-x86.h
> +++ b/include/configs/qemu-x86.h
> @@ -57,4 +57,17 @@
>  #undef CONFIG_ENV_IS_IN_SPI_FLASH
>  #define CONFIG_ENV_IS_NOWHERE
>
> +/* default ramdisk load address */
> +#define CONFIG_RAMDISK_ADDR    0x04000000
> +
> +#undef CONFIG_EXTRA_ENV_SETTINGS
> +#define CONFIG_EXTRA_ENV_SETTINGS                      \
> +       CONFIG_STD_DEVICES_SETTINGS                     \
> +       "pciconfighost=1\0"                             \
> +       "netdev=eth0\0"                                 \
> +       "consoledev=ttyS0\0"                            \
> +       "othbootargs=acpi=off\0"                        \
> +       "ramdiskaddr=0x4000000\0"                       \
> +       "ramdiskfile=initramfs.gz\0"
> +
>  #endif /* __CONFIG_H */
> --
> 1.9.1
>

Regards,
Simon
Bin Meng Jan. 4, 2016, 4:05 a.m. UTC | #2
Hi Miao,

On Thu, Dec 31, 2015 at 10:55 AM, Miao Yan <yanmiaobest@gmail.com> wrote:
> By default, ramdisk load address is defined to 02000000 in
> env string. When loading bzImage to 100000 (default address), there's

The default load address is 1000000 (16MB). See CONFIG_LOADADDR in x86-common.h

> a chance that the ramdisk header would be overwritten by
> the kernel. Thus increase the gap and make ramdisk load at 04000000
> by default.
>
> Signed-off-by: Miao Yan <yanmiaobest@gmail.com>
> ---
>  include/configs/qemu-x86.h | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
> index 4258dcb..657b8af 100644
> --- a/include/configs/qemu-x86.h
> +++ b/include/configs/qemu-x86.h
> @@ -57,4 +57,17 @@
>  #undef CONFIG_ENV_IS_IN_SPI_FLASH
>  #define CONFIG_ENV_IS_NOWHERE
>
> +/* default ramdisk load address */
> +#define CONFIG_RAMDISK_ADDR    0x04000000
> +
> +#undef CONFIG_EXTRA_ENV_SETTINGS
> +#define CONFIG_EXTRA_ENV_SETTINGS                      \
> +       CONFIG_STD_DEVICES_SETTINGS                     \
> +       "pciconfighost=1\0"                             \
> +       "netdev=eth0\0"                                 \
> +       "consoledev=ttyS0\0"                            \
> +       "othbootargs=acpi=off\0"                        \
> +       "ramdiskaddr=0x4000000\0"                       \
> +       "ramdiskfile=initramfs.gz\0"
> +

Please move the changes to x86-common.h. This can be generic for all
x86 targets.

>  #endif /* __CONFIG_H */
> --

Regards,
Bin
diff mbox

Patch

diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index 4258dcb..657b8af 100644
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -57,4 +57,17 @@ 
 #undef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_IS_NOWHERE
 
+/* default ramdisk load address */
+#define CONFIG_RAMDISK_ADDR	0x04000000
+
+#undef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS			\
+	CONFIG_STD_DEVICES_SETTINGS			\
+	"pciconfighost=1\0"				\
+	"netdev=eth0\0"					\
+	"consoledev=ttyS0\0"				\
+	"othbootargs=acpi=off\0"			\
+	"ramdiskaddr=0x4000000\0"			\
+	"ramdiskfile=initramfs.gz\0"
+
 #endif	/* __CONFIG_H */