diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-31 08:08:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-31 08:08:33 -0500 |
| commit | 51ae59228c443d2f7e1d567a3cc83130465d1426 (patch) | |
| tree | 940bca6eca4099b28edd7f36dfe82f747ccd6034 /include | |
| parent | 9735326fff8488663e27350917ccf01f2e71730a (diff) | |
| parent | 881bb9ab398419c33c9021ee8b2bbd8412882230 (diff) | |
Merge git://git.denx.de/u-boot-x86
This includes x86 edison defconfig file clean up, and coreboot file
system (cbfs) fixes.
Diffstat (limited to 'include')
| -rw-r--r-- | include/cbfs.h | 14 | ||||
| -rw-r--r-- | include/configs/edison.h | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/cbfs.h b/include/cbfs.h index 1b88ec04ae5..bd1bf75bbfc 100644 --- a/include/cbfs.h +++ b/include/cbfs.h @@ -18,16 +18,26 @@ enum cbfs_result { }; enum cbfs_filetype { + CBFS_TYPE_BOOTBLOCK = 0x01, + CBFS_TYPE_CBFSHEADER = 0x02, CBFS_TYPE_STAGE = 0x10, CBFS_TYPE_PAYLOAD = 0x20, + CBFS_TYPE_FIT = 0x21, CBFS_TYPE_OPTIONROM = 0x30, CBFS_TYPE_BOOTSPLASH = 0x40, CBFS_TYPE_RAW = 0x50, CBFS_TYPE_VSA = 0x51, CBFS_TYPE_MBI = 0x52, CBFS_TYPE_MICROCODE = 0x53, - CBFS_COMPONENT_CMOS_DEFAULT = 0xaa, - CBFS_COMPONENT_CMOS_LAYOUT = 0x01aa + CBFS_TYPE_FSP = 0x60, + CBFS_TYPE_MRC = 0x61, + CBFS_TYPE_MMA = 0x62, + CBFS_TYPE_EFI = 0x63, + CBFS_TYPE_STRUCT = 0x70, + CBFS_TYPE_CMOS_DEFAULT = 0xaa, + CBFS_TYPE_SPD = 0xab, + CBFS_TYPE_MRC_CACHE = 0xac, + CBFS_TYPE_CMOS_LAYOUT = 0x01aa }; struct cbfs_header { diff --git a/include/configs/edison.h b/include/configs/edison.h index 86c584d73dc..a6155ba5a8b 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -8,13 +8,6 @@ #include <asm/ibmpc.h> -/* ACPI */ - -/* Boot */ -#define CONFIG_BOOTCOMMAND "run bootcmd" - -/* DISK Partition support */ - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 2048 @@ -43,9 +36,6 @@ #define CONFIG_ENV_OFFSET_REDUND (6 * 1024 * 1024) #define CONFIG_SUPPORT_EMMC_BOOT -/* PCI */ -#define CONFIG_CMD_PCI - /* RTC */ #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0 |