projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...
[platform/kernel/u-boot.git]
/
include
/
configs
/
x86-common.h
diff --git
a/include/configs/x86-common.h
b/include/configs/x86-common.h
index
ca27a4f
..
bd62798
100644
(file)
--- a/
include/configs/x86-common.h
+++ b/
include/configs/x86-common.h
@@
-18,8
+18,6
@@
#define CONFIG_LMB
#define CONFIG_LMB
-#undef CONFIG_ZLIB
-#undef CONFIG_GZIP
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
/* SATA AHCI storage */
#define CONFIG_SYS_BOOTM_LEN (16 << 20)
/* SATA AHCI storage */
@@
-43,10
+41,6
@@
*/
#define CONFIG_SYS_NS16550_PORT_MAPPED
*/
#define CONFIG_SYS_NS16550_PORT_MAPPED
-/*-----------------------------------------------------------------------
- * Command line configuration.
- */
-
#ifndef CONFIG_BOOTCOMMAND
#define CONFIG_BOOTCOMMAND \
"ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000"
#ifndef CONFIG_BOOTCOMMAND
#define CONFIG_BOOTCOMMAND \
"ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000"
@@
-61,8
+55,6
@@
*/
#define CONFIG_SYS_CBSIZE 512
*/
#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_MEMTEST_START 0x00100000
-#define CONFIG_SYS_MEMTEST_END 0x01000000
#define CONFIG_SYS_LOAD_ADDR 0x20000000
/*-----------------------------------------------------------------------
#define CONFIG_SYS_LOAD_ADDR 0x20000000
/*-----------------------------------------------------------------------
@@
-79,7
+71,6
@@
/*-----------------------------------------------------------------------
* Environment configuration
*/
/*-----------------------------------------------------------------------
* Environment configuration
*/
-#define CONFIG_ENV_SIZE 0x01000
/*-----------------------------------------------------------------------
* PCI configuration
/*-----------------------------------------------------------------------
* PCI configuration
@@
-105,11
+96,14
@@
#define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0"
#endif
#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 \
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
+ DISTRO_BOOTENV \
CONFIG_STD_DEVICES_SETTINGS \
"pciconfighost=1\0" \
"netdev=eth0\0" \
CONFIG_STD_DEVICES_SETTINGS \
"pciconfighost=1\0" \
"netdev=eth0\0" \
@@
-118,8
+112,8
@@
"scriptaddr=0x7000000\0" \
"kernel_addr_r=0x1000000\0" \
"ramdisk_addr_r=0x4000000\0" \
"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 " \
#define CONFIG_RAMBOOTCOMMAND \
"setenv bootargs root=/dev/ram rw " \