diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-12-06 10:13:41 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-12-06 10:47:31 +0000 |
| commit | ddb10ce99c327888ade4d2ba3e4c50ad12aaa059 (patch) | |
| tree | b9f0cbe427b4a4d8441857990fd4410ee4635676 /com32/elflink/ldlinux | |
| parent | e4b3ce2dd82ce2da85c37fd3f332ec2eb802b734 (diff) | |
| download | syslinux-ddb10ce99c327888ade4d2ba3e4c50ad12aaa059.tar.gz syslinux-ddb10ce99c327888ade4d2ba3e4c50ad12aaa059.tar.xz syslinux-ddb10ce99c327888ade4d2ba3e4c50ad12aaa059.zip | |
Delete 16-bit COMBOOT supportsyslinux-5.00
16-bit COMBOOT files are no longer supported by Syslinux in 5.00 so
delete all references and change any 32-bit COMBOOT image references
to mention ELF instead.
Some of the COMBOOT stuff is still used internally so we can't nuke
core/comboot.inc yet, but that will disappear in a future release.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/elflink/ldlinux')
| -rw-r--r-- | com32/elflink/ldlinux/execute.c | 1 | ||||
| -rw-r--r-- | com32/elflink/ldlinux/ldlinux.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/com32/elflink/ldlinux/execute.c b/com32/elflink/ldlinux/execute.c index bfb26ffb..727df50a 100644 --- a/com32/elflink/ldlinux/execute.c +++ b/com32/elflink/ldlinux/execute.c @@ -39,7 +39,6 @@ const struct image_types image_boot_types[] = { { "bss", IMAGE_TYPE_BSS }, { "pxe", IMAGE_TYPE_PXE }, { "fdimage", IMAGE_TYPE_FDIMAGE }, - { "comboot", IMAGE_TYPE_COMBOOT }, { "com32", IMAGE_TYPE_COM32 }, { "config", IMAGE_TYPE_CONFIG }, { NULL, 0 }, diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c index 484ebe52..6f9f20fa 100644 --- a/com32/elflink/ldlinux/ldlinux.c +++ b/com32/elflink/ldlinux/ldlinux.c @@ -21,8 +21,6 @@ struct file_ext { }; static const struct file_ext file_extensions[] = { - { ".com", IMAGE_TYPE_COMBOOT }, - { ".cbt", IMAGE_TYPE_COMBOOT }, { ".c32", IMAGE_TYPE_COM32 }, { ".img", IMAGE_TYPE_FDIMAGE }, { ".bss", IMAGE_TYPE_BSS }, |