eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-x86: Use config_distro_bootcmd

Browse Source 
Converts qemu x86 machines to boot using distro_config. The intent is to
allow u-boot in qemu to be maximally compatible with many boot methods
without having to change the config. Previously, u-boot would only boot
in a very limited set of circumstances where there was a /boot/vmlinuz
on scsi 0:3 with no ramdisk.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: convert doc updates to reST]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Joshua Watt
2019-07-03 12:45:32 -05:00
committed by Bin Meng
parent 42ef707922
commit 00f237e226
4 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/configs/qemu-x86.h
View File

@@ -10,8 +10,33 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#include <linux/sizes.h>
#define BOOT_TARGET_DEVICES(func) \
func(USB, usb, 0) \
func(SCSI, scsi, 0) \
func(VIRTIO, virtio, 0) \
func(IDE, ide, 0) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
#include <configs/x86-common.h>
#undef CONFIG_ENV_SIZE
#define CONFIG_ENV_SIZE SZ_256K
#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" \