From: Bin Meng <bmeng.cn@gmail.com>
Date: Wed, 14 Aug 2019 08:23:05 +0000 (-0700)
Subject: x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=039c031e080c5b127c036a5db73e1ba91f5c0ed1;p=u-boot.git

x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n

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>
---

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index ca27a4f9e2..54214f99e9 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -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 "		\