mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-12-15 15:53:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n

Browse Source 
Use DISTRO_BOOTENV to decouple BOOTENV from CONFIG_DISTRO_DEFAULTS.

Reported-by: Heinrich Schuchardt <xypron.debian@gmx.de>
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Bin Meng 2019-08-14 01:23:05 -07:00
parent 81fed78c0a
commit 039c031e08
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/configs/x86-common.h
View File

@ -105,11 +105,14 @@
#define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0"
#endif
#ifndef CONFIG_DISTRO_DEFAULTS
#define BOOTENV
#if defined(CONFIG_DISTRO_DEFAULTS)
#define DISTRO_BOOTENV BOOTENV
#else
#define DISTRO_BOOTENV
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
DISTRO_BOOTENV \
CONFIG_STD_DEVICES_SETTINGS \
"pciconfighost=1\0" \
"netdev=eth0\0" \
@ -118,8 +121,8 @@
"scriptaddr=0x7000000\0" \
"kernel_addr_r=0x1000000\0" \
"ramdisk_addr_r=0x4000000\0" \
"ramdiskfile=initramfs.gz\0" \
BOOTENV
"ramdiskfile=initramfs.gz\0"
#define CONFIG_RAMBOOTCOMMAND \
"setenv bootargs root=/dev/ram rw " \