]> git.ipfire.org Git - thirdparty/grub.git/log
thirdparty/grub.git
15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 15:14:44 +0000 (20:44 +0530)] 
merge with mainline

15 years agoReorganise memory map handling
Vladimir 'phcoder' Serbinenko [Sat, 4 Sep 2010 15:10:10 +0000 (17:10 +0200)] 
Reorganise memory map handling

15 years ago "setparams" command to update positional parameters.
BVK Chaitanya [Sat, 4 Sep 2010 14:57:48 +0000 (20:27 +0530)] 
"setparams" command to update positional parameters.

* tests/grub_script_setparams.in: New test.
* Makefile.util.def: Rules for new test.

* grub-core/script/argv.c (grub_script_argv_make): New function.
* grub-core/script/execute.c (replace_scope): New function.
(grub_script_setparams): New function.
* grub-core/script/lexer.c: Remove unused variables.
* grub-core/script/main.c: Register/unregister setparams command.
* include/grub/script_sh.h (grub_script_argv_make): New prototype.
(grub_script_setparams): New prototype.

15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 09:11:08 +0000 (14:41 +0530)] 
merge with mainline

15 years agoreview comments
BVK Chaitanya [Sat, 4 Sep 2010 09:02:59 +0000 (14:32 +0530)] 
review comments

15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 09:00:12 +0000 (14:30 +0530)] 
merge with mainline

15 years agofix memory leak and out-of-range writes
BVK Chaitanya [Sat, 4 Sep 2010 08:52:51 +0000 (14:22 +0530)] 
fix memory leak and out-of-range writes

15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 08:51:56 +0000 (14:21 +0530)] 
merge with mainline

15 years ago * grub-core/normal/completion.c (grub_normal_do_completion): Fix
BVK Chaitanya [Sat, 4 Sep 2010 08:49:04 +0000 (14:19 +0530)] 
* grub-core/normal/completion.c (grub_normal_do_completion): Fix
grub_free order.

15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 06:19:02 +0000 (11:49 +0530)] 
merge with mainline

15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 06:07:59 +0000 (11:37 +0530)] 
merge with mainline

15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 05:58:45 +0000 (11:28 +0530)] 
merge with mainline

15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 05:26:23 +0000 (10:56 +0530)] 
merge with mainline

15 years ago Support for passing block of commands as an argument to
BVK Chaitanya [Sat, 4 Sep 2010 03:43:30 +0000 (09:13 +0530)] 
Support for passing block of commands as an argument to
extcmds.

* Makefile.util.def: Rules for new test.
* tests/grub_script_blockarg.in: New test.
* grub-core/tests/test_blockarg.c: New file, block argument
command used in the test.

* include/grub/extcmd.h (grub_extcmd_context): New struct.
(grub_register_extcmd_prio): New function prototype.
(grub_extcmd_dispatcher): New function prototype.
* include/grub/command.h (GRUB_COMMAND_FLAG_BLOCKS): New command
type.
* include/grub/script_sh.h (struct grub_script): New members
`children', `next_siblings' and `refcnt' for block arguments and
reference counting.
(GRUB_SCRIPT_ARG_TYPE_BLOCK): New argument type.
(grub_script_arg): New member `script' for block argument.
(grub_script_argv): New member `script' for block argument.
(grub_parser_param): New member `scripts' for block argument.
(grub_script_mem_free): New extern function prototype.
(grub_script_ref): New function prototype.
(grub_script_unref): New function prototype.

* grub-core/normal/dyncmd.c (grub_dyncmd_dispatcher): Moved to
extcmd form to support block arguments.
* grub-core/script/argv.c: Block arguments support.
* grub-core/script/execute.c: Likewise.
* grub-core/script/lexer.c: Likewise.
* grub-core/script/main.c: Likewise.
* grub-core/script/script.c: Likewise.
* grub-core/script/parser.y: Likewise.  New `block' and `block0'
non-terminals.

* grub-core/commands/acpi.c: Update extcmd implementations with
grub_extcmd_context_t.
* grub-core/commands/cat.c: Likewise.
* grub-core/commands/echo.c: Likewise.
* grub-core/commands/extcmd.c: Likewise.
* grub-core/commands/hashsum.c: Likewise.
* grub-core/commands/hdparm.c: Likewise.
* grub-core/commands/help.c: Likewise.
* grub-core/commands/hexdump.c: Likewise.
* grub-core/commands/i386/cpuid.c: Likewise.
* grub-core/commands/i386/pc/drivemap.c: Likewise.
* grub-core/commands/i386/pc/halt.c: Likewise.
* grub-core/commands/i386/pc/sendkey.c: Likewise.
* grub-core/commands/iorw.c: Likewise.
* grub-core/commands/keystatus.c: Likewise.
* grub-core/commands/loadenv.c: Likewise.
* grub-core/commands/ls.c: Likewise.
* grub-core/commands/lspci.c: Likewise.
* grub-core/commands/memrw.c: Likewise.
* grub-core/commands/probe.c: Likewise.
* grub-core/commands/search_wrap.c: Likewise.
* grub-core/commands/setpci.c: Likewise.
* grub-core/commands/sleep.c: Likewise.
* grub-core/disk/loopback.c: Likewise.
* grub-core/hello/hello.c: Likewise.
* grub-core/loader/i386/bsd.c: Likewise.
* grub-core/loader/xnu.c: Likewise.
* grub-core/term/gfxterm.c: Likewise.
* grub-core/term/serial.c: Likewise.
* grub-core/tests/lib/functional_test.c: Likewise.

15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 03:35:21 +0000 (09:05 +0530)] 
merge with mainline

15 years ago Multi-line quoted strings support.
BVK Chaitanya [Sat, 4 Sep 2010 03:13:35 +0000 (08:43 +0530)] 
Multi-line quoted strings support.

* grub-core/script/lexer.c (append_newline): Removed.
(grub_script_lexer_yywrap): Refactored.
(grub_script_lexer_init): Refactored.
* grub-core/script/yylex.l (yywrap): New function.
(grub_lexer_resplit): New function.
(grub_lexer_unput): New function.
* include/grub/script_sh.h (grub_lexer_param): New members, unput
and resplit.
* tests/grub_script_echo1.in: Added few more testcases.

15 years agomerge with mainline
BVK Chaitanya [Sat, 4 Sep 2010 03:03:42 +0000 (08:33 +0530)] 
merge with mainline

15 years ago--source option for menuentry
BVK Chaitanya [Sat, 4 Sep 2010 02:44:50 +0000 (08:14 +0530)] 
--source option for menuentry

15 years ago * grub-core/kern/misc.c: Don't add abort alias in utils.
Vladimir 'phcoder' Serbinenko [Sat, 4 Sep 2010 00:18:48 +0000 (02:18 +0200)] 
* grub-core/kern/misc.c: Don't add abort alias in utils.
Reported by: echoline.

15 years agoAdd missing h2m
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 23:52:04 +0000 (01:52 +0200)] 
Add missing h2m

15 years agoresync MAkefile.core.def
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 23:31:13 +0000 (01:31 +0200)] 
resync MAkefile.core.def

15 years agoHandle new names in grub-install
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 23:19:11 +0000 (01:19 +0200)] 
Handle new names in grub-install

15 years agoRemove leftover files
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 23:17:08 +0000 (01:17 +0200)] 
Remove leftover files

15 years agoRemove excessive dprintfs
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 23:13:20 +0000 (01:13 +0200)] 
Remove excessive dprintfs

15 years agoReorganise net and openbsdlabel
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 23:10:58 +0000 (01:10 +0200)] 
Reorganise net and openbsdlabel

15 years agofix several issues with nested labels
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 22:49:45 +0000 (00:49 +0200)] 
fix several issues with nested labels

15 years agodd GOP mode listing
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 20:50:27 +0000 (22:50 +0200)] 
dd GOP mode listing

15 years agoFix order of dimensions in videoinfo
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 20:50:11 +0000 (22:50 +0200)] 
Fix order of dimensions in videoinfo

15 years agoRemove vbetest and vbeinfo in favour of videotest and videoinfo
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 20:21:48 +0000 (22:21 +0200)] 
Remove vbetest and vbeinfo in favour of videotest and videoinfo

15 years agoShow adapter-specific info
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 20:11:22 +0000 (22:11 +0200)] 
Show adapter-specific info

15 years agoShow mode id
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 19:40:40 +0000 (21:40 +0200)] 
Show mode id

15 years agoInitial videoinfo implementation
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 19:19:22 +0000 (21:19 +0200)] 
Initial videoinfo implementation

15 years agoadd setparams prefix
BVK Chaitanya [Fri, 3 Sep 2010 16:58:16 +0000 (22:28 +0530)] 
add setparams prefix

15 years ago Add missing files into "make dist" tarball for other platforms.
BVK Chaitanya [Fri, 3 Sep 2010 15:53:00 +0000 (21:23 +0530)] 
Add missing files into "make dist" tarball for other platforms.

* gentpl.py (script): Use dist_noinst_DATA instead of EXTRA_DIST.
* conf/Makefile.common (dist_noinst_DATA): New variable.
* conf/Makefile.extra-dist: Added missing make dist files.
* grub-core/Makefile.core.def: Likewise.

15 years agomerge menuentry.mod into normal.mod
BVK Chaitanya [Fri, 3 Sep 2010 15:38:12 +0000 (21:08 +0530)] 
merge menuentry.mod into normal.mod

15 years agofix hotkey handling
BVK Chaitanya [Fri, 3 Sep 2010 15:23:38 +0000 (20:53 +0530)] 
fix hotkey handling

15 years agoreview comments
BVK Chaitanya [Fri, 3 Sep 2010 15:05:23 +0000 (20:35 +0530)] 
review comments

15 years agomerge with mainline
BVK Chaitanya [Fri, 3 Sep 2010 14:36:57 +0000 (20:06 +0530)] 
merge with mainline

15 years ago Compress grub_prefix.
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 12:54:04 +0000 (14:54 +0200)] 
Compress grub_prefix.

* grub-core/boot/i386/pc/lnxboot.S: Use
GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE.
* grub-core/kern/i386/pc/startup.S: Move grub_prefix to compressed part.
* include/grub/offsets.h: Rename GRUB_MACHINE_DATA_END to
GRUB_MACHINE_PREFIX_END. All users updated.
(GRUB_KERNEL_I386_PC_PREFIX): Set to GRUB_KERNEL_I386_PC_RAW_SIZE.
(GRUB_KERNEL_I386_PC_PREFIX_END): Set to GRUB_KERNEL_I386_PC_PREFIX
+ 0x40.
(GRUB_KERNEL_I386_PC_RAW_SIZE): Decrease.
* util/grub-mkimage.c (image_target_desc): Change data_end to
prefix_end. All users updated.

15 years ago * grub-core/loader/i386/bsd.c (grub_freebsd_boot): Set %ebp to sane
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 12:05:19 +0000 (14:05 +0200)] 
* grub-core/loader/i386/bsd.c (grub_freebsd_boot): Set %ebp to sane
value.
(grub_openbsd_boot): Likewise.
(grub_netbsd_boot): Likewise.
* grub-core/loader/i386/xnu.c (grub_xnu_boot_resume): Likewise.
(grub_xnu_boot): Likewise.

15 years ago * configure.ac: Clean LIBS variable after tests.
Vladimir 'phcoder' Serbinenko [Fri, 3 Sep 2010 01:26:22 +0000 (03:26 +0200)] 
* configure.ac: Clean LIBS variable after tests.

15 years ago* INSTALL: Document that libdevmapper needs to be 1.02.34 or later.
Colin Watson [Thu, 2 Sep 2010 22:57:21 +0000 (23:57 +0100)] 
* INSTALL: Document that libdevmapper needs to be 1.02.34 or later.

15 years ago * configure.ac: Check for dm_log_with_errno_init in libdevmapper and
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 22:53:41 +0000 (00:53 +0200)] 
* configure.ac: Check for dm_log_with_errno_init in libdevmapper and
echo if libdevmapper will be used.

15 years ago * grub-core/fs/i386/pc/pxe.c (grub_pxefs_read): Keep the blocksize
Ian Turner [Thu, 2 Sep 2010 21:59:27 +0000 (23:59 +0200)] 
* grub-core/fs/i386/pc/pxe.c (grub_pxefs_read): Keep the blocksize
constant for the same file.

15 years ago * grub-core/kern/i386/multiboot_mmap.c: Remove leftover include.
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 21:50:07 +0000 (23:50 +0200)] 
* grub-core/kern/i386/multiboot_mmap.c: Remove leftover include.

15 years ago* .bzrignore: Add *.pp, **/.dirstamp, grub-core/*.module, and
Colin Watson [Thu, 2 Sep 2010 21:42:36 +0000 (22:42 +0100)] 
* .bzrignore: Add *.pp, **/.dirstamp, grub-core/*.module, and
grub-core/*.pp.

15 years agoZero %ebp and %edi when entering Linux's 32-bit entry point, as
Colin Watson [Thu, 2 Sep 2010 21:36:09 +0000 (22:36 +0100)] 
Zero %ebp and %edi when entering Linux's 32-bit entry point, as
required by the boot protocol.
* include/grub/i386/relocator.h (struct grub_relocator32_state): Add
ebp and edi members.
* grub-core/lib/i386/relocator.c (grub_relocator_boot): Handle
state.ebp and state.edi.
* grub-core/lib/i386/relocator32.S (grub_relocator32_start): Set
%ebp and %edi according to grub_relocator32_ebp and
grub_relocator32_edi respectively.
* grub-core/loader/i386/linux.c (grub_linux_boot): Zero state.ebp
and state.edi.

15 years agoCreate directory net and move all net files there
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 20:20:48 +0000 (22:20 +0200)] 
Create directory net and move all net files there

15 years agoReintroduce pxe: syntax
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 20:12:37 +0000 (22:12 +0200)] 
Reintroduce pxe: syntax

15 years agoMove DHCP parsing to net module and reintroduce most variables
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 20:10:55 +0000 (22:10 +0200)] 
Move DHCP parsing to net module and reintroduce most variables

15 years agoImplement few variables
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 18:00:56 +0000 (20:00 +0200)] 
Implement few variables

15 years agoFix regressions by previous commits
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 16:15:59 +0000 (18:15 +0200)] 
Fix regressions by previous commits

15 years agoMerge mknet into net
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 15:18:46 +0000 (17:18 +0200)] 
Merge mknet into net

15 years agoMerge mainline into net
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 15:18:21 +0000 (17:18 +0200)] 
Merge mainline into net

15 years agoRestructure pxe
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 15:18:02 +0000 (17:18 +0200)] 
Restructure pxe

15 years ago Add i386-pc-pxe image target.
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 15:15:53 +0000 (17:15 +0200)] 
Add i386-pc-pxe image target.

* util/grub-mkimage.c (image_target_desc): New enum value
IMAGE_I386_PC_PXE.
(image_targets): New target i386-pc-pxe.
(generate_image): Handle i386-pc-pxe image.

15 years ago Add i386-pc-pxe image target.
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 14:07:52 +0000 (16:07 +0200)] 
Add i386-pc-pxe image target.

* util/grub-mkimage.c (image_target_desc): New enum value
IMAGE_I386_PC_PXE.
(image_targets): New target i386-pc-pxe.
(generate_image): Handle i386-pc-pxe image.

15 years ago Fix grub_pxe_scan.
Vladimir 'phcoder' Serbinenko [Thu, 2 Sep 2010 13:47:03 +0000 (15:47 +0200)] 
Fix grub_pxe_scan.

* grub-core/fs/i386/pc/pxe.c (grub_pxe_pxenv): Put correct type bangpxe.
(grub_pxe_scan): Fix types and pxe_rm_entry computation.
All users updated.
* include/grub/i386/pc/pxe.h (grub_pxe_bangpxe): New struct.
(grub_pxe_pxenv): Correct type.

15 years agoHook network protocols
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 22:07:55 +0000 (00:07 +0200)] 
Hook network protocols

15 years agomerge mainline into net
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 21:28:02 +0000 (23:28 +0200)] 
merge mainline into net

15 years ago* NEWS: Document most of the important changes since 1.98.
Colin Watson [Wed, 1 Sep 2010 17:15:46 +0000 (18:15 +0100)] 
* NEWS: Document most of the important changes since 1.98.

15 years ago* util/grub-mkrescue.in (usage): Tidy up usage output (and hence
Colin Watson [Wed, 1 Sep 2010 09:32:34 +0000 (10:32 +0100)] 
* util/grub-mkrescue.in (usage): Tidy up usage output (and hence
generated manual page) a little.

15 years ago* docs/grub.texi: Add myself as an author.
Colin Watson [Wed, 1 Sep 2010 09:29:30 +0000 (10:29 +0100)] 
* docs/grub.texi: Add myself as an author.

15 years agoRemove few bad hunks
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 08:21:05 +0000 (10:21 +0200)] 
Remove few bad hunks

15 years agoMerge gingold3 into ia64
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 08:15:56 +0000 (10:15 +0200)] 
Merge gingold3 into ia64

15 years ago * grub-core/commands/efi/lsefimmap.c: New file.
Tristan Gingold [Wed, 1 Sep 2010 08:12:41 +0000 (10:12 +0200)] 
* grub-core/commands/efi/lsefimmap.c: New file.
* grub-core/Makefile.core.def (lsefimmap): New module.
* include/grub/efi/api.h (PRIxGRUB_EFI_UINTN_T): New definition.

Also-By: Robert Millan <rmh.grub@aybabtu.com>
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
15 years agoMerge gingold2 into ia64
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 07:45:20 +0000 (09:45 +0200)] 
Merge gingold2 into ia64

15 years agoFix some compilation problems
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 07:44:32 +0000 (09:44 +0200)] 
Fix some compilation problems

15 years agoremove allocate_boot_pages and free_boot_pages. They are pointless now
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 07:43:36 +0000 (09:43 +0200)] 
remove allocate_boot_pages and free_boot_pages. They are pointless now

15 years agoFix memory leak
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 07:34:09 +0000 (09:34 +0200)] 
Fix memory leak

15 years agoUse finish boot services and switch to new command line interface in linux loader
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 01:05:36 +0000 (03:05 +0200)] 
Use finish boot services and switch to new command line interface in linux loader

15 years agoAdd ia64 setjmp implementation to the list
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 01:03:15 +0000 (03:03 +0200)] 
Add ia64 setjmp implementation to the list

15 years agoRemove leftover modules
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 00:41:21 +0000 (02:41 +0200)] 
Remove leftover modules

15 years agoMerge gingold2 into ia64
Vladimir 'phcoder' Serbinenko [Wed, 1 Sep 2010 00:39:11 +0000 (02:39 +0200)] 
Merge gingold2 into ia64

15 years ago * grub-core/commands/efi/lsefisystab.c: New file.
Tristan Gingold [Wed, 1 Sep 2010 00:37:17 +0000 (02:37 +0200)] 
* grub-core/commands/efi/lsefisystab.c: New file.
* grub-core/commands/efi/lssal.c: Likewise.
* grub-core/Makefile.core.def (lsacpi): New module.
(lsefisystab): Likewise.
* include/grub/efi/api.h (GRUB_EFI_SAL_TABLE_GUID): New definition.
(GRUB_EFI_HCDP_TABLE_GUID): Likewise.
(grub_efi_sal_system_table): New struct.
(grub_efi_sal_system_table_entrypoint_descriptor): Likewise.
(grub_efi_sal_system_table_memory_descriptor): Likewise.
(grub_efi_sal_system_table_platform_features): Likewise.
(grub_efi_sal_system_table_translation_register_descriptor): Likewise.
(grub_efi_sal_system_table_purge_translation_coherence): Likewise.
(grub_efi_sal_system_table_ap_wakeup): Likewise.
* include/grub/types.h (PRIuGRUB_UINT64_T): New definition.

Also-By: Robert Millan <rmh.grub@aybabtu.com>
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
15 years agomerge gingold1_lsacpi into ia64
Vladimir 'phcoder' Serbinenko [Tue, 31 Aug 2010 23:13:53 +0000 (01:13 +0200)] 
merge gingold1_lsacpi into ia64

15 years ago * Makefile.util.def (libgrub.a): Add missing sunpc.
Vladimir 'phcoder' Serbinenko [Tue, 31 Aug 2010 23:09:00 +0000 (01:09 +0200)] 
* Makefile.util.def (libgrub.a): Add missing sunpc.
Reported by: Seth Goldberg.

15 years ago * commands/lsacpi.c: New file.
Tristan Gingold [Tue, 31 Aug 2010 23:05:32 +0000 (01:05 +0200)] 
* commands/lsacpi.c: New file.
* grub-core/Makefile.core.def (lsacpi): New module.
* include/grub/acpi.h (GRUB_ACPI_FADT_SIGNATURE): New definition.
(GRUB_ACPI_MADT_SIGNATURE): Likewise.
(grub_acpi_madt_entry_header): New struct.
(grub_acpi_madt): Likewise.
(grub_acpi_madt_entry_interrupt_override): Likewise.
(grub_acpi_madt_entry_sapic): Likewise.
(grub_acpi_madt_entry_lsapic): Likewise.
(grub_acpi_madt_entry_platform_int_source): Likewise.
* include/grub/types.h (PRIxGRUB_UINT32_T): New definition.
(PRIuGRUB_UINT32_T): Likewise.
(PRIxGRUB_UINT64_T): Likewise.

Also-By: Robert Millan <rmh.grub@aybabtu.com>
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
15 years agomerge mainline into ia64
Vladimir 'phcoder' Serbinenko [Tue, 31 Aug 2010 19:47:26 +0000 (21:47 +0200)] 
merge mainline into ia64

15 years agoMerge mainline into keylayouts
Vladimir 'phcoder' Serbinenko [Tue, 31 Aug 2010 12:12:34 +0000 (14:12 +0200)] 
Merge mainline into keylayouts

15 years agoMerge mainline into keylayouts
Vladimir 'phcoder' Serbinenko [Tue, 31 Aug 2010 12:03:29 +0000 (14:03 +0200)] 
Merge mainline into keylayouts

15 years ago Interrupt wrapping and code simplifications.
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 20:02:58 +0000 (22:02 +0200)] 
Interrupt wrapping and code simplifications.

* Makefile.util.def (grub-mkrescue): Use x86 tg instead of
x86_noieee1275 which are functionaly equivalent in this case.
(grub-install): Make source on each platform explicit. Enable on
all noemu.
* gentpl.py (x86_efi_pc): Removed group.
(x86_noefi): Likewise.
(i386_noefi): Likewise.
(x86_noieee1275): Likewise.
(i386_noieee1275): Likewise.
(i386_noefi_noieee1275): Likewise.
(i386_pc_qemu_coreboot): Likewise.
(i386_coreboot_multiboot): Likewise.
(i386_pc_coreboot_multiboot_qemu): Likewise.
(x86_noefi_mips): Likewise.
(noieee1275): Likewise.
(ieee1275_mips): Likewise.
(noemu_noieee1275): Likewise.
(cmos): New group.
(usb): Likewise.
(videoinkernel): Likewise.
(videomodules): Likewise.
* grub-core/Makefile.am (KERNEL_HEADER_FILES): Remove
include/grub/elf.h, include/grub/elfload.h, include/grub/net.h,
include/grub/reader.h, include/grub/symbol.h, include/grub/types.h,
include/grub/loader.h, include/grub/msdos_partition.h,
include/grub/machine/biosdisk.h, include/grub/machine/boot.h,
include/grub/machine/console.h, include/grub/machine/vga.h,
include/grub/machine/vbe.h, include/grub/machine/init.h,
include/grub/machine/kernel.h, include/grub/cpu/time.h,
include/grub/cpu/types.h, include/grub/gzio.h and include/grub/menu.h
(KERNEL_HEADER_FILES) [i386-pc]: Add include/grub/machine/int.h.
(KERNEL_HEADER_FILES) [i386-ieee1275]: Add include/grub/i386/pit.h
* grub-core/Makefile.core.def (kernel): Explicit the source for
startup. Explicit the platforms using kern/generic/rtc_get_time_ms.c.
Split ieee1275_mips. Remove kern/i386/halt.c. Remove kern/i386/misc.S.
Enable kern/i386/pit.c on all x86. Remove kern/i386/ieee1275/init.c.
Use videoinkernel tag.
(usb): Enable on all usb.
(usbserial_common): Likewise.
(usbserial_pl2303): Likewise.
(usbserial_ftdi): Likewise.
(uhci): Enable on all x86.
(ohci): Enable on all pci.
(cmostest): Enable on all CMOS.
(acpi): Include commands/acpi.c on all platforms.
(halt): Add relevant lib/*/halt.c.
(hdparm): Enable on all pci.
(lspci): Likewise.
(usbtest): Enable on all usb.
(ata): Enable on all pci.
(ata_pthru): Likewise.
(usbms): Enable on all usb.
(usb_keyboard): Likewise.
(font): Use tag videomodules.
(bufio): Likewise.
(datetime): Use tag cmos. Enable on all noemu.
(mmap): Use tags common and x86.
(gfxterm): Use tag videomodules.
(bitmap): Likewise.
(bitmap_scale): Likewise.
(video_fb): Likewise.
(video): Likewise.
* grub-core/bus/usb/ohci.c (grub_ohci_td): Make link_td a pointer and
adjust padding accordingly. All users updated.
(grub_ohci_transaction): Fix bad format specification.
(GRUB_MOD_INIT): Add asserts for struct size.
* grub-core/bus/usb/uhci.c (grub_uhci_pci_iter): Add explicit casts.
(grub_alloc_td): Likewise.
(grub_free_queue): Likewise.
(grub_uhci_transfer): Likewise.
(grub_uhci_transaction): Fix bad format specification.
* grub-core/bus/usb/usbtrans.c (grub_usb_control_msg): Likewise.
(grub_usb_bulk_readwrite): Likewise.
* grub-core/kern/i386/misc.S (grub_stop): Moved from here ...
* grub-core/commands/i386/pc/halt.c (stop): ...here. Transformed into C.
Made static.
* grub-core/lib/i386/halt.c (stop): ... and here. Transformed into C.
Made static.
* grub-core/kern/i386/pc/startup.S (grub_halt): Moved from here ...
* grub-core/commands/i386/pc/halt.c (grub_halt): ...here.
Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_biosdisk_rw_int13_extensions):
Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_rw_int13_extensions):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_biosdisk_rw_standard):
Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_rw_standard):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_check_int13_extensions): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_check_int13_extensions): ... here. Transformed into C.
Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_get_cdinfo_int13_extensions): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_get_cdinfo_int13_extensions): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_get_diskinfo_int13_extensions): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_get_diskinfo_int13_extensions): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_get_diskinfo_standard): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_get_diskinfo_standard): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S
(grub_biosdisk_get_num_floppies): Moved from here ...
* grub-core/disk/i386/pc/biosdisk.c
(grub_biosdisk_get_num_floppies): ... here.
Transformed into C. Made static.
* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_get_diskinfo_real):
New function.
* grub-core/kern/i386/pc/startup.S (grub_pxe_scan): Moved from here ...
* grub-core/fs/i386/pc/pxe.c (grub_pxe_scan): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_rm_entry): Moved from here ...
* grub-core/fs/i386/pc/pxe.c (grub_rm_entry): ... here.
Transformed into C. Made static.
* grub-core/kern/i386/ieee1275/init.c: Removed.
* grub-core/kern/i386/misc.S: Likewise.
* grub-core/kern/i386/pc/startup.S (grub_get_memsize):
Splitted from here ...
* grub-core/kern/i386/pc/init.c (grub_get_conv_memsize): ... here.
Transformed into C. Made static. All users updated.
* grub-core/kern/i386/pc/mmap.c (grub_get_ext_memsize): ... and here.
Transformed into C. Made static. All users updated.
* grub-core/kern/i386/pc/startup.S (grub_get_eisa_mmap):
Moved from here...
* grub-core/kern/i386/pc/mmap.c (grub_get_eisa_mmap): ... here.
Transformed into C. Made static. All users updated.
* grub-core/kern/i386/pc/startup.S (grub_get_mmap_entry):
Moved from here...
* grub-core/kern/i386/pc/mmap.c (grub_get_mmap_entry): ... here.
Transformed into C. Made static. All users updated.
* grub-core/kern/i386/pc/startup.S (grub_stop_floppy):
Removed (replaced by C version).
* grub-core/kern/i386/pc/startup.S (grub_vga_set_mode):
Moved from here...
* grub-core/video/i386/pc/vga.c (grub_vga_set_mode): ...here.
Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_controller_info):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_controller_info):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_mode_info):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_mode_info):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_mode):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_mode):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_mode):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_mode):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S
(grub_vbe_bios_getset_dac_palette_width):Moved from here...
* grub-core/video/i386/pc/vbe.c
(grub_vbe_bios_getset_dac_palette_width):... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_memory_window):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_memory_window):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_memory_window):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_memory_window):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_scanline_length):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_scanline_length):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_scanline_length):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_scanline_length):
... here. Transformed into C.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_display_start):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_display_start):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_display_start):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_display_start):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_palette_data):
Moved from here...
* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_palette_data):
... here. Transformed into C. Made static.
* grub-core/kern/i386/pc/startup.S (grub_pxe_call): Receive
pxe_rm_entry as third argument.
(grub_bios_interrupt): New function.
* grub-core/kern/i386/qemu/mmap.c: Remove useless include.
* grub-core/kern/i386/qemu/startup.S (codestart): Do cli;hlt instead
of calling grub_stop.
* grub-core/kern/efi/efi.c (grub_halt): Moved from here ...
* grub-core/lib/efi/halt.c (grub_halt): ...here.
* grub-core/kern/emu/main.c (grub_halt): Moved from here ...
* grub-core/lib/emu/halt.c (grub_halt): ... here.
* grub-core/lib/i386/halt.c: Moved from here ...
* grub-core/lib/i386/halt.c: ... here.
* grub-core/kern/ieee1275/openfw.c (grub_halt): Moved from here ...
* grub-core/lib/ieee1275/halt.c (grub_halt): ... here.
* grub-core/loader/i386/pc/linux.c (grub_linux16_boot): Call
grub_stop_floppy.
* grub-core/loader/i386/xnu.c (guessfsb) [IEEE1275]: Enable.
* include/grub/i386/coreboot/init.h: Removed.
* include/grub/i386/multiboot/init.h: Likewise.
* include/grub/i386/pc/biosdisk.h: Removed all function prototypes.
* include/grub/i386/pc/init.h: Likewise except grub_gate_a20.
* include/grub/i386/pc/int.h: New file.
* include/grub/i386/pc/pxe.h (GRUB_PXE_SIGNATURE): New definition.
(grub_pxe_scan): Removed.
(grub_pxe_call): Update prototype.
* include/grub/i386/pc/vbe.h: Removed EXPORT_FUNC and useless
prototypes.
* include/grub/i386/pc/vga.h (grub_vga_set_mode): Removed.
* include/grub/i386/qemu/init.h: Removed.
* include/grub/mips/yeeloong/kernel.h (grub_reboot): Add missing
noreturn.
(grub_halt): Likewise.
* include/grub/misc.h (grub_halt): Removed EXPORT_FUNC.
(grub_reboot): Likewise.
* grub-core/kern/i386/coreboot/init.c (grub_stop_floppy): Moved from here...
* include/grub/i386/floppy.h (grub_stop_floppy): ...here. Inlined.
* grub-core/kern/i386/pc/startup.S (grub_hard_stop): Removed.

15 years ago2010-08-30 Robert Millan <rmh@gnu.org>
Robert Millan [Mon, 30 Aug 2010 19:55:10 +0000 (21:55 +0200)] 
2010-08-30  Robert Millan  <rmh@gnu.org>

* NEWS: Document addition of ZFS support in `grub-install' and
`grub-mkconfig'.

15 years agoImport EFI patch by cjwatson
Colin Watson [Mon, 30 Aug 2010 19:00:48 +0000 (21:00 +0200)] 
Import EFI patch by cjwatson

15 years agoAdapt common grub-install for efi and use it
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 18:27:59 +0000 (20:27 +0200)] 
Adapt common grub-install for efi and use it

15 years ago Remove leftover embedding of font objects.
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 18:23:04 +0000 (20:23 +0200)] 
Remove leftover embedding of font objects.

* include/grub/kernel.h (OBJ_TYPE_FONT): Removed.
* util/grub-install.in (font): Removed.
* util/grub-mkimage.c (generate_image): Remove font support. All users
updated.

15 years agoMerge mainline into install
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 17:58:00 +0000 (19:58 +0200)] 
Merge mainline into install

15 years ago Remove leftover embedding of font objects.
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 17:48:10 +0000 (19:48 +0200)] 
Remove leftover embedding of font objects.

* include/grub/kernel.h (OBJ_TYPE_FONT): Removed.
* util/grub-install.in (font): Removed.
* util/grub-mkimage.c (generate_image): Remove font support. All users
updated.

15 years agoremove ieee1275/grub-install and adapt grub-install for ieee1275
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 17:30:34 +0000 (19:30 +0200)] 
remove ieee1275/grub-install and adapt grub-install for ieee1275

15 years agoAdd ChangeLog
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 14:28:01 +0000 (16:28 +0200)] 
Add ChangeLog

15 years agoRemove useless prototypes
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 14:26:05 +0000 (16:26 +0200)] 
Remove useless prototypes

15 years agoAdd missing noreturn
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 14:25:39 +0000 (16:25 +0200)] 
Add missing noreturn

15 years agoFix alignment and add explicit assert for td and ed size
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 14:25:14 +0000 (16:25 +0200)] 
Fix alignment and add explicit assert for td and ed size

15 years agoDimplify tags and enable USB on more platforms
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 13:13:38 +0000 (15:13 +0200)] 
Dimplify tags and enable USB on more platforms

15 years agoremove leading / in dprintf output
BVK Chaitanya [Mon, 30 Aug 2010 04:07:35 +0000 (09:37 +0530)] 
remove leading / in dprintf output

15 years agomerge mainline into intwrap
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 01:26:09 +0000 (03:26 +0200)] 
merge mainline into intwrap

15 years agoAdd missing Reported by
Vladimir 'phcoder' Serbinenko [Mon, 30 Aug 2010 00:01:59 +0000 (02:01 +0200)] 
Add missing Reported by

15 years ago * docs/grub.texi (Network): Fix reference to pxe_blksize.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 23:56:35 +0000 (01:56 +0200)] 
* docs/grub.texi (Network): Fix reference to pxe_blksize.

15 years ago * grub-core/normal/menu.c (grub_wait_after_message): Add a 10 second
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 23:14:07 +0000 (01:14 +0200)] 
* grub-core/normal/menu.c (grub_wait_after_message): Add a 10 second
timeout to avoid indefinite boot stalling.

15 years ago * grub-core/normal/color.c (grub_env_write_color_normal): Fix a warning.
Vladimir 'phcoder' Serbinenko [Sun, 29 Aug 2010 23:12:37 +0000 (01:12 +0200)] 
* grub-core/normal/color.c (grub_env_write_color_normal): Fix a warning.
(grub_env_write_color_highlight): Likewise.