summaryrefslogtreecommitdiff
path: root/com32
Commit message (Collapse)AuthorAgeFilesLines
* com32: add dependency on com32.ld -> *.elfsyslinux-3.81-pre13H. Peter Anvin2009-05-251-3/+4
| | | | | | All the *.elf files depend on com32.ld, so make that explicit. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Don't set the autocr flag on the serial console; clean up crapsyslinux-3.81-pre12H. Peter Anvin2009-05-235-45/+6
| | | | | | | | | | | | | libutil would set the autocr flag on the serial console, which really never was any point -- we already do \n -> \r\n conversion explicitly in the serial code. This was always very annoying to deal with if the menu was interrupted. Furthermore, drop completely unnecessary initialization/deinitialization routines that completely duplicated other code. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Drop support for ACPI 3 E820 extended memory attributesH. Peter Anvin2009-05-212-18/+0
| | | | | | | | | | | | | | Drop all support for ACPI 3 E820 extended memory attributes. There are BIOSes in the field that report completely bogus information here, resulting in no memory at all being detected (we then fall back to E801 detection, but that is problematic in its own ways.) There is strong reasons to believe at this point that the extended memory attributes are not usable in their current form, so drop them and revert back to simple 20-byte support, including for MEMDISK spoofing. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* chain.c32: remove clobber of drivename/partitionH. Peter Anvin2009-05-211-3/+0
| | | | | | | | Remove a clobber of drivename and partition, after we have spent time computing what the should have been... Reported-by: Luciano Miguel Ferreira Rocha <strange@nsk.no-ip.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* meminfo: distinguish between no flags and flags=1syslinux-3.81-pre7H. Peter Anvin2009-05-201-5/+10
| | | | | | | For debugging reasons it's important to know if we have no flags at all or if we get flags = 1. Print [-] in the case of no flags at all. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* bcopyxx/memmove: fix alignment logic for reverse movesH. Peter Anvin2009-05-161-2/+2
| | | | | | | | | The alignment logic for reverse moves is reversed, because the initial edi, and therefore edx, points to the last byte, not to one byte beyond the end. Therefore, in the fully aligned case it will end in 11 binary, not in 00 binary as for the forward case. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* linux.c32: replace the kernel name with BOOT_IMAGE=syslinux-3.81-pre2H. Peter Anvin2009-05-051-13/+10
| | | | | | | | | The BOOT_IMAGE= argument is generated by replacing the kernel name in the argument array. As a result, we shouldn't advance argp. Move the code around slightly, to make it more obvious that that is what is happening. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* linux.c32: honor the "quiet" flagH. Peter Anvin2009-05-051-6/+34
| | | | | | | Honor the "quiet" flag for linux.c32, since some distros have odd notions about these things. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* load_linux.c: quiet warningH. Peter Anvin2009-05-041-1/+1
| | | | | | Quiet a (harmless) compiler warning. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* load_linux.c: consider a zImage kernel to be non-relocatableH. Peter Anvin2009-05-041-1/+1
| | | | | | | | It's pretty safe to say there has never been a working relocatable Linux zImage kernel, and the semantics for them are iffy at best. Consider zImage kernels to be non-relocatable. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* load_linux.c: when relocating, need to update code32_startH. Peter Anvin2009-05-041-0/+1
| | | | | | | | The normal value for code32_start is based on the kernel load address (in fact, it usually *is* the kernel load address); accordingly, it needs to be updated if the kernel is relocated. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* load_linux.c: add missing header fileH. Peter Anvin2009-05-041-0/+1
| | | | | | We need <minmax.h> for min(). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* linux.c32: cap the stack pointer to 0xfff0H. Peter Anvin2009-05-041-1/+2
| | | | | | | | Linux itself is fine with sp = 0 for a 64K segment, but perhaps other things aren't. Just to be safe, set the stack pointer to 64K-16 bytes. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* shuffler: fix setting up esp in real-mode shufflesH. Peter Anvin2009-05-041-1/+1
| | | | | | | The value of esp set in real-mode shuffles was wrong. This unfortunately broke linux.c32 :( Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: handle ELF Multiboot kernel where paddr != vaddrH. Peter Anvin2009-05-031-4/+11
| | | | | | | | | The way Grub handles ELF Multiboot kernels where paddr != vaddr is to load at the paddr, but to also adjust the entry point (e_entry) so that the previous vaddr becomes a paddr. Since the Multiboot spec is pretty much "Grub wins", follow this behavior. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* shuffler: when looking for temporary memory, it has to be *free!*syslinux-3.80-pre8H. Peter Anvin2009-05-031-0/+2
| | | | | | | free_area() ended up looking for any area of memory, not necessarily a *free* area of memory. This had predictably disastrous consequences. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* movebits: make the user-space test cases slightly easierH. Peter Anvin2009-05-031-9/+12
| | | | | | | Make it a bit easier to write user-space test cases; use fgets+sscanf so comment lines end up getting ignored. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* shuffler: correctly handle one-to-many relationshipssyslinux-3.80-pre7H. Peter Anvin2009-05-022-26/+133
| | | | | | | | | | | | | | | | | | One-to-many relationships, in which one chunk of a file is used in more than one place, tends to naturally show up in decoding certain fileformats, including (but not limited to) Microsoft SDI. Make the shuffler library handle those cases correctly, and remove a special-purpose hack in sdi.c. This is based on the observation that all one-to-many relationships can be treated as a one-to-one shuffle followed by destination-to-destination copies; i.e. one copy is (arbitrarily) assigned the "master copy" status, and all aliases are then copied from the master copy when the master copy is already in its final place. All other copies can then be simply ignored for the duration of the shuffle, just as zero-memory is. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* shuffle: align the shuffle safe areaH. Peter Anvin2009-05-021-2/+3
| | | | | | For performance, align the shuffle safe area to a dword boundary. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* syslinux_dump_memmap(): make it easier to spot errorsH. Peter Anvin2009-05-021-1/+1
| | | | | | | | Instead of stopping the memmap dump on SMT_END, stop it only on a null pointer. That way we can see if we have any bogus entries with SMT_END. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* syslinux_add_memmap(): fix failures at address zero, more?H. Peter Anvin2009-05-021-38/+63
| | | | | | | | | | | | syslinux_add_memmap() would fail miserably and corrupt the list if an entry was added at address zero. Quite possibly other addresses would have similar problems. Furthermore, we did an extra "optimization pass" which should never have been necessary if the algorithm had been correct in the first place. This should hopefully fix ALL those bugs. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: align the stack to a 16-byte boundaryH. Peter Anvin2009-05-021-1/+1
| | | | | | Align the stack to a 16-byte boundary, just in case... Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: move setting regs.eax to mboot_run()H. Peter Anvin2009-05-021-2/+1
| | | | | | | The setting of regs.eax in map_image() doesn't really make any sense; move it to mboot_run() instead. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: move map initialization out of map_image()H. Peter Anvin2009-05-023-35/+38
| | | | | | | | | The amap/mmap initialization were buried randomly inside map_image(), which at the very least makes the code needlessly hard to read. Furthermore, it is at least possible that we may want to be able to map multiple images in the future. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* cmenu: add .gitignore fileH. Peter Anvin2009-04-301-0/+2
| | | | | | Add .gitignore file for .c files created from .menu files. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: disable DEBUGH. Peter Anvin2009-04-301-1/+1
| | | | | | | | Disable DEBUG in mboot.c32, which was accidentally enabled in a previous commit. Reported-by: Sebastian Herbszt <herbszt@gmx.de> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* linux.c32: move handling of mem= and vga= into the library functionsyslinux-3.80-pre5H. Peter Anvin2009-04-294-78/+99
| | | | | | | Move the handling of mem= and vga= into syslinux_boot_linux(), so that the user of that function doesn't need to worry about it. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* shuffle_pm: remove unused variables and includesH. Peter Anvin2009-04-281-7/+1
| | | | | | | Remove unused variables and #include statements from syslinux_shuffle_boot_pm(). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* memscan: use the contents of the ebda_seg, not the pointer itselfH. Peter Anvin2009-04-281-1/+1
| | | | | | Use the contents of the ebda_seg variable, not the address... Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: silence warningH. Peter Anvin2009-04-281-0/+1
| | | | | | Silence warning of unused argc. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: include module filenames in the command lineH. Peter Anvin2009-04-281-1/+4
| | | | | | | Grub includes the kernel and module filenames in the command lines it passes, so match that behavior and don't strip them off. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Unify dependency generation: com32/lib, com32/cmenuH. Peter Anvin2009-04-273-18/+19
| | | | | | Add the unified dependency generation to com32/lib and com32/cmenu. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Unify dependency generationH. Peter Anvin2009-04-271-8/+10
| | | | | | | | | | | | Make the dependency generation more common; have a general pattern in MCONFIG, and use it in rules (not in CFLAGS). For NASM source, in order to stay compatible with old versions of NASM, run NASM twice; newer versions of NASM is capable of generating dependencies simultaneously like gcc can, but that would break compatibility with older distros. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* memscan: correctly handle the DOS memory fallback caseH. Peter Anvin2009-04-271-4/+4
| | | | | | Actually (try to) handle the case of finding the DOS memory amount. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: add header guards; use <inttypes.h>; formatting changesH. Peter Anvin2009-04-272-46/+36
| | | | | | | Reformat the mboot header files slightly, use <inttypes.h> types, and add header inclusion guards. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot/solaris.c: fix failure case; correct copyright noticeH. Peter Anvin2009-04-271-5/+6
| | | | Better handling of failed mapping; correct copyright notice.
* mboot: reimplement the Solaris DHCP hack, add compliant a.out modesyslinux-3.80-pre1H. Peter Anvin2009-04-265-6/+83
| | | | | | | | | | | | | Reimplement the Solaris DHCP information passing hack. Add a spec-compliant mode for the "a.out kludge". The spec is pretty clear that the bit should override the ELF header (after all, otherwise there wouldn't be any need for the bit), but Grub disagrees. We default to Grub-compliant mode, as Solaris seems to set the bit even though it's an ELF kernel, but add the option to enable spec-compliant mode, as apparently some versions of FreeBSD need it. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* Remove the old mboot modulenew-mbootH. Peter Anvin2009-04-265-1629/+1
|
* mboot: fix cmdline; a few more layout tweaksH. Peter Anvin2009-04-264-30/+38
| | | | | | | | | | Fix module command lines (it was overwriting the main kernel command line); a few minor layout tweaks. In particular, we require the section header to be page-aligned, but not the subsequent sections. With this, I can get Xen to boot. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: skip --- marker; decompress all filesH. Peter Anvin2009-04-261-7/+5
| | | | | | | | | When walking the argument list we need to skip --- markers. Grub, and the old mboot.c32, seem to transparently decompress all files, not just the main one, so do the same. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: make sure we actually succeed when we finishedH. Peter Anvin2009-04-262-18/+44
| | | | | | | When we actually finished mapping the image, return 0 and don't bail. Add error messages to most failure cases. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* com32/MCONFIG: generate dependency files by defaultH. Peter Anvin2009-04-261-2/+4
| | | | | | | Generate the dependency files by default. They should perhaps even move into the actual rule lines. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* mboot: set up a stack even though the spec doesn't require itH. Peter Anvin2009-04-261-0/+18
| | | | | | | Set up a stack for the Multiboot OS even though it is not required by spec. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* First attempt at a rewritten mboot moduleH. Peter Anvin2009-04-269-1/+1228
| | | | | | | First attempt at rewriting the mboot module to use the Syslinux shuffle APIs. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* shuffle_rm: clean up the trampoline generator with macrosH. Peter Anvin2009-04-231-31/+50
| | | | | | | Define macros for common constructs to clean up the rm trampoline generator. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* shuffle_rm: set up SS:ESP and segs as quickly as possibleH. Peter Anvin2009-04-231-13/+40
| | | | | | | For extra paranoia's sake, set up SS:ESP immediately after the real-mode switch, and then set all the segment registers. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* hdt: fix conflictErwan Velu2009-04-231-24/+0
| | | | | | Impact: making build working again A forgoten conflict
* Merge branch 'master' of git://git.kernel.org/pub/scm/boot/syslinux/syslinux ↵Erwan Velu2009-04-2326-53/+61
|\ | | | | | | | | | | | | | | | | | | into mainline Conflicts: com32/hdt/hdt-cli-pci.c com32/hdt/hdt-cli-vesa.c com32/hdt/hdt-common.c com32/hdt/hdt-menu-dmi.c
| * Global whitespace cleanup.H. Peter Anvin2009-04-2025-51/+38
| | | | | | | | Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| * hdt: fix format string warningsSebastian Herbszt2009-04-172-5/+3
| | | | | | | | | | | | Fix format string warnings spit by the compiler. - Sebastian
View Lorry Controller Status