diff options
| author | Tom Rini <[email protected]> | 2022-01-13 07:34:27 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-01-13 07:34:27 -0500 |
| commit | 37b876359fbd90434b37527fa96f72a31af20f81 (patch) | |
| tree | 3a8d677b0e1f0038d84aca54986047968e27b007 /boot | |
| parent | a02af84e03e018d7cd08bb3070cbe5517004712b (diff) | |
| parent | 6e4a7eaf7d6c9aedafa19aa57553ae44dba5ca0d (diff) | |
Merge branch '2022-01-12-assorted-updates'
- Fix binman fake blob support to write outside source directory
- Azure now has stages in the pipeline
- Update to latest focal tag for containers in CI.
- Finish dropping LynxOS
- Add migration message for timer code
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/image.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/boot/image.c b/boot/image.c index f792f2aa69a..c7ab034e08f 100644 --- a/boot/image.c +++ b/boot/image.c @@ -102,9 +102,6 @@ static const table_entry_t uimage_os[] = { { IH_OS_INVALID, "invalid", "Invalid OS", }, { IH_OS_ARM_TRUSTED_FIRMWARE, "arm-trusted-firmware", "ARM Trusted Firmware" }, { IH_OS_LINUX, "linux", "Linux", }, -#if defined(USE_HOSTCC) - { IH_OS_LYNXOS, "lynxos", "LynxOS", }, -#endif { IH_OS_NETBSD, "netbsd", "NetBSD", }, { IH_OS_OSE, "ose", "Enea OSE", }, { IH_OS_PLAN9, "plan9", "Plan 9", }, |
