From: Simon Glass <sjg@chromium.org>
Date: Mon, 31 Jul 2023 03:01:51 +0000 (-0600)
Subject: x86: Drop unused distro settings
X-Git-Tag: baikal/mips/sdk6.2~4^2~3^2~43^2~14
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=3a15378fa42db626502706b1a94420eeb526bfc2;p=uboot.git

x86: Drop unused distro settings

No x86 board uses distro boot, so drop these settings.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> # Intel Edison
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index e05f667d72..8bd0716c08 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -20,18 +20,11 @@
 #define CFG_OTHBOOTARGS	"othbootargs=acpi=off\0"
 #endif
 
-#if defined(CONFIG_DISTRO_DEFAULTS)
-#define DISTRO_BOOTENV		BOOTENV
-#else
-#define DISTRO_BOOTENV
-#endif
-
 #ifndef SPLASH_SETTINGS
 #define SPLASH_SETTINGS
 #endif
 
 #define CFG_EXTRA_ENV_SETTINGS			\
-	DISTRO_BOOTENV					\
 	CFG_STD_DEVICES_SETTINGS			\
 	SPLASH_SETTINGS					\
 	"pciconfighost=1\0"				\