search for: kt_kernel

The following changes since commit 8c576f1fe03e34879921311f46613a35c6530000: Merge remote-tracking branch 'mfleming/for-hpa/elflink/fix-compiler-warnings' into elflink (2011-03-16 12:53:58 -0700) are available in the git repository at: git://git.zytor.com/users/mfleming/syslinux.git for-hpa/elflink/ldlinux Matt Fleming (1): ldlinux: Perform auto-boot if NOESCAPE set in config

...fore launching the kernel allowing the display to properly render for those apps that don't set the display mode before writing: --- menumain.orig 2007-09-27 16:27:45.000000000 -0700 +++ menumain.c 2007-09-27 16:27:30.000000000 -0700 @@ -1036,6 +1036,8 @@ } else { if (type < KT_KERNEL) type = KT_KERNEL; + ireg.eax.w[0]= 0x0003; /* Return to text mode */ + __intcall(0x10, &ireg, NULL); ireg.eax.w[0] = 0x0016; /* Run kernel image */ ireg.esi.w[0] = OFFS(kernel); ireg.ds = SEG(kernel);

.../execute.c +++ b/com32/elflink/ldlinux/execute.c @@ -108,7 +108,7 @@ void execute(const char *cmdline, enum kernel_type type) local_boot(strtoul(kernel, NULL, 0)); } else if (type == KT_PXE || type == KT_BSS || type == KT_BOOT) { chainboot_file(kernel, type); - } else { + } else if (type == KT_KERNEL) { /* Need add one item for kernel load, as we don't use * the assembly runkernel.inc any more */ new_linux_kernel((char *)kernel, (char *)cmdline); -- 1.7.3.4

...644 --- a/com32/elflink/ldlinux/execute.c +++ b/com32/elflink/ldlinux/execute.c @@ -134,7 +134,7 @@ void execute(const char *cmdline, enum kernel_type type) argv[argc] = NULL; module_load_dependencies(kernel, "modules.dep"); spawn_load(kernel, argc, argv); - } else if (type <= KT_KERNEL) { + } else if (type == KT_KERNEL) { /* Need add one item for kernel load, as we don't use * the assembly runkernel.inc any more */ new_linux_kernel(kernel, cmdline); @@ -148,14 +148,15 @@ void execute(const char *cmdline, enum kernel_type type) if (type == KT_LOCALBOOT) { ireg....

...(*p)) { @@ -48,22 +151,60 @@ void execute(const char *cmdline, enum k } if (type == KT_LOCALBOOT) { - ireg.eax.w[0] = 0x0014; /* Local boot */ - ireg.edx.w[0] = strtoul(kernel, NULL, 0); + syslinux_local_boot(strtoul(kernel,NULL,0)); } else { - if (type < KT_KERNEL) - type = KT_KERNEL; - ireg.eax.w[0] = 0x0016; /* Run kernel image */ - ireg.esi.w[0] = OFFS(kernel); - ireg.ds = SEG(kernel); - ireg.ebx.w[0] = OFFS(args); - ireg.es = SEG(args); - ireg.edx.l = type - KT_KERNEL; - /* ireg.ecx.l = 0; *//* We d...

...use re-initialisation elflink: Don't use strcmp on a non-NUL terminated string com32: Delete execute.c and use the one from ldlinux ldlinux: chdir to the APPEND str when parsing a CONFIG directive ldlinux: Avoid initialised data memory corruption ldlinux: Make the default execute type KT_KERNEL ldlinux: Disable VGA graphics when loading a kernel ldlinux: Don't alloc initramfs unless initrd= is specified mk: Don't link against compiler's version of libgcc core: Abstract search_config() into search_dirs() com32/Makefile | 4 +- com32/elflink/ldli...

From: Matt Fleming <matt.fleming at linux.intel.com> These patches are based on the elflink branch. This set of patches is my attempt at moving the command-line interface functionality out of the core and into an ELF module to reduce the size of the core. The most interesting patch is [PATCH 4/4] which moves the cli code out of core/elflink and into com32/elflink/modules. [PATCH 4/4] is

...en - 4, ".com", 4) || - !strncmp(kernel + len - 4, ".cbt", 4)) { - type = KT_COMBOOT; + for (ext = file_extensions; ext->name; ext++) { + int elen = strlen(ext->name); + + if (!strncmp(kernel + len - elen, ext->name, elen)) + return ext->type; } + /* use KT_KERNEL as default */ - else - type = KT_KERNEL; + return KT_KERNEL; +} + +/* + * Returns the kernel name with file extension if one wasn't present. + */ +static const char *get_extension(const char *kernel) +{ + const struct file_ext *ext; + const char *p; + int len; + + /* Find the end of the comman...

This is a small set of patches for elflink branch based on feng's elflink branch. hpa, It seems that I can't log on terminus by ssh at home. So I can't push these patches on my git tree. Liu Aleaxander (4): elflink: Cleanup some warnings elflink: Fix the wrong malloc size in enter_cmdline elflink: Do clear screen even if we have no pDraw_Menu method elflink: Add Ctrl-p +

From: Matt Fleming <matt.fleming at linux.intel.com> This is a series of patches that, * shrink the core by moving things into an ldlinux ELF module * begin wiring up some of the C versions of various functions The core now only contains essential code and loads the ldlinux module to do everything else, like providing a command line interface and loading kernels. The config file parsing

...hat defaults to "BLS%03d" + */ + rsprintf( + &ld.label, (bls1_labelf) ? bls1_labelf : BLS1_LABELF, i+1 + ); + + if (bdx[i]->freax) { + ld.kernel = refstrdup(bdx[i]->freax); + ld.type = KT_LINUX; + } else { + ld.kernel = refstrdup(bdx[i]->efi); + ld.type = KT_KERNEL; + } + ld.passwd = NULL; + ld.append = refstrdup(bdx[i]->options); + ld.initrd = refstrdup(bdx[i]->initrd); + ld.menulabel = format_bls_data( + bdx[i], (bls1_format) ? bls1_format : BLS1_FORMAT + ); + ld.helptext = NULL; + ld.ipappend = SysAppends; + ld.menudefault = ld.menuhide = ld.menu...

...n_load(module_name, (const char **)argv); } else if (!strcmp(module_name + len_mn - 2, ".0")) { execute(cmd, KT_PXE); } else if (!strcmp(module_name + len_mn - 3, ".bs")) { @@ -418,7 +418,6 @@ void process_command(const char *cmd, bool history) else execute(temp_cmd, KT_KERNEL); -cleanup: free(argv); free(temp_cmd); } diff --git a/com32/elflink/ldlinux/colors.c b/com32/elflink/ldlinux/colors.c index 68732bd..c1ef390 100644 --- a/com32/elflink/ldlinux/colors.c +++ b/com32/elflink/ldlinux/colors.c @@ -14,6 +14,7 @@ #include <string.h> #include <stdio.h&gt...

...id load_kernel(const char *command_line) if (!allowimplicit) goto bad_implicit; + /* Insert a null character to ignore any user-specified options */ + if (!allowoptions) { + char *p = (char *)find_command(kernel); + *p = '\0'; + } + type = parse_kernel_type(kernel); if (type == KT_KERNEL) { const char *ext; @@ -209,16 +215,12 @@ static void enter_cmdline(void) /* Enter endless command line prompt, should support "exit" */ while (1) { cmdline = edit_cmdline("syslinux$", 1, NULL, cat_help_file); - if (!cmdline) - continue; - - /* return if user only...

From: Matt Fleming <matt.fleming at intel.com> Since we can't use __intcall() for EFI, and since we can now have the ELF module code resolve all our symbols at runtime, we should delete as many references to __intcall() as possible and just access the symbols directly. The most interesting patch is the support for weak symbols. We need to be able to reference derivative-specific

...const char *str) return p; } -enum kernel_type parse_kernel_type(const char *kernel) +uint32_t parse_image_type(const char *kernel) { const struct file_ext *ext; const char *p; @@ -62,8 +63,8 @@ enum kernel_type parse_kernel_type(const char *kernel) return ext->type; } - /* use KT_KERNEL as default */ - return KT_KERNEL; + /* use IMAGE_TYPE_KERNEL as default */ + return IMAGE_TYPE_KERNEL; } /* @@ -82,19 +83,20 @@ static const char *get_extension(const char *kernel) for (ext = file_extensions; ext->name; ext++) { char *str; int elen = strlen(ext->name); - int fd;...

From: Matt Fleming <matt.fleming at linux.intel.com> This series fixes some bugs and switches the elflink branch to be entirely ELF modules. It applies on top of, http://syslinux.zytor.com/archives/2011-April/016369.html The deletions in the diff stat below are mainly from deleting com32/elflink/modules (finally!). Now there should be no duplicate code because we don't need COM32 and