diff options
| author | Tom Rini <[email protected]> | 2019-08-19 09:21:46 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-08-19 09:21:46 -0400 |
| commit | 0ed2e2d825ac70d99ef89e3bb745979a22e2972e (patch) | |
| tree | 1ae055f2a6243c62af81ac0ce31fc49db3f8f2e2 /include/configs | |
| parent | 81fed78c0a59af0d5698b13608eb4d26be84f397 (diff) | |
| parent | d117f917bfd2ccf4eaf90bddfa256501a554b1a4 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- QEMU build warning fix when CONFIG_DISTRO_DEFAULTS=n
- Small fixes on x86 reST docs
- Allow CBFS to be used in SPL
- Remove x86 specific GD flags
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/x86-common.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index ca27a4f9e24..54214f99e9a 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 " \ |