x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n
PATCH 1/1 x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n
Use DISTRO_BOOTENV to decouple BOOTENV from CONFIG_DISTRO_DEFAULTS.
Reported-by Heinrich Schuchardt <[email protected]>
Signed-off-by Bin Meng <[email protected]>
---
include/configs/x86-common.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
include/configs/x86-common.h +7 -4
@@ -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 " \
Signature · 1 line
2.7.4
PATCH 1/1 x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n
Quoted 10 lines · Bin Meng
Use
DISTRO_BOOTENVto decouple BOOTENV fromCONFIG_DISTRO_DEFAULTS.Reported-by Heinrich Schuchardt <[email protected]>Signed-off-by Bin Meng <[email protected]>---
include/configs/x86-common.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
applied to u-boot-x86, thanks!