[U-Boot] x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n
diff mbox series

Message ID 1565770985-7754-1-git-send-email-bmeng.cn@gmail.com
State Accepted
Delegated to: Bin Meng
Headers show
Series
  • [U-Boot] x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n
Related show

Commit Message

Bin Meng Aug. 14, 2019, 8:23 a.m. UTC
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>
---

 include/configs/x86-common.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Comments

Bin Meng Aug. 16, 2019, 2:30 p.m. UTC | #1
On Wed, Aug 14, 2019 at 4:23 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> 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>
> ---
>
>  include/configs/x86-common.h | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>

applied to u-boot-x86, thanks!

Patch
diff mbox series

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index ca27a4f..54214f9 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 "		\