diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-14 10:57:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-14 10:57:15 -0400 |
| commit | b7a919b6c85979205761bca7d39767adb52ac3f3 (patch) | |
| tree | dd16747d1d2813b872db716a3f3d16b0868dc919 | |
| parent | c96137000e4cf486dcb164fd67a1a0b5b2fb99c6 (diff) | |
| parent | 92a3e67ee9b0e1b2294a3d16e851b83440de2a1f (diff) | |
| download | u-boot-b7a919b6c85979205761bca7d39767adb52ac3f3.zip u-boot-b7a919b6c85979205761bca7d39767adb52ac3f3.tar.gz u-boot-b7a919b6c85979205761bca7d39767adb52ac3f3.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- Trivial fixes for x86
| -rw-r--r-- | arch/x86/include/asm/intel_gnvs.h | 8 | ||||
| -rw-r--r-- | board/coreboot/coreboot/MAINTAINERS | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/include/asm/intel_gnvs.h b/arch/x86/include/asm/intel_gnvs.h index fc743dc..0b69530 100644 --- a/arch/x86/include/asm/intel_gnvs.h +++ b/arch/x86/include/asm/intel_gnvs.h @@ -47,7 +47,13 @@ enum { BINF_RW_B = 2 }; -enum { +/** + * enum cros_fw_type_t - Used to indicate Chromium OS firmware type + * + * Chromium OS uses a region of the GNVS starting at offset 0x100 to store + * various bits of information, including the type of firmware being booted + */ +enum cros_fw_type_t { FIRMWARE_TYPE_AUTO_DETECT = -1, FIRMWARE_TYPE_RECOVERY = 0, FIRMWARE_TYPE_NORMAL = 1, diff --git a/board/coreboot/coreboot/MAINTAINERS b/board/coreboot/coreboot/MAINTAINERS index a05673b..ee12d32 100644 --- a/board/coreboot/coreboot/MAINTAINERS +++ b/board/coreboot/coreboot/MAINTAINERS @@ -2,12 +2,12 @@ COREBOOT BOARD M: Simon Glass <sjg@chromium.org> S: Maintained F: board/coreboot/coreboot/ -F: include/configs/chromebook_link.h +F: include/configs/coreboot.h F: configs/coreboot_defconfig COREBOOT64 BOARD M: Simon Glass <sjg@chromium.org> S: Maintained F: board/coreboot/coreboot/ -F: include/configs/chromebook_link.h +F: include/configs/coreboot.h F: configs/coreboot64_defconfig |