coreboot September 2011

coreboot@coreboot.org

40 participants
224 discussions

Patch merged into filo/master: 98010ff Allow switching between partitions on the current device
by gerrit＠coreboot.org 09 Sep '11

09 Sep '11

the following patch was just integrated into master: commit 98010ffea7f8a203cfb26adef3ac3834cc8748d8 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Thu Mar 24 09:13:54 2011 +0100 Allow switching between partitions on the current device root (,1) or configfile 2:/filo.lst work now and change the active partition on the current device (as defined by "root"). Change-Id: I271f5f407297c072f35ac8410c278b1c9442d654 Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> See http://review.coreboot.org/198 for details. -gerrit

1 0

Patch set updated for filo: 98010ff Allow switching between partitions on the current device
by Patrick Georgi 09 Sep '11

09 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/198 -gerrit commit 98010ffea7f8a203cfb26adef3ac3834cc8748d8 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Thu Mar 24 09:13:54 2011 +0100 Allow switching between partitions on the current device root (,1) or configfile 2:/filo.lst work now and change the active partition on the current device (as defined by "root"). Change-Id: I271f5f407297c072f35ac8410c278b1c9442d654 Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- include/grub/shared.h | 2 +- main/grub/builtins.c | 184 +++++++++++++++++++++++++++---------------------- main/grub/grub.c | 5 +- 3 files changed, 104 insertions(+), 87 deletions(-) diff --git a/include/grub/shared.h b/include/grub/shared.h index 127b74f..9e74d7c 100644 --- a/include/grub/shared.h +++ b/include/grub/shared.h @@ -304,6 +304,6 @@ int print_completions (int is_filename, int is_completion); int check_password(char *entered, char* expected, password_t type); /* FILO specific stuff */ -void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev); +void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev, int append); #endif /* ! GRUB_SHARED_HEADER */ diff --git a/main/grub/builtins.c b/main/grub/builtins.c index c926b7d..e2f4612 100644 --- a/main/grub/builtins.c +++ b/main/grub/builtins.c @@ -303,8 +303,7 @@ static int configfile_func(char *arg, int flags) extern int is_opened, keep_cmdline_running; /* Check if the file ARG is present. */ - temp_space[0]=0; - copy_path_to_filo_bootline(arg, temp_space, 1); + copy_path_to_filo_bootline(arg, temp_space, 1, 0); if (temp_space[0]==0) { return help_func("configfile",0); } @@ -316,8 +315,7 @@ static int configfile_func(char *arg, int flags) file_close(); /* Copy ARG to CONFIG_FILE. */ - memset(config_file, 0, 128); - copy_path_to_filo_bootline(arg, config_file, 1); + copy_path_to_filo_bootline(arg, config_file, 1, 0); /* Force to load the configuration file. */ is_opened = 0; @@ -632,114 +630,140 @@ static struct builtin builtin_hiddenmenu = { }; /** + * @param arg linux style driver specifier + * @param drivername driver name (out) + * @param disk disk number (out) + * @return length of parsed string + */ +static +int parse_linux_style_driver(char *arg, char *drivername, int *disk) +{ + int i = 0; + + *disk = -1; + drivername[0] = '\0'; + while ((i < 16) && (isalpha(arg[i]))) { + drivername[i] = arg[i]; + i++; + } + + if (i > 0) { + drivername[--i] = '\0'; + *disk = arg[i]-'a'; + i++; + } + return i; +} + +/** * @param arg source pointer with grub device names * @param path destination pointer (will be filled with filo device names) * @param use_rootdev values other than zero mean the root device set by the "root" * command is taken into regard here. This has to be zero when calling from root_func. */ -void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev) +void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev, int append) { char devicename[16]; char drivername[16]; int disk, part; + unsigned long addr; int i, len; - - /* Clean up */ memset(devicename, 0, 16); memset(drivername, 0, 16); + disk = -1; + part = -1; + addr = -1; - /* Copy over the driver name: "hd", "ud", "sd" ... */ if (arg[0] == '(') { + // grub style device specifier i = 1; /* Read until we encounter a number, a comma or a closing * bracket */ - while ((i <= 16) && (arg[i]) && (!isdigit(arg[i])) && (arg[i] != ',') - && (arg[i] != ')')) { + while ((i <= 16) && (isalpha(arg[i]))) { drivername[i - 1] = arg[i]; i++; } - } - disk = -1; - part = -1; - - len = strlen(drivername); - if (len) { /* We have a driver. No idea if it exists though */ - // The driver should decide this: - len++; // skip driver name + opening bracket - - // XXX put @ handling in here, too for flash@addr and mem@addr - - if (isdigit(arg[len])) { - disk = arg[len] - '0'; - len++; - if (isdigit(arg[len])) { /* More than 9 drives? */ - /* ok, get one more number. No more than 99 drives */ - disk *= 10; - disk += arg[len] - '0'; - len++; - } + if (isdigit(arg[i])) { + char *postnum; + disk = strtoul(arg+i, &postnum, 10); + i = postnum - arg; } - if (arg[len] == ',') { - len++; - part = arg[len] - '0'; - len++; - if (isdigit(arg[len])) { /* More than 9 partitions? */ - /* ok, get one more number. No more than 99 - * partitions */ - part *= 10; - part += arg[len] - '0'; - len++; - } + + if (arg[i] == ',') { + char *postnum; + part = strtoul(arg+i+1, &postnum, 10) + 1; + i = postnum - arg; } - if (arg[len] != ')') { - grub_printf("Drive Error.\n"); - // set len = 0 --> just copy the drive name - len = 0; - } else { - len++; // skip closing bracket + + if (arg[i] == '@') { + char *postnum; + addr = strtoul(arg+i+1, &postnum, 0); + i = postnum - arg; } - } - if (disk == -1) { - int cnt = 0; - len = 0; - while ((arg[cnt] != 0) && (arg[cnt+1] != 0)) { - if (arg[cnt] == ':' && arg[cnt+1] == '/') { - /* The user did specify a FILO name already */ - len = cnt; - break; - } - cnt++; + if (arg[i] == ')') i++; + + arg += i; + } else if ((use_rootdev == 0) || (strchr(arg, ':') != NULL)) { + // linux-style device specifier or + // leading device name required (assume it's linux-style then) + i = parse_linux_style_driver(arg, drivername, &disk); + + if (isdigit(arg[i])) { + char *postnum; + part = strtoul(arg+i, &postnum, 10); + i = postnum - arg; } - } else { - if (part == -1) { // No partition - sprintf(devicename, "%s%c:", drivername, disk + 'a'); - } else { // both disk and partition - sprintf(devicename, "%s%c%d:", drivername, disk + 'a', part + 1); + + if (arg[i] == '@') { + char *postnum; + addr = strtoul(arg+i+1, &postnum, 0); + i = postnum - arg; } - strncat(path, devicename, BOOT_LINE_LENGTH); - arg += len; // skip original drive name + + if (arg[i] == ':') i++; + arg += i; } - if (use_rootdev && !len) { // No drive was explicitly specified - if (strlen(root_device)) { // But someone set a root device - strncat(path, root_device, BOOT_LINE_LENGTH); - } + if ((disk == -1) && (part != -1) && (strlen(drivername) == 0)) { + // special case for partition-only identifiers: + // take driver and disk number from root_device + i = parse_linux_style_driver(root_device, drivername, &disk); } - /* Copy the rest over */ - strncat(path, arg, BOOT_LINE_LENGTH); + if (!append) path[0] = 0; + if ((use_rootdev == 1) && (strlen(drivername) == 0)) { + strlcat(path, root_device, BOOT_LINE_LENGTH); + } else { + char buffer[32]; + strlcat(path, drivername, BOOT_LINE_LENGTH); + if (disk != -1) { + snprintf(buffer, 31, "%c", 'a'+disk); + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + if (part != -1) { + snprintf(buffer, 31, "%d", part); + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + if (addr != -1) { + snprintf(buffer, 31, "@0x%x", addr); + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + buffer[0]=':'; + buffer[1]='\0'; + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + strlcat(path, arg, BOOT_LINE_LENGTH); } /* initrd */ static int initrd_func(char *arg, int flags) { - initrd_space[0]=0; // Erase string - copy_path_to_filo_bootline(arg, initrd_space, 1); + copy_path_to_filo_bootline(arg, initrd_space, 1, 0); if (!file_open(initrd_space)) { initrd_space[0]=0; // Erase string errnum = ERR_FILE_NOT_FOUND; @@ -877,12 +901,8 @@ static int kernel_func(char *arg, int flags) kernel_type = KERNEL_TYPE_NONE; - /* clear out boot_line. Kernel is the first thing */ - boot_line[0] = 0; // Erase string - /* Get the real boot line and extract the kernel name */ - temp_space[0] = 0; // Erase string - copy_path_to_filo_bootline(arg, temp_space, 1); + copy_path_to_filo_bootline(arg, temp_space, 1, 0); i=0; while ((temp_space[i] != 0) && (temp_space[i]!=' ')) i++; temp_space[i] = 0; @@ -897,7 +917,7 @@ static int kernel_func(char *arg, int flags) /* Needed to pass grub checks */ kernel_type = KERNEL_TYPE_LINUX; - copy_path_to_filo_bootline(arg, boot_line, 1); + copy_path_to_filo_bootline(arg, boot_line, 1, 0); return 0; } @@ -1319,8 +1339,7 @@ static int root_func(char *arg, int flags) { int len; - root_device[0] = 0; /* Clear root device */ - copy_path_to_filo_bootline(arg, root_device, 0); + copy_path_to_filo_bootline(arg, root_device, 0, 0); /* The following code handles an extra case * where the user specifies "root hde1" without @@ -1790,8 +1809,7 @@ static int cat_func(char *arg, int flags) char buf[4096]; int len; - temp_space[0]=0; - copy_path_to_filo_bootline(arg, temp_space, 1); + copy_path_to_filo_bootline(arg, temp_space, 1, 0); if (temp_space[0]==0) { return help_func("cat",0); } diff --git a/main/grub/grub.c b/main/grub/grub.c index b1fcdd1..1afdadd 100644 --- a/main/grub/grub.c +++ b/main/grub/grub.c @@ -127,7 +127,7 @@ void manual_grub_menulst(void) break; if (line[0]) { - copy_path_to_filo_bootline(line, config_file, 0); + copy_path_to_filo_bootline(line, config_file, 0, 1); break; } } @@ -143,8 +143,7 @@ int probe_menulst(char *bootdevice, char *filename) strcpy(menulst, bootdevice); strncat(menulst, filename, 256); /* Set string to zero: */ - config_file[0] = 0; - copy_path_to_filo_bootline(menulst, config_file, 0); + copy_path_to_filo_bootline(menulst, config_file, 0, 0); if (file_open(config_file)) { /* We found a config file. Bail out */ /* The valid config file name stays in config_file[] */

1 0

Patch set updated for filo: 876ac94 Allow switching between partitions on the current device
by Patrick Georgi 09 Sep '11

09 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/198 -gerrit commit 876ac941e9209166c83667a7eaffe7eab98e33d2 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Thu Mar 24 09:13:54 2011 +0100 Allow switching between partitions on the current device root (,1) or configfile 2:/filo.lst work now and change the active partition on the current device (as defined by "root"). Change-Id: I271f5f407297c072f35ac8410c278b1c9442d654 Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- include/grub/shared.h | 2 +- main/grub/builtins.c | 184 +++++++++++++++++++++++++++---------------------- main/grub/grub.c | 5 +- 3 files changed, 104 insertions(+), 87 deletions(-) diff --git a/include/grub/shared.h b/include/grub/shared.h index 127b74f..9e74d7c 100644 --- a/include/grub/shared.h +++ b/include/grub/shared.h @@ -304,6 +304,6 @@ int print_completions (int is_filename, int is_completion); int check_password(char *entered, char* expected, password_t type); /* FILO specific stuff */ -void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev); +void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev, int append); #endif /* ! GRUB_SHARED_HEADER */ diff --git a/main/grub/builtins.c b/main/grub/builtins.c index c926b7d..e2f4612 100644 --- a/main/grub/builtins.c +++ b/main/grub/builtins.c @@ -303,8 +303,7 @@ static int configfile_func(char *arg, int flags) extern int is_opened, keep_cmdline_running; /* Check if the file ARG is present. */ - temp_space[0]=0; - copy_path_to_filo_bootline(arg, temp_space, 1); + copy_path_to_filo_bootline(arg, temp_space, 1, 0); if (temp_space[0]==0) { return help_func("configfile",0); } @@ -316,8 +315,7 @@ static int configfile_func(char *arg, int flags) file_close(); /* Copy ARG to CONFIG_FILE. */ - memset(config_file, 0, 128); - copy_path_to_filo_bootline(arg, config_file, 1); + copy_path_to_filo_bootline(arg, config_file, 1, 0); /* Force to load the configuration file. */ is_opened = 0; @@ -632,114 +630,140 @@ static struct builtin builtin_hiddenmenu = { }; /** + * @param arg linux style driver specifier + * @param drivername driver name (out) + * @param disk disk number (out) + * @return length of parsed string + */ +static +int parse_linux_style_driver(char *arg, char *drivername, int *disk) +{ + int i = 0; + + *disk = -1; + drivername[0] = '\0'; + while ((i < 16) && (isalpha(arg[i]))) { + drivername[i] = arg[i]; + i++; + } + + if (i > 0) { + drivername[--i] = '\0'; + *disk = arg[i]-'a'; + i++; + } + return i; +} + +/** * @param arg source pointer with grub device names * @param path destination pointer (will be filled with filo device names) * @param use_rootdev values other than zero mean the root device set by the "root" * command is taken into regard here. This has to be zero when calling from root_func. */ -void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev) +void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev, int append) { char devicename[16]; char drivername[16]; int disk, part; + unsigned long addr; int i, len; - - /* Clean up */ memset(devicename, 0, 16); memset(drivername, 0, 16); + disk = -1; + part = -1; + addr = -1; - /* Copy over the driver name: "hd", "ud", "sd" ... */ if (arg[0] == '(') { + // grub style device specifier i = 1; /* Read until we encounter a number, a comma or a closing * bracket */ - while ((i <= 16) && (arg[i]) && (!isdigit(arg[i])) && (arg[i] != ',') - && (arg[i] != ')')) { + while ((i <= 16) && (isalpha(arg[i]))) { drivername[i - 1] = arg[i]; i++; } - } - disk = -1; - part = -1; - - len = strlen(drivername); - if (len) { /* We have a driver. No idea if it exists though */ - // The driver should decide this: - len++; // skip driver name + opening bracket - - // XXX put @ handling in here, too for flash@addr and mem@addr - - if (isdigit(arg[len])) { - disk = arg[len] - '0'; - len++; - if (isdigit(arg[len])) { /* More than 9 drives? */ - /* ok, get one more number. No more than 99 drives */ - disk *= 10; - disk += arg[len] - '0'; - len++; - } + if (isdigit(arg[i])) { + char *postnum; + disk = strtoul(arg+i, &postnum, 10); + i = postnum - arg; } - if (arg[len] == ',') { - len++; - part = arg[len] - '0'; - len++; - if (isdigit(arg[len])) { /* More than 9 partitions? */ - /* ok, get one more number. No more than 99 - * partitions */ - part *= 10; - part += arg[len] - '0'; - len++; - } + + if (arg[i] == ',') { + char *postnum; + part = strtoul(arg+i+1, &postnum, 10) + 1; + i = postnum - arg; } - if (arg[len] != ')') { - grub_printf("Drive Error.\n"); - // set len = 0 --> just copy the drive name - len = 0; - } else { - len++; // skip closing bracket + + if (arg[i] == '@') { + char *postnum; + addr = strtoul(arg+i+1, &postnum, 0); + i = postnum - arg; } - } - if (disk == -1) { - int cnt = 0; - len = 0; - while ((arg[cnt] != 0) && (arg[cnt+1] != 0)) { - if (arg[cnt] == ':' && arg[cnt+1] == '/') { - /* The user did specify a FILO name already */ - len = cnt; - break; - } - cnt++; + if (arg[i] == ')') i++; + + arg += i; + } else if ((use_rootdev == 0) || (strchr(arg, ':') != NULL)) { + // linux-style device specifier or + // leading device name required (assume it's linux-style then) + i = parse_linux_style_driver(arg, drivername, &disk); + + if (isdigit(arg[i])) { + char *postnum; + part = strtoul(arg+i, &postnum, 10); + i = postnum - arg; } - } else { - if (part == -1) { // No partition - sprintf(devicename, "%s%c:", drivername, disk + 'a'); - } else { // both disk and partition - sprintf(devicename, "%s%c%d:", drivername, disk + 'a', part + 1); + + if (arg[i] == '@') { + char *postnum; + addr = strtoul(arg+i+1, &postnum, 0); + i = postnum - arg; } - strncat(path, devicename, BOOT_LINE_LENGTH); - arg += len; // skip original drive name + + if (arg[i] == ':') i++; + arg += i; } - if (use_rootdev && !len) { // No drive was explicitly specified - if (strlen(root_device)) { // But someone set a root device - strncat(path, root_device, BOOT_LINE_LENGTH); - } + if ((disk == -1) && (part != -1) && (strlen(drivername) == 0)) { + // special case for partition-only identifiers: + // take driver and disk number from root_device + i = parse_linux_style_driver(root_device, drivername, &disk); } - /* Copy the rest over */ - strncat(path, arg, BOOT_LINE_LENGTH); + if (!append) path[0] = 0; + if ((use_rootdev == 1) && (strlen(drivername) == 0)) { + strlcat(path, root_device, BOOT_LINE_LENGTH); + } else { + char buffer[32]; + strlcat(path, drivername, BOOT_LINE_LENGTH); + if (disk != -1) { + snprintf(buffer, 31, "%c", 'a'+disk); + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + if (part != -1) { + snprintf(buffer, 31, "%d", part); + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + if (addr != -1) { + snprintf(buffer, 31, "@0x%x", addr); + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + buffer[0]=':'; + buffer[1]='\0'; + strlcat(path, buffer, BOOT_LINE_LENGTH); + } + strlcat(path, arg, BOOT_LINE_LENGTH); } /* initrd */ static int initrd_func(char *arg, int flags) { - initrd_space[0]=0; // Erase string - copy_path_to_filo_bootline(arg, initrd_space, 1); + copy_path_to_filo_bootline(arg, initrd_space, 1, 0); if (!file_open(initrd_space)) { initrd_space[0]=0; // Erase string errnum = ERR_FILE_NOT_FOUND; @@ -877,12 +901,8 @@ static int kernel_func(char *arg, int flags) kernel_type = KERNEL_TYPE_NONE; - /* clear out boot_line. Kernel is the first thing */ - boot_line[0] = 0; // Erase string - /* Get the real boot line and extract the kernel name */ - temp_space[0] = 0; // Erase string - copy_path_to_filo_bootline(arg, temp_space, 1); + copy_path_to_filo_bootline(arg, temp_space, 1, 0); i=0; while ((temp_space[i] != 0) && (temp_space[i]!=' ')) i++; temp_space[i] = 0; @@ -897,7 +917,7 @@ static int kernel_func(char *arg, int flags) /* Needed to pass grub checks */ kernel_type = KERNEL_TYPE_LINUX; - copy_path_to_filo_bootline(arg, boot_line, 1); + copy_path_to_filo_bootline(arg, boot_line, 1, 0); return 0; } @@ -1319,8 +1339,7 @@ static int root_func(char *arg, int flags) { int len; - root_device[0] = 0; /* Clear root device */ - copy_path_to_filo_bootline(arg, root_device, 0); + copy_path_to_filo_bootline(arg, root_device, 0, 0); /* The following code handles an extra case * where the user specifies "root hde1" without @@ -1790,8 +1809,7 @@ static int cat_func(char *arg, int flags) char buf[4096]; int len; - temp_space[0]=0; - copy_path_to_filo_bootline(arg, temp_space, 1); + copy_path_to_filo_bootline(arg, temp_space, 1, 0); if (temp_space[0]==0) { return help_func("cat",0); } diff --git a/main/grub/grub.c b/main/grub/grub.c index 7881a98..f4deedf 100644 --- a/main/grub/grub.c +++ b/main/grub/grub.c @@ -127,7 +127,7 @@ void manual_grub_menulst(void) break; if (line[0]) { - copy_path_to_filo_bootline(line, config_file, 0); + copy_path_to_filo_bootline(line, config_file, 0, 1); break; } } @@ -143,8 +143,7 @@ int probe_menulst(char *bootdevice, char *filename) strcpy(menulst, bootdevice); strncat(menulst, filename, 256); /* Set string to zero: */ - config_file[0] = 0; - copy_path_to_filo_bootline(menulst, config_file, 0); + copy_path_to_filo_bootline(menulst, config_file, 0, 0); if (file_open(config_file)) { /* We found a config file. Bail out */ /* The valid config file name stays in config_file[] */

1 0

Patch merged into filo/master: 3fa954b Add non-interactive mode for FILO
by gerrit＠coreboot.org 09 Sep '11

09 Sep '11

the following patch was just integrated into master: commit 3fa954bd32a3b990ce7a6dda83890cd481422273 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Mon Mar 8 13:14:24 2010 +0100 Add non-interactive mode for FILO It forbids modifications of the configuration loaded and prevents entering the command line mode. Change-Id: I8c13d64832b6f8659927ec1e5fe3b527ef8cbdc4 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> See http://review.coreboot.org/195 for details. -gerrit

1 0

Patch set updated for filo: 3fa954b Add non-interactive mode for FILO
by Patrick Georgi 09 Sep '11

09 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/195 -gerrit commit 3fa954bd32a3b990ce7a6dda83890cd481422273 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Mon Mar 8 13:14:24 2010 +0100 Add non-interactive mode for FILO It forbids modifications of the configuration loaded and prevents entering the command line mode. Change-Id: I8c13d64832b6f8659927ec1e5fe3b527ef8cbdc4 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- Config.in | 7 +++++++ main/filo.c | 17 +++++++++++++++++ main/grub/cmdline.c | 4 ++++ main/grub/grub.c | 40 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 67 insertions(+), 1 deletions(-) diff --git a/Config.in b/Config.in index a8cbfbb..251bd2a 100644 --- a/Config.in +++ b/Config.in @@ -24,6 +24,13 @@ config USE_GRUB help Use GRUB legacy like interface instead of autoboot? +config NON_INTERACTIVE + bool "non-interactive interface" + default n + help + Build a non-interactive interface to disallow modifications of + the boot options, e.g. the kernel to load or the command line. + config PROMPT string "Command line prompt" default "filo" diff --git a/main/filo.c b/main/filo.c index a8bf372..e37559b 100644 --- a/main/filo.c +++ b/main/filo.c @@ -156,6 +156,10 @@ int main(void) #ifdef CONFIG_AUTOBOOT_FILE #ifdef CONFIG_AUTOBOOT_DELAY +#ifdef CONFIG_NON_INTERACTIVE +#error "autoboot delay is not supported for non-interactive builds" +#define autoboot_delay() 0 /* success */ +#else static inline int autoboot_delay(void) { u64 timeout; @@ -189,13 +193,16 @@ static inline int autoboot_delay(void) return 0; /* default accepted */ } } +#endif /* CONFIG_NON_INTERACTIVE */ #endif /* CONFIG_AUTOBOOT_DELAY */ static void autoboot(void) { +#ifndef CONFIG_NON_INTERACTIVE /* If Escape key is pressed already, skip autoboot */ if (havechar() && getchar()==ESCAPE) return; +#endif /* CONFIG_NON_INTERACTIVE */ if (autoboot_delay()==0) { printf("boot: %s\n", CONFIG_AUTOBOOT_FILE); @@ -215,6 +222,7 @@ int main(void) /* Try default image */ autoboot(); +#ifndef CONFIG_NON_INTERACTIVE /* The above didn't work, ask user */ while (havechar()) getchar(); @@ -233,6 +241,15 @@ int main(void) if (line[0]) boot(line); } +#else /* ! CONFIG_NON_INTERACTIVE */ + for (;;) { + printf("\nAutoboot failed! Press any key to reboot.\n"); + getchar(); + if (reset_handler) { + reset_handler(); + } + } +#endif /* CONFIG_NON_INTERACTIVE */ return 0; } diff --git a/main/grub/cmdline.c b/main/grub/cmdline.c index 1f56ac6..2ace871 100644 --- a/main/grub/cmdline.c +++ b/main/grub/cmdline.c @@ -40,6 +40,7 @@ char *skip_to(int after_equal, char *cmdline) return cmdline; } +#ifndef CONFIG_NON_INTERACTIVE /* Print a helpful message for the command-line interface. */ void print_cmdline_message(int type) { @@ -67,6 +68,7 @@ void print_cmdline_message(int type) grub_printf("\n"); #endif } +#endif /* CONFIG_NON_INTERACTIVE */ /* Find the builtin whose command name is COMMAND and return the * pointer. If not found, return 0. @@ -118,6 +120,7 @@ static void init_cmdline(void) init_builtins(); } +#ifndef CONFIG_NON_INTERACTIVE /* Enter the command-line interface. HEAP is used for the command-line * buffer. Return only if FOREVER is nonzero and get_cmdline returns * nonzero (ESC is pushed). @@ -179,6 +182,7 @@ void enter_cmdline(char *heap, int forever) count_lines = -1; } } +#endif /* CONFIG_NON_INTERACTIVE */ /* Run an entry from the script SCRIPT. HEAP is used for the command-line buffer. If an error occurs, return non-zero, otherwise diff --git a/main/grub/grub.c b/main/grub/grub.c index 7881a98..b1fcdd1 100644 --- a/main/grub/grub.c +++ b/main/grub/grub.c @@ -191,6 +191,16 @@ old: } +static void reboot(void) { + for (;;) { + grub_printf("Press any key to reboot.\n"); + getchar(); + if (reset_handler) { + reset_handler(); + } + } +} + /* Define if there is user specified preset menu string */ /* #undef PRESET_MENU_STRING */ @@ -409,16 +419,27 @@ static void run_menu(char *menu_entries, char *config_entries, int num_entries, password to unlock the next set of features."); } else { if (config_entries) +#ifndef CONFIG_NON_INTERACTIVE grub_printf("\ Press enter to boot the selected OS, \'e\' to edit the\n\ commands before booting, \'a\' to modify the kernel arguments\n\ before booting, or \'c\' for a command-line."); +#else /* ! CONFIG_NON_INTERACTIVE */ + grub_printf("\ + Press enter to boot the selected OS, \'e\' to see the\n\ + commands before booting."); +#endif /* CONFIG_NON_INTERACTIVE */ else +#ifndef CONFIG_NON_INTERACTIVE grub_printf("\ Press \'b\' to boot, \'e\' to edit the selected command in the\n\ boot sequence, \'c\' for a command-line, \'o\' to open a new line\n\ after (\'O\' for before) the selected line, \'d\' to remove the\n\ selected line, or escape to go back to the main menu."); +#else /* ! CONFIG_NON_INTERACTIVE */ + grub_printf("\ + Press \'b\' to boot or escape to go back to the main menu."); +#endif /* CONFIG_NON_INTERACTIVE */ } print_entries(3, 12, first_entry, entryno, menu_entries); @@ -520,6 +541,7 @@ static void run_menu(char *menu_entries, char *config_entries, int num_entries, if ((c == '\n') || (c == '\r') || (c == 6)) break; } else { +#ifndef CONFIG_NON_INTERACTIVE if ((c == 'd') || (c == 'o') || (c == 'O')) { print_entry(4 + entryno, 0, get_entry(menu_entries, first_entry + entryno, 0)); @@ -565,6 +587,7 @@ static void run_menu(char *menu_entries, char *config_entries, int num_entries, print_entries(3, 12, first_entry, entryno, menu_entries); } +#endif /* CONFIG_NON_INTERACTIVE */ cur_entry = menu_entries; if (c == 27) @@ -645,6 +668,7 @@ static void run_menu(char *menu_entries, char *config_entries, int num_entries, if (config_entries) run_menu(heap, NULL, new_num_entries, new_heap, 0); +#ifndef CONFIG_NON_INTERACTIVE else { /* flush color map */ grub_printf(" "); @@ -677,9 +701,11 @@ static void run_menu(char *menu_entries, char *config_entries, int num_entries, heap += (j - i); } } +#endif /* CONFIG_NON_INTERACTIVE */ goto restart; } +#ifndef CONFIG_NON_INTERACTIVE if (c == 'c') { extern int keep_cmdline_running; enter_cmdline(heap, 0); @@ -778,6 +804,7 @@ static void run_menu(char *menu_entries, char *config_entries, int num_entries, break; } +#endif /* CONFIG_NON_INTERACTIVE */ } } } @@ -1077,7 +1104,11 @@ restart: } if (!is_opened) { - grub_printf("Could not open menu.lst file '%s'. Entering command line.\n", config_file); +#ifndef CONFIG_NON_INTERACTIVE + grub_printf("Could not open configuration file '%s'. Entering command line.\n", config_file); +#else /* ! CONFIG_NON_INTERACTIVE */ + grub_printf("Could not open configuration file '%s'.\n", config_file); +#endif /* CONFIG_NON_INTERACTIVE */ // memset(myheap, 0, 256); // run_script("terminal console\n\0", myheap); break; @@ -1205,10 +1236,17 @@ restart: } while (is_preset); if (!num_entries) { +#ifndef CONFIG_NON_INTERACTIVE /* If no acceptable config file, goto command-line, starting heap from where the config entries would have been stored if there were any. */ enter_cmdline(config_entries, 1); +#else /* ! CONFIG_NON_INTERACTIVE */ + for (;;) { + grub_printf("\nNo menu entries found. Giving up.\n"); + reboot(); + } +#endif /* CONFIG_NON_INTERACTIVE */ } else { /* Run menu interface. */ run_menu(menu_entries, config_entries, num_entries, menu_entries + menu_len, default_entry);

1 0

Patch merged into filo/master: 9518da0 Make 'configfile' and 'root' commands be available from scripting mode.
by gerrit＠coreboot.org 09 Sep '11

09 Sep '11

the following patch was just integrated into master: commit 9518da06954afafe1c6929096e4e3f2311bd13d9 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Mon Mar 8 11:46:29 2010 +0100 Make 'configfile' and 'root' commands be available from scripting mode. When a 'configfile' command is encountered, restart with that new config file. Change-Id: I042506e236b0fb7f10e20ea3f0f3764414167dce Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> See http://review.coreboot.org/194 for details. -gerrit

1 0

Patch set updated for filo: 9518da0 Make 'configfile' and 'root' commands be available from scripting mode.
by Patrick Georgi 09 Sep '11

09 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/194 -gerrit commit 9518da06954afafe1c6929096e4e3f2311bd13d9 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Mon Mar 8 11:46:29 2010 +0100 Make 'configfile' and 'root' commands be available from scripting mode. When a 'configfile' command is encountered, restart with that new config file. Change-Id: I042506e236b0fb7f10e20ea3f0f3764414167dce Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- main/grub/builtins.c | 9 +++++++-- main/grub/grub.c | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/main/grub/builtins.c b/main/grub/builtins.c index 6b10202..c926b7d 100644 --- a/main/grub/builtins.c +++ b/main/grub/builtins.c @@ -49,6 +49,9 @@ unsigned long install_partition = 0x20000; unsigned long boot_drive = 0; char config_file[128] = "\0"; +/* indicator if we encountered a 'configfile' command and have to restart */ +int reload_configfile = 0; + kernel_t kernel_type; /* The fallback entry. */ @@ -91,6 +94,7 @@ void init_config(void) fallback_entryno = -1; fallback_entries[0] = -1; grub_timeout = -1; + reload_configfile = 0; } int check_password(char *entered, char *expected, password_t type) @@ -318,6 +322,7 @@ static int configfile_func(char *arg, int flags) /* Force to load the configuration file. */ is_opened = 0; keep_cmdline_running = 0; + reload_configfile = 1; /* Make sure that the user will not be authoritative. */ auth = 0; @@ -328,7 +333,7 @@ static int configfile_func(char *arg, int flags) static struct builtin builtin_configfile = { "configfile", configfile_func, - BUILTIN_CMDLINE | BUILTIN_HELP_LIST, + BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST, "configfile FILE", "Load FILE as the configuration file." }; @@ -1333,7 +1338,7 @@ static int root_func(char *arg, int flags) static struct builtin builtin_root = { "root", root_func, - BUILTIN_CMDLINE | BUILTIN_HELP_LIST, + BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST, "root [DEVICE]", "Set the current \"root device\" to the device DEVICE." }; diff --git a/main/grub/grub.c b/main/grub/grub.c index 15f0ece..7881a98 100644 --- a/main/grub/grub.c +++ b/main/grub/grub.c @@ -28,6 +28,7 @@ #include <arch/timer.h> extern char config_file[]; +extern int reload_configfile; char PASSWORD_BUF[PASSWORD_BUFLEN]; /* The buffer for the password. */ char DEFAULT_FILE_BUF[DEFAULT_FILE_BUFLEN]; /* THe buffer for the filename of "/boot/grub/default". */ @@ -813,6 +814,11 @@ static void run_menu(char *menu_entries, char *config_entries, int num_entries, break; } + /* return to reload the config file */ + if (reload_configfile) { + return; + } + show_menu = 1; goto restart; } @@ -1004,9 +1010,12 @@ void grub_main(void) /* Never return. */ for (;;) { char buf[10]; /* This is good enough. */ - char *default_file = (char *) DEFAULT_FILE_BUF; + char *default_file; int i; +restart: + default_file = (char *) DEFAULT_FILE_BUF; + reset(); /* Here load the configuration file. */ @@ -1124,6 +1133,11 @@ void grub_main(void) cmdline); (builtin->func) (arg, BUILTIN_MENU); errnum = 0; + + /* if the command was configfile, restart */ + if (reload_configfile) { + goto restart; + } } else /* Ignored. */ continue;

1 0

Patch merged into filo/master: 1a7a12a Add nvram command
by gerrit＠coreboot.org 09 Sep '11

09 Sep '11

the following patch was just integrated into master: commit 1a7a12a4cf5908948cec51134a14eda0c4fde28a Author: Stefan Reinauer <stefan.reinauer(a)coresystems.de> Date: Fri Jun 4 09:25:50 2010 +0200 Add nvram command Change-Id: Ib95ee0d4fa8dcaf002ffe2b18d4975e301d00a6a Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> See http://review.coreboot.org/196 for details. -gerrit

1 0

Patch set updated for filo: 1a7a12a Add nvram command
by Patrick Georgi 09 Sep '11

09 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/196 -gerrit commit 1a7a12a4cf5908948cec51134a14eda0c4fde28a Author: Stefan Reinauer <stefan.reinauer(a)coresystems.de> Date: Fri Jun 4 09:25:50 2010 +0200 Add nvram command Change-Id: Ib95ee0d4fa8dcaf002ffe2b18d4975e301d00a6a Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- main/grub/builtins.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/main/grub/builtins.c b/main/grub/builtins.c index b09076a..6b10202 100644 --- a/main/grub/builtins.c +++ b/main/grub/builtins.c @@ -1093,6 +1093,70 @@ static struct builtin builtin_md5crypt = { }; #endif /* CONFIG_USE_MD5_PASSWORDS */ +#if CONFIG_DEVELOPER_TOOLS +/* nvram */ +static int nvram_func(char *arg, int flags) +{ +#define RTC_BOOT_BYTE 48 // Hard coded in coreboot + u8 rtc_boot_byte; + // bit len name + // 0 1 boot_option + // 1 1 last_boot + // 4 4 reboot_bits + + rtc_boot_byte = nvram_read(RTC_BOOT_BYTE); + + if (memcmp(arg, "normal", 6) == 0) { + rtc_boot_byte &= 0x03; // drop reboot_bits + rtc_boot_byte |= 1; // normal + nvram_write(rtc_boot_byte, RTC_BOOT_BYTE); + return 0; + } + + if (memcmp(arg, "fallback", 8) == 0) { + rtc_boot_byte &= 0x03; // drop reboot_bits + rtc_boot_byte &= ~1; // fallback + nvram_write(rtc_boot_byte, RTC_BOOT_BYTE); + return 0; + } + + // TODO not really default, but rather "null everything out and fix the + // checksum" + if (memcmp(arg, "default", 7) == 0) { + int i; + int range_start = lib_sysinfo.cmos_range_start / 8; + int range_end = lib_sysinfo.cmos_range_end / 8; + for (i= range_start; i<range_end; i++) + nvram_write(0, i); + fix_options_checksum(); + return 0; + } + + + if (!strlen(arg)) { + grub_printf("NVRAM Settings:\n"); + grub_printf(" boot option: %s\n", + (rtc_boot_byte & (1 << 0)) ? "Normal" : "Fallback"); + grub_printf(" last boot: %s\n", + (rtc_boot_byte & (1 << 1)) ? "Normal" : "Fallback"); + grub_printf(" reboot_bits: %d\n", (rtc_boot_byte >> 4)); + return 0; + } + + errnum = ERR_BAD_ARGUMENT; + return 1; +} + +static struct builtin builtin_nvram = { + "nvram", + nvram_func, + BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_NO_ECHO, + "nvram [normal|fallback]", + "Change the coreboot nvram to boot the normal or fallback" + "image on the next boot." +}; +#endif + /* password */ static int password_func(char *arg, int flags) { @@ -1781,6 +1845,9 @@ struct builtin *builtin_table[] = { #ifdef CONFIG_USE_MD5_PASSWORDS &builtin_md5crypt, #endif +#ifdef CONFIG_DEVELOPER_TOOLS + &builtin_nvram, +#endif &builtin_password, &builtin_pause, &builtin_poweroff,

1 0

E350M1 does not POST
by perh52＠runbox.com 08 Sep '11

08 Sep '11

>>> Hi, >>> >>>> Upon booting, I get this: >>> >>> [...] >>> >>> you could try commit 0df0e14fb, that may or may not work, the commit after >>> that broke fusion boards completely, apparently. >>> >>> Florian >>> >> Thank you! I can confirm that 0df0e14fb works properly. >> -Marshall > >Frank, > >It looks like we have a regression. Is there some dependency on the >other patches that have not yet been committed? > >Marc Unfortunately git bisect is no help here because the commit which caused the regression was a huge one. It's important that large patches are broken down into a set of small comprehensible patches, each with an explanatory commit message. <<quote from git-bisect-lk2009.html documentation>> ... sometimes "interesting" changes of behavior in the software are introduced in some commits. In fact people are specially interested in commits that introduce a "bad" behavior, called a bug or a regression. They are interested in these commits because a commit (hopefully) contains a very small set of source code changes. And it's much easier to understand and properly fix a problem when you only need to check a very small set of changes, than when you don't know where look in the first place. So to help people find commits that introduce a "bad" behavior, the "git bisect" set of commands was invented. ...

4 7

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot September 2011