Re: [U-Boot] [PATCH] x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n

2019-08-16 Thread Bin Meng 
On Wed, Aug 14, 2019 at 4:23 PM Bin Meng  wrote:
>
> Use DISTRO_BOOTENV to decouple BOOTENV from CONFIG_DISTRO_DEFAULTS.
>
> Reported-by: Heinrich Schuchardt 
> Signed-off-by: Bin Meng 
> ---
>
>  include/configs/x86-common.h | 11 +++
>  1 file changed, 7 insertions(+), 4 deletions(-)
>

applied to u-boot-x86, thanks!
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH] x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n

2019-08-14 Thread Bin Meng 
Use DISTRO_BOOTENV to decouple BOOTENV from CONFIG_DISTRO_DEFAULTS.

Reported-by: Heinrich Schuchardt 
Signed-off-by: Bin Meng 
---

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

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=0x700\0"\
"kernel_addr_r=0x100\0" \
"ramdisk_addr_r=0x400\0"\
-   "ramdiskfile=initramfs.gz\0"\
-   BOOTENV
+   "ramdiskfile=initramfs.gz\0"
+
 
 #define CONFIG_RAMBOOTCOMMAND  \
"setenv bootargs root=/dev/ram rw " \
-- 
2.7.4

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot