coreboot September 2011

coreboot@coreboot.org

40 participants
224 discussions

New patch to review: baef0d7 Add non-interactive mode for FILO
by Patrick Georgi 05 Sep '11

05 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 baef0d7d5f7aa45289c113de918584ebdf3b8735 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 8981a48..b1da531 100644 --- a/Config.in +++ b/Config.in @@ -17,6 +17,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

New patch to review: 207611a Make 'configfile' and 'root' commands be available from scripting mode.
by Patrick Georgi 05 Sep '11

05 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 207611a5910a4604c730658e5b919e93271b1ebc 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 b09076a..79d237e 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." }; @@ -1269,7 +1274,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

New patch to review: 0ca6ae9 Show which file cannot be openend in file_open(), eases debuging.
by Patrick Georgi 05 Sep '11

05 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/193 -gerrit commit 0ca6ae94bb6be913aef972b93e8e1a05f98cdfad Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Thu Jun 3 15:39:46 2010 +0200 Show which file cannot be openend in file_open(), eases debuging. Change-Id: I06fd3576aa3443588e67234bce748f533c36a8ff Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- fs/vfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/vfs.c b/fs/vfs.c index 18dbcbc..18db6ec 100644 --- a/fs/vfs.c +++ b/fs/vfs.c @@ -191,7 +191,7 @@ int file_open(const char *filename) filepos = 0; errnum = 0; if (!fsys->dir_func((char *) path)) { - printf("File not found.\n"); + printf("File not found '%s'.\n", filename); goto out; } retval = 1;

1 0

New patch to review: a8b71bd Unlock ATAPI devices on boot
by Patrick Georgi 05 Sep '11

05 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/192 -gerrit commit a8b71bd56bf205fd2add685ba8e0f0412a123080 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Aug 24 11:07:21 2010 +0200 Unlock ATAPI devices on boot This makes CD/DVD drives accessible that were locked prior to a reboot. Change-Id: I4f2a0ddafac2debe0a1564904f37025850cc519e Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- drivers/ide_new.c | 13 +++++++++++++ drivers/ide_new.h | 1 + 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/drivers/ide_new.c b/drivers/ide_new.c index ddcc027..a2870b8 100644 --- a/drivers/ide_new.c +++ b/drivers/ide_new.c @@ -658,6 +658,19 @@ ob_ide_atapi_drive_ready(struct ide_drive *drive) return 1; } + /* clear Persistent Prevent State */ + memset (cmd, 0, sizeof(*cmd)); + cmd->cdb[0] = ATAPI_PREVENT_ALLOW_MEDIUM_REMOVAL; + cmd->cdb[2] = 2; + if (ob_ide_atapi_packet(drive, cmd)) + printf("could not persistently unlock device\n"); + + /* clear Prevent State */ + memset (cmd, 0, sizeof(*cmd)); + cmd->cdb[0] = ATAPI_PREVENT_ALLOW_MEDIUM_REMOVAL; + if (ob_ide_atapi_packet(drive, cmd)) + printf("could not unlock device\n"); + /* * finally, get capacity and block size */ diff --git a/drivers/ide_new.h b/drivers/ide_new.h index 8d3979a..f667e41 100644 --- a/drivers/ide_new.h +++ b/drivers/ide_new.h @@ -70,6 +70,7 @@ #define ATAPI_READ_10 0x28 #define ATAPI_REQ_SENSE 0x03 #define ATAPI_START_STOP_UNIT 0x1b +#define ATAPI_PREVENT_ALLOW_MEDIUM_REMOVAL 0x1e #define ATAPI_READ_CAPACITY 0x25 /*

1 0

New patch to review: a7ae3fb Wait longer on ATAPI devices
by Patrick Georgi 05 Sep '11

05 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/191 -gerrit commit a7ae3fb9d6257f80036b0db090fbe021d04494b4 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Mar 8 12:43:29 2011 +0100 Wait longer on ATAPI devices Some devices require more time for themselves to get up and running. Change-Id: I347617c97bd02920e49b3cc45aa6c6b37573e0ff Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- drivers/ide_new.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/ide_new.c b/drivers/ide_new.c index 4f612be..ddcc027 100644 --- a/drivers/ide_new.c +++ b/drivers/ide_new.c @@ -633,7 +633,7 @@ ob_ide_atapi_drive_ready(struct ide_drive *drive) if (!ob_ide_atapi_packet(drive,cmd)) break; /* Give the drive some time to breathe */ - mdelay(500); + mdelay(5000); } memset(cmd, 0, sizeof(*cmd));

1 0

New patch to review: e6e5a03 More compatible use of mktemp
by Patrick Georgi 05 Sep '11

05 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/190 -gerrit commit e6e5a03bca182471fa00d937c3235ac00ef0234e Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Thu Sep 1 09:16:37 2011 +0200 More compatible use of mktemp Change-Id: I961a7ddcd39657c9463806d7b82757eff0a4ac57 Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- util/xcompile/xcompile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 5e9ce83..7c1adf3 100644 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -35,7 +35,7 @@ for make in make gmake gnumake; do done GCCPREFIX=invalid -TMPFILE=`mktemp /tmp/temp.XXXX 2>/dev/null || echo /tmp/temp.78gOIUGz` +TMPFILE=`mktemp /tmp/temp.XXXXXX 2>/dev/null || echo /tmp/temp.78gOIUGz` touch $TMPFILE # This should be a loop over all supported architectures

1 0

Patch merged into master: 7f65f07 Add POSIXy readdir/scandir support
by gerrit＠coreboot.org 05 Sep '11

05 Sep '11

the following patch was just integrated into master: commit 7f65f079c80bf52ff9e2f12b3c118ad3dcb5647b Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Jul 19 16:38:23 2011 +0200 Add POSIXy readdir/scandir support This abuses the print_a_completion mechanism to build the right data structures to support opendir/readdir/closedir and scandir on top of them. It's BSD-licensed so it can eventually be moved over to libpayload. Change-Id: Iadc1daed3cab4cf2ead778c23ad756d36cbbb99a Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> See http://review.coreboot.org/119 for details. -gerrit

1 0

Patch merged into master: b431050 Remove useless print_a_completion() stub
by gerrit＠coreboot.org 05 Sep '11

05 Sep '11

the following patch was just integrated into master: commit b4310501fa616a4e5267b57adcb06fbc226a5a14 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Jul 19 16:37:13 2011 +0200 Remove useless print_a_completion() stub There's a real implementation elsewhere and this one only confuses things. Change-Id: I841d9baecbaf298114e508feec89f1b2ea864bb9 Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> See http://review.coreboot.org/118 for details. -gerrit

1 0

Patch merged into master: f916d99 Update defconfig to silence build
by gerrit＠coreboot.org 05 Sep '11

05 Sep '11

the following patch was just integrated into master: commit f916d994f716444edc72ec8af0c9020e16f486ea Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Jul 19 16:35:34 2011 +0200 Update defconfig to silence build Change-Id: Iecc5fef8df78e66bb80b00d786aa4925f13c823a Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> See http://review.coreboot.org/117 for details. -gerrit

1 0

Re: [coreboot] question
by Corey Osgood 04 Sep '11

04 Sep '11

On Sun, Sep 4, 2011 at 10:58 AM, Lyubomir Minchev <ljbomir(a)gmail.com> wrote: > Hi All, > > I have Laptop HP Pavilion dv4 with Chipset Intel 82801 I (ICH9) > > Shall it be compatible with coreboot ? > > The simple answer is no, at this time your chipset is not supported. -Corey

1 0

← Newer
1
...
16
17
18
19
20
21
22
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