Matt Fleming [Wed, 6 Apr 2011 11:59:29 +0000 (12:59 +0100)]
ldlinux, cli: Do not assign 'comm_counter' unnecessarily
There's no need to assign a value to 'comm_counter' at the start of
the edit_cmdline() because it is always assigned before being used.
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
H. Peter Anvin [Mon, 4 Apr 2011 21:12:08 +0000 (14:12 -0700)]
Merge commit 'syslinux-4.04-pre18' into elflink
H. Peter Anvin [Mon, 4 Apr 2011 21:11:53 +0000 (14:11 -0700)]
Merge remote-tracking branch 'mfleming/for-hpa/elflink/ldlinux' into elflink
H. Peter Anvin [Mon, 4 Apr 2011 21:11:50 +0000 (14:11 -0700)]
Merge remote-tracking branch 'mfleming/for-hpa/elflink/cmdline' into elflink
H. Peter Anvin [Mon, 4 Apr 2011 21:11:47 +0000 (14:11 -0700)]
Merge remote-tracking branch 'mfleming/for-hpa/elflink/core' into elflink
H. Peter Anvin [Mon, 4 Apr 2011 20:11:13 +0000 (13:11 -0700)]
NEWS: update the NEWS file
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 4 Apr 2011 20:10:49 +0000 (13:10 -0700)]
pxe: disable the "force INT 18h" hack
It seems to break as many machines as it fixes, so disable it for now.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 4 Apr 2011 17:36:12 +0000 (10:36 -0700)]
com32, bitops: an "m" constraint takes an object, not a pointer to one
The argument to an "m" constraint is an object, not a pointer to an
object. For a void pointer it needs to be cast to an indirectable
type (like char) and then indirected.
Reported-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Mon, 4 Apr 2011 17:31:09 +0000 (10:31 -0700)]
com32: fix range handling in vsscanf
Fix multiple errors in building the bitmap for ranges in %[.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Mon, 4 Apr 2011 16:58:44 +0000 (09:58 -0700)]
bitops: the bt instructions returns result in CF, not ZF
The bit test instructions returns the tested bit in CF, not the
inverse of the tested bit in ZF. I don't know how I got that idea...
Reported-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Matt Fleming [Mon, 4 Apr 2011 09:45:25 +0000 (10:45 +0100)]
Merge remote-tracking branch 'zytor/master' into elflink-merge
Conflicts:
com32/lib/Makefile
com32/lib/sys/open.c
version
H. Peter Anvin [Sun, 3 Apr 2011 23:22:42 +0000 (16:22 -0700)]
diskstart: Move DATE_STR out of sector 1
Save a few bytes in sector 1 by moving DATE_STR out. This string can
be fairly long especially when using a git tree.
Reported-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Fri, 1 Apr 2011 23:53:22 +0000 (16:53 -0700)]
Merge remote-tracking branch 'genec/memdiskdbg-for-sha0'
Gene Cumm [Fri, 1 Apr 2011 23:49:54 +0000 (19:49 -0400)]
memdisk/dskprobe.c: Add status check to probes 08h and 41h
If this fails, the machine should never be working.
Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
H. Peter Anvin [Fri, 1 Apr 2011 22:51:49 +0000 (15:51 -0700)]
Merge remote-tracking branch 'genec/diag-mbr-handoff-for-hpa'
H. Peter Anvin [Fri, 1 Apr 2011 22:51:46 +0000 (15:51 -0700)]
Merge remote-tracking branch 'genec/diag-geodsp-for-hpa'
H. Peter Anvin [Fri, 1 Apr 2011 20:08:40 +0000 (13:08 -0700)]
gpxe: Inhibit parallel make
Don't parallel make the gpxe directory.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Sebastian Herbszt [Wed, 30 Mar 2011 21:41:08 +0000 (23:41 +0200)]
Update .gitignore
Add *.img, *.img.xz and mk-lba-img to .gitignore.
Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Fri, 1 Apr 2011 20:05:24 +0000 (13:05 -0700)]
Merge remote-tracking branch 'sherbszt/gfxboot32'
H. Peter Anvin [Fri, 1 Apr 2011 19:59:04 +0000 (12:59 -0700)]
ld: Use ABSOLUTE() when taking differences between relative symbols
binutils 2.21.51.0.6, and possibly other versions, generate the wrong
result when subtracting two section-relative symbols (the final result
ends up having the base of the section incorrectly added to it.) Work
around this by using ABSOLUTE() on the symbols to force the result to
become absolute.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Matt Fleming [Mon, 28 Mar 2011 16:47:37 +0000 (17:47 +0100)]
ldlinux: Perform auto-boot if NOESCAPE set in config file
The previous logic for detecting when to perform an auto-boot was
incorrect, we should try to auto-boot if NOESCAPE is set in the config
file.
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Thu, 31 Mar 2011 13:50:19 +0000 (14:50 +0100)]
ldlinux, cli: Add support for F-keys
The old asm command-line interface had support for printing files
containing help messages when the F-keys (F1-F10) were pressed. Add
this support to ldlinux.
The config parser already had support for parsing config files with
F-key directives and the cli code already had support for executing
callbacks when one of the F-keys was hit, so this patch simply glues
all the pieces together and provides a function to cat the help file.
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Thu, 31 Mar 2011 12:08:37 +0000 (13:08 +0100)]
elflink: Detect circular dependencies during module load
It's possible for the 'modules.dep' file to contain circular
dependencies where module A has a dependency on module B, and module B
has a depedency on module A.
Currently what happens in the face of circular dependencies when
trying to parse and load the modules in 'modules.dep' is that we get
stuck in a loop in module_load_dependencies(), presumably eventually
blowing the stack.
To fix this we maintain a singly-linked list of module names that are
in the process of having their dependencies loaded, but that have not
completed the loading. Everytime we begin loading the dependencies for
a new module we check to see if that module name is already on the
linked list. If it is, we've discovered a circular reference so we
refuse to load the dependencies and print a helpful message to the
user which includes the circular dependency chain.
It would be possible to cope with these circular references if we were
to skip loading the dependencies for any modules that are on the
linked list and defer resolving any module relocs until after all
module images have been loaded into memory. However, it's more than
likely that a circular reference is indicative of a bug and that the
correct fix would be to extract the symbols causing the circular
dependency into their own module. So we treat circular dependencies as
an error case for now.
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Sebastian Herbszt [Wed, 30 Mar 2011 21:09:32 +0000 (23:09 +0200)]
gfxboot: remove save_read() function
Remove the no longer needed save_read() function.
Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
Sebastian Herbszt [Wed, 30 Mar 2011 20:57:55 +0000 (22:57 +0200)]
gfxboot: remove lowmem_buf_size variable
Remove the no longer needed lowmem_buf_size variable.
Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
Sebastian Herbszt [Wed, 30 Mar 2011 20:51:10 +0000 (22:51 +0200)]
gfxboot: don't use the bounce buffer
Allocate lowmem buffer instead of using the bounce buffer.
Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
Sebastian Herbszt [Wed, 30 Mar 2011 18:33:49 +0000 (20:33 +0200)]
gfxboot: use skipspace()
Use skipspace() instead of local skip_spaces().
Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
Gene Cumm [Tue, 29 Mar 2011 22:35:18 +0000 (18:35 -0400)]
diag/geodsp/README: Additional use notes
H. Peter Anvin [Tue, 29 Mar 2011 21:45:22 +0000 (14:45 -0700)]
Merge remote-tracking branch 'mcb30/empty-tftp-ip'
Matt Fleming [Tue, 29 Mar 2011 12:06:16 +0000 (13:06 +0100)]
elflink, cli: TAB key now displays labels
Now, if the user hits the TAB key at a prompt a list of all labels to
complete the current label typed on the command-line is printed. If
nothing is typed at the command-line all labels are printed.
This feature is available in the asm command-line interface so lets
make it available in the C version.
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Michael Brown [Mon, 28 Mar 2011 19:44:17 +0000 (20:44 +0100)]
pxe: allow TFTP server IP to be empty when not using TFTP
Reported-by: Marcus Grando <Marcus.Grando@corp.terra.com.br>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Gene Cumm [Sun, 27 Mar 2011 12:36:19 +0000 (08:36 -0400)]
diag/mbr/handoff: Add optional printing of floppy descriptor
Gene Cumm [Sun, 27 Mar 2011 12:32:05 +0000 (08:32 -0400)]
diag/mbr/handoff: Code comments; reflow output
The printing of CR/LF was misplaced such that it'd print a blank line if
no PnP data was found.
H. Peter Anvin [Fri, 18 Mar 2011 17:55:11 +0000 (10:55 -0700)]
linux.c32: For protocol 2.10+, use init_size when relocating
If we have to relocate the kernel, use the init_size parameter if it
is available, rather than an arbitrary fudge factor.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Thu, 17 Mar 2011 22:26:16 +0000 (15:26 -0700)]
gpxe: Make the build parallel-safe
Make sure we don't have multiple build processes wrecking havoc in the
gpxe directory.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Thu, 17 Mar 2011 18:58:35 +0000 (11:58 -0700)]
Merge remote-tracking branch 'genec/gpxelinux-kpxe-for-hpa'
Gene Cumm [Thu, 17 Mar 2011 18:46:43 +0000 (14:46 -0400)]
Makefile: Add gpxe/gpxelinuxk.0 to INSTALL_AUX
H. Peter Anvin [Thu, 17 Mar 2011 00:28:10 +0000 (17:28 -0700)]
core/Makefile: another attempt at dealing with GNU make 3.82
Trying another tack...
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Gene Cumm [Thu, 17 Mar 2011 00:14:03 +0000 (20:14 -0400)]
Makefile: Add diag/geodsp/ .xz images to install target
Gene Cumm [Thu, 17 Mar 2011 00:01:36 +0000 (20:01 -0400)]
Merge branch 'master' into diag-mbr-handoff-for-hpa
Conflicts:
diag/mbr/handoff.S
diag/mbr/handoff.S: Remove the attempt to zero pad/prevent overflow
Gene Cumm [Wed, 16 Mar 2011 21:26:23 +0000 (17:26 -0400)]
Add diag/ targets into top Makefile for install target
Gene Cumm [Wed, 16 Mar 2011 21:16:54 +0000 (17:16 -0400)]
diag/mbr/: use checksize.pl to pad/prevent overflow
HPA noticed that using Fedora 15 Alpha and gcc-4.6 broke on this code
H. Peter Anvin [Wed, 16 Mar 2011 20:58:42 +0000 (13:58 -0700)]
diag/geodsp/Makefile: use ./ to run a file in the current dir
When running a file in the current directory, use ./ as a prefix.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:56:57 +0000 (13:56 -0700)]
Makefile: build the diag directory
Build the diag directory (diagnostic aids).
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:56:10 +0000 (13:56 -0700)]
diag/mbr/handoff.S: Fix compilation problems with gas 2.21.51
The construct used for zero-padding in handoff.S doesn't work with gas
2.21.51.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:52:58 +0000 (13:52 -0700)]
Merge remote-tracking branch 'genec/diag-geodsp-for-hpa'
H. Peter Anvin [Wed, 16 Mar 2011 20:52:23 +0000 (13:52 -0700)]
NEWS: Document isohdpfx*.bin available.
H. Peter Anvin [Wed, 16 Mar 2011 20:50:41 +0000 (13:50 -0700)]
mbr: Install isohdpfx*.bin
GNU xorriso can build isohybrid images in one step without the need
for the isohybrid program, but for that to work the isohdpfx*.bin
files need to be available.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:48:31 +0000 (13:48 -0700)]
README: update copyright to 2011
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:48:03 +0000 (13:48 -0700)]
doc: update copyright to 2011
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:16:16 +0000 (13:16 -0700)]
Merge remote-tracking branch 'genec/news-for-hpa'
H. Peter Anvin [Wed, 16 Mar 2011 20:16:12 +0000 (13:16 -0700)]
Merge remote-tracking branch 'genec/doc-syslinux-for-hpa'
H. Peter Anvin [Wed, 16 Mar 2011 20:13:31 +0000 (13:13 -0700)]
com32/cmenu/adv_menu.tpl: Use the proper value for ipappend
If x is NULL, we're supposed to pass 0 for ipappend; this was
incorrect in the template and the gcc 4.6 unused variable warning
caught it.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
libinstaller/fat.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
extlinux/main.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
core/fs/pxe/pxe.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
core/fs/iso9660/iso9660.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
core/fs/fat/fat.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/tools/relocs.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/rosh/rosh.h: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/rosh/rosh.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/lua/src/vesa.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/lua/src/syslinux.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/lib/vsscanf.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/lib/syslinux/shuffle.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/lib/sys/rawcon_read.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/lib/jpeg/tinyjpeg.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/hdt/hdt-menu-summary.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/hdt/hdt-cli-kernel.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:10:36 +0000 (13:10 -0700)]
com32/cmenu/libmenu/help.c: remove variables set but not used
gcc 4.6 warns on variables set but not used, so remove them.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:07:04 +0000 (13:07 -0700)]
dos/dosexe.ld: Work around linker issue in binutils 2.21.51
binutils 2.21.51 seems to have problem subtracting two
section-relative symbols, so make them global.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 20:02:26 +0000 (13:02 -0700)]
memdisk: make sure the disk type is actually set
Make sure we actually set the disk CMOS type.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 16 Mar 2011 19:53:58 +0000 (12:53 -0700)]
Merge remote-tracking branch 'mfleming/for-hpa/elflink/fix-compiler-warnings' into elflink
Matt Fleming [Wed, 16 Mar 2011 14:56:01 +0000 (14:56 +0000)]
elflink: Return zero from draw_background()
Fix the following comiler warning,
background.c:37:1: warning: control reaches end of non-void function
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Wed, 16 Mar 2011 14:34:53 +0000 (14:34 +0000)]
elflink: Add draw_message_file() prototype
To fix the following warning,
menumain.c: In function ‘show_message_file’:
menumain.c:196:5: warning: implicit declaration of function ‘draw_message_file’
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Wed, 16 Mar 2011 14:32:12 +0000 (14:32 +0000)]
elflink: Fix compiler warnings by including core-elf.h
Numerous files need to include core-elf.h to get the definition of
'enum kernel_type'.
In file included from mytest.c:19:0:
menu.h: At top level:
menu.h:206:40: warning: ‘enum kernel_type’ declared inside parameter list
menu.h:206:40: warning: its scope is only this definition or declaration, which is probably not what you want
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Wed, 16 Mar 2011 14:26:40 +0000 (14:26 +0000)]
elflink: Fix compiler warnings in hello.c
Fix the following warnings,
hello.c: In function ‘hello_main’:
hello.c:23:5: warning: too few arguments for format
hello.c:20:9: warning: unused variable ‘i’
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Wed, 16 Mar 2011 14:05:16 +0000 (14:05 +0000)]
ldlinux: Fix compiler warning in colors.c
Include core-elf.h to get the definition of enum kernel_type to fix
the following warning,
In file included from colors.c:17:0:
../modules/menu.h:206:40: warning: ‘enum kernel_type’ declared inside parameter list
../modules/menu.h:206:40: warning: its scope is only this definition or declaration, which is probably not what you want
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Wed, 16 Mar 2011 13:40:46 +0000 (13:40 +0000)]
ldlinux: Delete unused variables and functions
Fix the following compiler warnings,
readconfig.c: In function ‘parse_one_config’:
readconfig.c:1059:6: warning: unused variable ‘i’
readconfig.c: At top level:
readconfig.c:1110:13: warning: ‘dump_menu’ defined but not used
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Wed, 16 Mar 2011 13:26:57 +0000 (13:26 +0000)]
ldlinux: Sprinkle const type qualifers
The following warnings are all caused because we're assigning from
const char * to char *. As the strings are never modified, it makes
sense to add the const type qualifer instead of casting away const.
readconfig.c: In function ‘parse_config_file’:
readconfig.c:708:11: warning: assignment discards qualifiers from pointer target type
readconfig.c:937:10: warning: assignment discards qualifiers from pointer target type
readconfig.c:987:20: warning: assignment discards qualifiers from pointer target type
readconfig.c:998:15: warning: assignment discards qualifiers from pointer target type
readconfig.c:1004:18: warning: assignment discards qualifiers from pointer target type
readconfig.c:1041:11: warning: assignment discards qualifiers from pointer target type
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Wed, 16 Mar 2011 13:18:41 +0000 (13:18 +0000)]
ldlinux: Fix compiler warnings in cli.c
Make the compiler happy by casting away the following warnings,
cli.c: In function ‘process_command’:
cli.c:381:2: warning: passing argument 1 of ‘strtok’ discards qualifiers from pointer target type
../../../com32/include/string.h:44:16: note: expected ‘char *’ but argument is of type ‘const char *’
cli.c:400:3: warning: passing argument 2 of ‘spawn_load’ from incompatible pointer type
../../../com32/include/sys/exec.h:43:12: note: expected ‘const char **’ but argument is of type ‘char **’
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Matt Fleming [Tue, 15 Mar 2011 21:38:45 +0000 (21:38 +0000)]
ldlinux: Fix the following warnings
ldlinux.c: In function ‘enter_cmdline’:
ldlinux.c:15:23: warning: unused variable ‘aux’
ldlinux.c: In function ‘ldlinux_main’:
ldlinux.c:75:5: warning: implicit declaration of function ‘kaboom’
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Liu Aleaxander [Tue, 15 Mar 2011 20:55:09 +0000 (20:55 +0000)]
elflink: handle the NULL return of edit_cmdline
When use ctrl-c to cancle the current input, the edit_cmdline
function will return a NULL string. While, the called didn't
handle that case, and an error would be happened.
Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Liu Aleaxander [Tue, 15 Mar 2011 20:54:01 +0000 (20:54 +0000)]
elflink: Add ctrl-R key bind support
This patch would add the CTRL-R key bind support. It would have
the basic feature of the CTRL-R key bind in bash. While, don't
expect it will do exactly like what bash will do.
Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Liu Aleaxander [Tue, 15 Mar 2011 20:44:53 +0000 (20:44 +0000)]
elflink: use 'input' as the prompt of the CLI
Use the paramter 'input' of fucntion edit_cmdline as the prompt of the
CLI. I guess this is what the 'input' parameter used for. It's is more
extendable than using a specify prompt.
And, for now, let's use the 'syslinux' as the prompt.:)
Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Liu Aleaxander [Tue, 15 Mar 2011 20:29:33 +0000 (20:29 +0000)]
elflink: Add Ctrl-p + Ctrl-n key binds
Add ctrl-p and ctrl-n key binds to get the prev and next
command. They are much easier to reach than KEY_UP and
KEY_DOWN.
Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Liu Aleaxander [Tue, 15 Mar 2011 20:28:26 +0000 (20:28 +0000)]
elflink: Do clear screen even if we have no pDraw_Menu method
Do clear screen even if we have no pDraw_Menu method, since user
may work in CLI mode and want to clear screen by pressing 'Ctrl-L'.
Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Liu Aleaxander [Tue, 15 Mar 2011 20:24:57 +0000 (20:24 +0000)]
elflink: Fix the wrong malloc size in enter_cmdline
Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Liu Aleaxander [Tue, 15 Mar 2011 20:19:33 +0000 (20:19 +0000)]
elflink: Cleanup some warnings
Cleanup some unused variables, goto lables, and add the missing
header files.
Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
H. Peter Anvin [Mon, 14 Mar 2011 05:17:27 +0000 (22:17 -0700)]
chain.c32: Allow both "guid" and "uuid"
The GPT specification calls it "guid", but the Unix world generally
calls it "uuid".
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Mon, 14 Mar 2011 05:14:47 +0000 (22:14 -0700)]
chain.c32: fix specification of disk by GUID (UUID)
Fix specification of disk by GUID, broken due to an incorrect pointer.
Reported-by: Szymon H <bodwick@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Gene Cumm [Thu, 10 Mar 2011 02:21:25 +0000 (21:21 -0500)]
diag: Add geodsp to Makefile
Gene Cumm [Thu, 10 Mar 2011 02:18:27 +0000 (21:18 -0500)]
diag/geodsp: Display Geometry based on read
This produces two images that are 8MiB+ in size (in order to exceed the
size of the largest CHS cylinder) containing 1 or multiple sectors of
code/data and the remaining sectors filled with their LBA.
Gene Cumm [Wed, 9 Mar 2011 23:43:01 +0000 (18:43 -0500)]
diag/mbr: Remove unneeded dependency from Makefile
Gene Cumm [Wed, 9 Mar 2011 18:53:34 +0000 (13:53 -0500)]
diag/mbr/handoff: Make filename in comment consistent
Gene Cumm [Wed, 9 Mar 2011 18:51:06 +0000 (13:51 -0500)]
diag/mbr/README: consistent docs
Gene Cumm [Sun, 6 Mar 2011 22:17:01 +0000 (17:17 -0500)]
diag/: Add Makefile,README here and mbr/
Gene Cumm [Sun, 6 Mar 2011 22:15:11 +0000 (17:15 -0500)]
Handoff *BR: Move to diag
Gene Cumm [Tue, 14 Dec 2010 02:39:34 +0000 (21:39 -0500)]
mbr_ho.bin: Fix stack bug; also save/restore cx in another location
Gene Cumm [Sat, 27 Nov 2010 03:38:37 +0000 (22:38 -0500)]
mbr_ho.bin: Fix several non-8086 issues