diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2019-07-28 08:13:58 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2019-08-09 22:24:02 +0800 |
| commit | 68d70a1cf6f0d4f7f013af1652b1525042f38daf (patch) | |
| tree | 0318ff7da62cf4902205c04e771c5abb5f7d3c5e /include/configs/qemu-x86.h | |
| parent | 00f237e226bc8a6ecf168ca0d2e1853f203f17d1 (diff) | |
x86: qemu: Fix non-working ramboot and nfsboot environment variables
With qemu-x86 starting to use config_distro_bootcmd, the pre-defined
ramboot and nfsboot commands do not work any more. This is caused by
undefined environment variable 'ramdiskaddr' that was previously set
in CONFIG_EXTRA_ENV_SETTINGS but later CONFIG_EXTRA_ENV_SETTINGS was
redefined for distro boot.
Update the x86 generic CONFIG_EXTRA_ENV_SETTINGS to consider distro
boot, and remove the one in qemu-x86.h.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'include/configs/qemu-x86.h')
| -rw-r--r-- | include/configs/qemu-x86.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 097ed414f8..c5574201dd 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -27,16 +27,6 @@ #define CONFIG_PREBOOT "pci enum" -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_STD_DEVICES_SETTINGS \ - "scriptaddr=0x7000000\0" \ - "kernel_addr_r=0x1000000\0" \ - "ramdisk_addr_r=0x4000000\0" \ - "consoledev=ttyS0\0" \ - CONFIG_OTHBOOTARGS \ - BOOTENV - #define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ |