coreboot July 2009

coreboot@coreboot.org

75 participants
304 discussions

[RFC] newbuild branch
by Patrick Georgi 31 Jul '09

31 Jul '09

Hi, As some of you might have noticed, there is a coreboot-v2-newbuild branch in the repository. It contains the current state of an effort to get coreboot v2 to build under kconfig/kbuild(-style) tools, which seems to be universally accepted as a desirable goal. (If you don't think so, please state your issues with that, so we wouldn't waste too much time on this, kthx) That work was done in a way that abuild is unaffected: except some minor remaining issues with CONFIG_* prefixes, the source files are exactly the same as upstream, and abuild ran successfully. Two boards are Kconfig'd so far, QEmu and Kontron 986LCD-M, but there are some remaining issues with the Kontron, so it doesn't boot yet. QEmu builds and runs (but without CAR at this time, and that's deliberate to have a test case for a romcc-board) There are quite a lot of things to be done still, and many things are not at the right location yet (eg. many configuration options reside in src/Kconfig when there's a better place for them). Should we push it to trunk now (given that it doesn't break abuild)? Should we define a milestone that has to be completed (eg. a given set of boards has to run)? This is a request for comments, so... :) Thanks, Patrick

4 7

[v2] r4475 - trunk/payloads/libpayload/libc
by svn＠coreboot.org 31 Jul '09

31 Jul '09

Author: stepan Date: 2009-07-31 16:45:41 +0200 (Fri, 31 Jul 2009) New Revision: 4475 Modified: trunk/payloads/libpayload/libc/malloc.c Log: oops, these two were missed in the last cleanup. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/payloads/libpayload/libc/malloc.c =================================================================== --- trunk/payloads/libpayload/libc/malloc.c 2009-07-31 11:39:55 UTC (rev 4474) +++ trunk/payloads/libpayload/libc/malloc.c 2009-07-31 14:45:41 UTC (rev 4475) @@ -271,8 +271,14 @@ static struct align_region_t *allocate_region(struct align_region_t *old_first, int alignment, int num_elements) { struct align_region_t *new_region = malloc(sizeof(struct align_region_t)); + if (!new_region) + return NULL; new_region->alignment = alignment; new_region->start = malloc((num_elements+1) * alignment + num_elements); + if (!new_region->start) { + free(new_region); + return NULL; + } new_region->start_data = (void*)((u32)(new_region->start + num_elements + alignment - 1) & (~(alignment-1))); new_region->size = num_elements * alignment; new_region->free = num_elements;

1 0

[v2] r4474 - in trunk/payloads/libpayload: drivers/usb include/usb libc
by svn＠coreboot.org 31 Jul '09

31 Jul '09

Author: stepan Date: 2009-07-31 13:39:55 +0200 (Fri, 31 Jul 2009) New Revision: 4474 Modified: trunk/payloads/libpayload/drivers/usb/uhci.c trunk/payloads/libpayload/drivers/usb/uhci_rh.c trunk/payloads/libpayload/drivers/usb/usb.c trunk/payloads/libpayload/drivers/usb/usbhid.c trunk/payloads/libpayload/drivers/usb/usbhub.c trunk/payloads/libpayload/drivers/usb/usbmsc.c trunk/payloads/libpayload/include/usb/usb.h trunk/payloads/libpayload/libc/lar.c trunk/payloads/libpayload/libc/malloc.c trunk/payloads/libpayload/libc/readline.c Log: Catch various cases in libpayload where malloc() or memalign() return NULL Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/payloads/libpayload/drivers/usb/uhci.c =================================================================== --- trunk/payloads/libpayload/drivers/usb/uhci.c 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/drivers/usb/uhci.c 2009-07-31 11:39:55 UTC (rev 4474) @@ -130,7 +130,13 @@ int i; hci_t *controller = new_controller (); + if (!controller) + usb_fatal("Could not create USB controller instance.\n"); + controller->instance = malloc (sizeof (uhci_t)); + if(!controller->instance) + usb_fatal("Not enough memory creating USB controller instance.\n"); + controller->start = uhci_start; controller->stop = uhci_stop; controller->reset = uhci_reset; @@ -157,6 +163,9 @@ pci_write_config32 (controller->bus_address, 0xc0, 0x8f00); UHCI_INST (controller)->framelistptr = memalign (0x1000, 1024 * sizeof (flistp_t *)); /* 4kb aligned to 4kb */ + if (! UHCI_INST (controller)->framelistptr) + usb_fatal("Not enough memory for USB frame list pointer.\n"); + memset (UHCI_INST (controller)->framelistptr, 0, 1024 * sizeof (flistp_t)); @@ -168,6 +177,8 @@ for some reason. Not a problem now. */ td_t *antiberserk = memalign(16, sizeof(td_t)); + if (!antiberserk) + usb_fatal("Not enough memory for chipset workaround.\n"); memset(antiberserk, 0, sizeof(td_t)); UHCI_INST (controller)->qh_prei = memalign (16, sizeof (qh_t)); @@ -175,6 +186,12 @@ UHCI_INST (controller)->qh_data = memalign (16, sizeof (qh_t)); UHCI_INST (controller)->qh_last = memalign (16, sizeof (qh_t)); + if (! UHCI_INST (controller)->qh_prei || + ! UHCI_INST (controller)->qh_intr || + ! UHCI_INST (controller)->qh_data || + ! UHCI_INST (controller)->qh_last) + usb_fatal ("Not enough memory for USB controller queues.\n"); + UHCI_INST (controller)->qh_prei->headlinkptr.ptr = virt_to_phys (UHCI_INST (controller)->qh_intr); UHCI_INST (controller)->qh_prei->headlinkptr.queue_head = 1; @@ -508,11 +525,16 @@ td_t *tds = memalign(16, sizeof(td_t) * reqcount); qh_t *qh = memalign(16, sizeof(qh_t)); + if (!data || !tds || !qh) + usb_fatal ("Not enough memory to create USB intr queue prerequisites.\n"); + qh->elementlinkptr.ptr = virt_to_phys(tds); qh->elementlinkptr.queue_head = 0; qh->elementlinkptr.terminate = 0; intr_q *q = malloc(sizeof(intr_q)); + if (!q) + usb_fatal ("Not enough memory to create USB intr queue.\n"); q->qh = qh; q->tds = tds; q->data = data; Modified: trunk/payloads/libpayload/drivers/usb/uhci_rh.c =================================================================== --- trunk/payloads/libpayload/drivers/usb/uhci_rh.c 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/drivers/usb/uhci_rh.c 2009-07-31 11:39:55 UTC (rev 4474) @@ -157,6 +157,9 @@ uhci_rh_enable_port (dev, 1); uhci_rh_enable_port (dev, 2); dev->data = malloc (sizeof (rh_inst_t)); + if (!dev->data) + usb_fatal ("Not enough memory for UHCI RH.\n"); + RH_INST (dev)->port[0] = -1; RH_INST (dev)->port[1] = -1; Modified: trunk/payloads/libpayload/drivers/usb/usb.c =================================================================== --- trunk/payloads/libpayload/drivers/usb/usb.c 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/drivers/usb/usb.c 2009-07-31 11:39:55 UTC (rev 4474) @@ -33,14 +33,16 @@ hci_t *usb_hcs = 0; hci_t * -new_controller () +new_controller (void) { hci_t *controller = malloc (sizeof (hci_t)); - /* atomic */ - controller->next = usb_hcs; - usb_hcs = controller; - /* atomic end */ + if (controller) { + /* atomic */ + controller->next = usb_hcs; + usb_hcs = controller; + /* atomic end */ + } return controller; } @@ -48,13 +50,13 @@ void detach_controller (hci_t *controller) { - if (controller == 0) + if (controller == NULL) return; if (usb_hcs == controller) { usb_hcs = controller->next; } else { hci_t *it = usb_hcs; - while (it != 0) { + while (it != NULL) { if (it->next == controller) { it->next = controller->next; return; @@ -386,3 +388,10 @@ newdev_t->init (newdev_t); return newdev; } + +void +usb_fatal (const char *message) +{ + printf(message); + for (;;) ; +} Modified: trunk/payloads/libpayload/drivers/usb/usbhid.c =================================================================== --- trunk/payloads/libpayload/drivers/usb/usbhid.c 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/drivers/usb/usbhid.c 2009-07-31 11:39:55 UTC (rev 4474) @@ -169,6 +169,8 @@ boot_protos[interface->bInterfaceProtocol]); if (interface->bInterfaceProtocol == hid_boot_proto_keyboard) { dev->data = malloc (sizeof (usbhid_inst_t)); + if (!dev->data) + usb_fatal("Not enough memory for USB HID device.\n"); printf (" configuring...\n"); usb_hid_set_protocol(dev, interface, hid_proto_boot); usb_hid_set_idle(dev, interface, 0); Modified: trunk/payloads/libpayload/drivers/usb/usbhub.c =================================================================== --- trunk/payloads/libpayload/drivers/usb/usbhub.c 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/drivers/usb/usbhub.c 2009-07-31 11:39:55 UTC (rev 4474) @@ -128,6 +128,9 @@ dev->data = malloc (sizeof (usbhub_inst_t)); + if (!dev->data) + usb_fatal("Not enough memory for USB hub.\n"); + HUB_INST (dev)->descriptor = (hub_descriptor_t *) get_descriptor (dev, gen_bmRequestType @@ -137,6 +140,9 @@ HUB_INST (dev)->num_ports = HUB_INST (dev)->descriptor->bNbrPorts; HUB_INST (dev)->ports = malloc (sizeof (int) * (HUB_INST (dev)->num_ports + 1)); + if (! HUB_INST (dev)->ports) + usb_fatal("Not enough memory for USB hub ports.\n"); + for (i = 1; i <= HUB_INST (dev)->num_ports; i++) HUB_INST (dev)->ports[i] = -1; for (i = 1; i <= HUB_INST (dev)->num_ports; i++) Modified: trunk/payloads/libpayload/drivers/usb/usbmsc.c =================================================================== --- trunk/payloads/libpayload/drivers/usb/usbmsc.c 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/drivers/usb/usbmsc.c 2009-07-31 11:39:55 UTC (rev 4474) @@ -346,6 +346,9 @@ } dev->data = malloc (sizeof (usbmsc_inst_t)); + if (!dev->data) + usb_fatal("Not enough memory for USB MSC device.\n"); + MSC_INST (dev)->bulk_in = 0; MSC_INST (dev)->bulk_out = 0; Modified: trunk/payloads/libpayload/include/usb/usb.h =================================================================== --- trunk/payloads/libpayload/include/usb/usb.h 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/include/usb/usb.h 2009-07-31 11:39:55 UTC (rev 4474) @@ -226,4 +226,6 @@ void usb_detach_device(hci_t *controller, int devno); int usb_attach_device(hci_t *controller, int hubaddress, int port, int lowspeed); + +void usb_fatal(const char *message) __attribute__ ((noreturn)); #endif Modified: trunk/payloads/libpayload/libc/lar.c =================================================================== --- trunk/payloads/libpayload/libc/lar.c 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/libc/lar.c 2009-07-31 11:39:55 UTC (rev 4474) @@ -113,6 +113,10 @@ * tear on the heap */ lar->headers = malloc(16 * sizeof(void *)); + + if (!lar->headers) + return NULL; + lar->alloc = 16; lar->count = lar->eof = 0; lar->cindex = 0; Modified: trunk/payloads/libpayload/libc/malloc.c =================================================================== --- trunk/payloads/libpayload/libc/malloc.c 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/libc/malloc.c 2009-07-31 11:39:55 UTC (rev 4474) @@ -309,6 +309,8 @@ if (size == 0) return 0; if (align_regions == 0) { align_regions = malloc(sizeof(struct align_region_t)); + if (align_regions == NULL) + return NULL; memset(align_regions, 0, sizeof(struct align_region_t)); } struct align_region_t *reg = align_regions; Modified: trunk/payloads/libpayload/libc/readline.c =================================================================== --- trunk/payloads/libpayload/libc/readline.c 2009-07-31 11:38:59 UTC (rev 4473) +++ trunk/payloads/libpayload/libc/readline.c 2009-07-31 11:39:55 UTC (rev 4474) @@ -55,6 +55,8 @@ if (!readline_buffer || !readline_bufferlen) { #define READLINE_BUFFERSIZE 256 readline_buffer = malloc(READLINE_BUFFERSIZE); + if (!readline_buffer) + return NULL; readline_bufferlen = READLINE_BUFFERSIZE; memset(readline_buffer, 0, readline_bufferlen); }

1 0

[v2] r4473 - in trunk/payloads/libpayload: curses drivers/video include
by svn＠coreboot.org 31 Jul '09

31 Jul '09

Author: stepan Date: 2009-07-31 13:38:59 +0200 (Fri, 31 Jul 2009) New Revision: 4473 Modified: trunk/payloads/libpayload/curses/keyboard.c trunk/payloads/libpayload/drivers/video/video.c trunk/payloads/libpayload/include/sysinfo.h Log: * drop duplicate prototype for lib_get_sysinfo() * fix delay handling in tiny curses keyboard driver * fix off by one error in video driver Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/payloads/libpayload/curses/keyboard.c =================================================================== --- trunk/payloads/libpayload/curses/keyboard.c 2009-07-28 01:23:32 UTC (rev 4472) +++ trunk/payloads/libpayload/curses/keyboard.c 2009-07-31 11:38:59 UTC (rev 4473) @@ -179,7 +179,7 @@ break; if (delay > 0) { - mdelay(100); + mdelay(1); delay--; } @@ -195,15 +195,17 @@ { int delay = -1; - if (_halfdelay || win->_delay) - delay = win->_delay ? 0 : _halfdelay; + if (_halfdelay) + delay = _halfdelay; + else + delay = win->_delay; return curses_getchar(delay); } int nodelay(WINDOW *win, NCURSES_BOOL flag) { - win->_delay = flag ? 1 : 0; + win->_delay = flag ? 0 : -1; return 0; } Modified: trunk/payloads/libpayload/drivers/video/video.c =================================================================== --- trunk/payloads/libpayload/drivers/video/video.c 2009-07-28 01:23:32 UTC (rev 4472) +++ trunk/payloads/libpayload/drivers/video/video.c 2009-07-31 11:38:59 UTC (rev 4473) @@ -66,7 +66,7 @@ if (cursory < 0) cursory = 0; - if (cursorx > VIDEO_COLS) { + if (cursorx >= VIDEO_COLS) { cursorx = 0; cursory++; } Modified: trunk/payloads/libpayload/include/sysinfo.h =================================================================== --- trunk/payloads/libpayload/include/sysinfo.h 2009-07-28 01:23:32 UTC (rev 4472) +++ trunk/payloads/libpayload/include/sysinfo.h 2009-07-31 11:38:59 UTC (rev 4473) @@ -54,7 +54,6 @@ }; extern struct sysinfo_t lib_sysinfo; -void lib_get_sysinfo(void); #endif

1 0

Re: [coreboot] SuperIO question
by Carl-Daniel Hailfinger 30 Jul '09

30 Jul '09

Hi Jorge, On 29.07.2009 10:51, jorgefm(a)cirsa.com wrote: > This is my first email to this mailing list. I've joined because I've a > little question related to the > BIOS superio initialization process and I would like to ask to the > masters. > We specialize in coreboot related questions, so it's unlikely we can help you with a BIOS problem unless you want to replace that BIOS with coreboot. > I'm developing a little hardware module with a w83627hf superio module. > This hardware is attached to a com express module. I've found that my > hardware is not always initialized > by the com express BIOS, it depends on the manufacter. > [...] > Then, I think that the hardware is working but I need some initialization > in the southbridge or something > else that the first BIOS is doing. Where can I looking for this info? Both > com express modules has the intel ICH7-M southbridge. > I'd say the best way forward is to diagnose this with the help of superiotool. Make sure the w83627hf kernel module is not loaded automatically, then run superiotool -dV and compare the outputs. If superiotool finds your SuperIO only on one of the boards, you most likely have a southbridge resource configuration problem which needs to be addresses by the BIOS manufacturer (or a custom early kernel driver). If superiotool finds your SuperIO on both boards, compare the settings and work from there. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

Re: [coreboot] EP80579 coreboot+seabios > keyboard init issue
by Kevin O'Connor 30 Jul '09

30 Jul '09

On Wed, Jul 29, 2009 at 03:24:06PM +0200, Arnaud Maye wrote: > Something I just realized. When am using filo I can use the keyboard > input but this is in fact coming from the UART link, not the PS2 > connector itself, sorry for that. > > However, I've tried to press F12, on the UART client as well as on > the PS2 keyboard, I cannot reach seabios menu. Okay, that is different - it leads me to believe that coreboot isn't turning on your ps2 port. SeaBIOS does not read keys from the serial port. If you wish to do that then add the sgabios optionrom to the flash - see the directions at: http://www.coreboot.org/SeaBIOS > Something is indeed very wrong as using coreboot as BIOS does not > initialize the keyboard in fact. Pressing "num lock" on the > keyboard does not change the LED status. With the legacy BIOS it > does of course. It's SeaBIOS that implements the numlock led - since SeaBIOS can't access the ps2 port it wont work. > I am sending you what you have asked anyway. So I guess as for the > VGA we are back to coreboot code base? I think we need to get input from the coreboot experts. -Kevin

3 4

[libpayload] various fixes
by Stefan Reinauer 30 Jul '09

30 Jul '09

Attached are two patches * one checking the return code of various malloc and memalign calls * another one fixes a bug in the keyboard driver and a bug in the video driver Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

3 2

Qemu-target ROM freeze/crash with current v2 HEAD (CBFS-enabled)
by Cristi Magherusan 30 Jul '09

30 Jul '09

Hello, I'm getting this output when running a qemu ROM compiled using latest v2 tree, and my AVATT payload - with KVM support in qemu/kernel it freezes, and without, it crashes: Crash: http://pastebin.com/m830348a The freeze occurs just after the "Jumping to boot code at 10000" message is displayed. If anyone has a clue, please help me. Thanks, Cristi -- Ing. Cristi Măgherușan, System/Network Engineer Technical University of Cluj-Napoca, Romania http://cc.utcluj.ro +40264 401247

4 5

option rom problems with DBM690T+VT6202L
by Jason Wang 30 Jul '09

30 Jul '09

Hi all, Since DBM690T does not have UHCI controller, i bought an PCI-USB card which contained two UHCI controller. But It always caused rebooting when the option rom try to initialize the controller. I attached all of the messages, and looking for some help. Until now my doubt is the real bus/dev/func is 06/05/01, but while seabios search it as 00/05/01. -- Jason Wang Peking University

5 8

[FILO] r103 - in trunk/filo: . Documentation drivers fs include main main/grub
by svn＠coreboot.org 30 Jul '09

30 Jul '09

Author: stepan Date: 2009-07-30 19:10:26 +0200 (Thu, 30 Jul 2009) New Revision: 103 Modified: trunk/filo/Config.in trunk/filo/Documentation/CHANGES trunk/filo/Documentation/FAQ trunk/filo/Makefile trunk/filo/README trunk/filo/build.sh trunk/filo/drivers/ide_new.c trunk/filo/drivers/ide_new.h trunk/filo/fs/blockdev.c trunk/filo/fs/filesys.h trunk/filo/include/debug.h trunk/filo/include/lib.h trunk/filo/main/filo.c trunk/filo/main/grub/builtins.c trunk/filo/main/grub/char_io.c trunk/filo/main/grub/cmdline.c trunk/filo/main/grub/completions.c Log: * preprocessor fixups * drop some prototypes that are already in libpayload.h * fix some shadowed variables * fix error reporting in the boot command * fix keyboard issues in grub interface * don't require "head" for building filo * fix CD booting Modified: trunk/filo/Config.in =================================================================== --- trunk/filo/Config.in 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/Config.in 2009-07-30 17:10:26 UTC (rev 103) @@ -1,5 +1,5 @@ ## -## Copyright (C) 2008 coresystems GmbH +## Copyright (C) 2008-2009 coresystems GmbH ## mainmenu "FILO Configuration" Modified: trunk/filo/Documentation/CHANGES =================================================================== --- trunk/filo/Documentation/CHANGES 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/Documentation/CHANGES 2009-07-30 17:10:26 UTC (rev 103) @@ -1,3 +1,5 @@ +As of 0.6 this file is neglected in favor of svn commit messages. + Version 0.6.0b1 stepan 2008-08-11 * Use Kconfig for configuration * Drop recursive Makefiles Modified: trunk/filo/Documentation/FAQ =================================================================== --- trunk/filo/Documentation/FAQ 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/Documentation/FAQ 2009-07-30 17:10:26 UTC (rev 103) @@ -1,5 +1,6 @@ Q. My GRUB menu.lst does not work. -A. The disks are numbered differently in FILO, following the linux scheme. +A. The disks are numbered differently in FILO. They might or might not follow + the Linux scheme, depending on the order of driver modules in Linux, etc. hd2,0 is hdc1, not necessarily the third disk (there might be no hdb) Q. FILO loads my ELF kernel fine, but complains "Verify FAILED". Modified: trunk/filo/Makefile =================================================================== --- trunk/filo/Makefile 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/Makefile 2009-07-30 17:10:26 UTC (rev 103) @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 by coresystems GmbH +# Copyright (C) 2008-2009 by coresystems GmbH # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -93,7 +93,7 @@ GCCINCDIR = $(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include CPPFLAGS = -nostdinc -imacros $(obj)/config.h -Iinclude -I$(GCCINCDIR) -MD -CFLAGS += -Wall $(STACKPROTECT) $(INCLUDES) -Os -fomit-frame-pointer -fno-common -ffreestanding -fno-strict-aliasing +CFLAGS += $(STACKPROTECT) $(INCLUDES) -Wall -Os -fomit-frame-pointer -fno-common -ffreestanding -fno-strict-aliasing -Wshadow TARGET = $(obj)/filo.elf Modified: trunk/filo/README =================================================================== --- trunk/filo/README 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/README 2009-07-30 17:10:26 UTC (rev 103) @@ -177,7 +177,8 @@ LICENSE Copyright (C) 2003 by SONE Takeshi <ts1(a)tsn.or.jp> and others. - Copyright (C) 2005-2008 by coresystems GmbH <info(a)coresystems.de>. + Copyright (C) 2005-2009 by coresystems GmbH <info(a)coresystems.de>. This program is licensed under the terms of GNU General Public License. See the COPYING file for details. + Modified: trunk/filo/build.sh =================================================================== --- trunk/filo/build.sh 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/build.sh 2009-07-30 17:10:26 UTC (rev 103) @@ -20,7 +20,7 @@ continue fi if ${gccprefixes}as --32 -o ${TMP}.o ${TMP}.s; then - head -c 4 ${TMP}.o > ${TMP}.test + dd bs=4 count=1 if=${TMP}.o > ${TMP}.test 2>/dev/null if cmp ${TMP}.test ${TMP}.compare; then GCCPREFIX=$gccprefixes rm -f $TMP ${TMP}.s ${TMP}.o ${TMP}.compare ${TMP}.test Modified: trunk/filo/drivers/ide_new.c =================================================================== --- trunk/filo/drivers/ide_new.c 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/drivers/ide_new.c 2009-07-30 17:10:26 UTC (rev 103) @@ -819,11 +819,11 @@ { if (!sectors) return 1; - if (block + sectors > drive->sectors) + if (block + sectors > (drive->sectors * (drive->bs / 512))) return 1; #ifdef CONFIG_DEBUG_IDE - printf("ob_ide_read_sectors: block=%Ld sectors=%u\n", (unsigned long) block, sectors); + printf("ob_ide_read_sectors: block=%ld sectors=%u\n", (unsigned long) block, sectors); #endif if (drive->type == ide_type_ata) @@ -1306,21 +1306,20 @@ #else /* !CONFIG_SUPPORT_PCI */ # define find_ide_controller find_ide_controller_compat #endif -//int ob_ide_init(int (*func)(struct ide_drive*)) -int ob_ide_init(int drive) +int ob_ide_init(int driveno) { int j; struct ide_channel *chan; int chan_index; - if (drive >= IDE_MAX_DRIVES) { + if (driveno >= IDE_MAX_DRIVES) { printf("Unsupported drive number\n"); return -1; } /* A controller has two drives (master, slave) */ - chan_index = drive >> 1; + chan_index = driveno >> 1; chan = &ob_ide_channels[chan_index]; if (chan->present == 0) { Modified: trunk/filo/drivers/ide_new.h =================================================================== --- trunk/filo/drivers/ide_new.h 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/drivers/ide_new.h 2009-07-30 17:10:26 UTC (rev 103) @@ -217,8 +217,7 @@ ob_ide_read_blocks(struct ide_drive *drive, int n, u32 blk, unsigned char* dest); static int ob_ide_atapi_request_sense(struct ide_drive *drive); -//int ob_ide_init(int (*func)(struct ide_drive*)); -int ob_ide_init(int drive); +int ob_ide_init(int driveno); /* FILO compat */ Modified: trunk/filo/fs/blockdev.c =================================================================== --- trunk/filo/fs/blockdev.c 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/fs/blockdev.c 2009-07-30 17:10:26 UTC (rev 103) @@ -188,7 +188,7 @@ name += 3; *drive = 0; } else { - printf("Unknown device type\n"); + printf("Unknown device type: %s\n", name); return 0; } @@ -450,8 +450,11 @@ char *dest = buf; unsigned long len; - sector += byte_offset >> 9; - byte_offset &= 0x1ff; + /* while sectors are technically 512b in filo, iso9660 requires + some special handling. This wastes up to three sectors worth + of RAM on a 512b filesystem, but enables iso9660 to work. */ + sector += (byte_offset >> 11) * 4; + byte_offset &= 0x7ff; if (sector + ((byte_len + 0x1ff) >> 9) > part_length) { printf("Attempt to read beyond device/partition.\n"); @@ -466,6 +469,15 @@ debug("Couldn't read sector.\n"); return 0; } + /* now, we always only request one sector at a time, + but rely on the cache system to iron out the + issues with 2048b sectors. Yet, we have to skip + the first fake sectors in processing. */ + if (byte_offset >= 512) { + byte_offset -= 512; + sector++; + continue; + } len = 512 - byte_offset; if (len > byte_len) len = byte_len; Modified: trunk/filo/fs/filesys.h =================================================================== --- trunk/filo/fs/filesys.h 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/fs/filesys.h 2009-07-30 17:10:26 UTC (rev 103) @@ -278,6 +278,6 @@ #define FS_FILECORE 16 /* Acorn Filecore Filing System */ #define FS_EXT2FS 17 /* Linux Extended 2 file system */ -#if CONFIG_DEBUG_FSYS_EXT2FS +#ifdef CONFIG_DEBUG_FSYS_EXT2FS #define E2DEBUG #endif Modified: trunk/filo/include/debug.h =================================================================== --- trunk/filo/include/debug.h 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/include/debug.h 2009-07-30 17:10:26 UTC (rev 103) @@ -22,15 +22,15 @@ #include <lib.h> /* Defining DEBUG_THIS before including this file enables debug() macro - * for the file. DEBUG_ALL is for global control. */ + * for the file. CONFIG_DEBUG_ALL is for global control. */ -#if DEBUG_THIS || DEBUG_ALL +#if ( defined(DEBUG_THIS) && (DEBUG_THIS == 1)) || (defined(CONFIG_DEBUG_ALL) && (CONFIG_DEBUG_ALL == 1)) #define DEBUG 1 #else #undef DEBUG #endif -#if DEBUG +#ifdef DEBUG # define debug(...) \ printf(__VA_ARGS__) # define debug_hexdump hexdump @@ -39,7 +39,7 @@ # define debug_hexdump(...) /* nothing */ #endif -#if CONFIG_USE_GRUB +#ifdef CONFIG_USE_GRUB extern int using_grub_interface; void grub_printf (const char *format,...); #define printf(x...) do { if (using_grub_interface) { grub_printf(x); } else { printf(x); } } while (0) Modified: trunk/filo/include/lib.h =================================================================== --- trunk/filo/include/lib.h 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/include/lib.h 2009-07-30 17:10:26 UTC (rev 103) @@ -22,9 +22,6 @@ #include <libpayload.h> #include <config.h> -// from libpayload. -int getline(char *buf, int max); - unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base); unsigned long long strtoull_with_suffix(const char *cp,char **endp,unsigned int base); @@ -32,8 +29,6 @@ long long simple_strtoll(const char *cp,char **endp,unsigned int base); -void halt(void) __attribute__((noreturn)); - #define abort() halt() #define LOADER_NOT_SUPPORT 0xbadf11e @@ -41,19 +36,19 @@ struct sys_info; int elf_load(const char *filename, const char *cmdline); -#if CONFIG_LINUX_LOADER +#ifdef CONFIG_LINUX_LOADER int linux_load(const char *filename, const char *cmdline); #else #define linux_load(x,y) LOADER_NOT_SUPPORT /* nop */ #endif -#if CONFIG_WINCE_LOADER +#ifdef CONFIG_WINCE_LOADER int wince_load(const char *filename, const char *cmdline); #else #define wince_load(x,y) LOADER_NOT_SUPPORT /* nop */ #endif -#if CONFIG_ARTEC_BOOT +#ifdef CONFIG_ARTEC_BOOT int artecboot_load(const char *filename, const char *cmdline); #else #define artecboot_load(x,y) LOADER_NOT_SUPPORT /* nop */ Modified: trunk/filo/main/filo.c =================================================================== --- trunk/filo/main/filo.c 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/main/filo.c 2009-07-30 17:10:26 UTC (rev 103) @@ -37,7 +37,7 @@ #define autoboot() ((void) 0) /* nop */ #endif -#if CONFIG_AUTOBOOT_DELAY == 0 +#ifndef CONFIG_AUTOBOOT_DELAY #define autoboot_delay() 0 /* success */ #endif @@ -78,9 +78,10 @@ #endif } -void boot(const char *line) +int boot(const char *line) { char *file, *param; + int ret; /* Split filename and parameter */ file = strdup(line); @@ -90,12 +91,38 @@ param++; } - if (artecboot_load(file, param) == LOADER_NOT_SUPPORT) - if (elf_load(file, param) == LOADER_NOT_SUPPORT) - if (linux_load(file, param) == LOADER_NOT_SUPPORT) - if (wince_load(file, param) == LOADER_NOT_SUPPORT) - printf("Unsupported image format\n"); + /* If the boot command is successful, the loader + * function will not return. + * + * If the loader is not supported, or it recognized + * that it does not match for the given file type, it + * will return LOADER_NOT_SUPPORT. + * + * All other cases are an unknown error for now. + */ + + ret = artecboot_load(file, param); + if (ret != LOADER_NOT_SUPPORT) + goto out; + + ret = elf_load(file, param); + if (ret != LOADER_NOT_SUPPORT) + goto out; + + ret = linux_load(file, param); + if (ret != LOADER_NOT_SUPPORT) + goto out; + + ret = wince_load(file, param); + if (ret != LOADER_NOT_SUPPORT) + goto out; + + printf("Unsupported image format\n"); + +out: free(file); + + return ret; } void reset_handler(void) Modified: trunk/filo/main/grub/builtins.c =================================================================== --- trunk/filo/main/grub/builtins.c 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/main/grub/builtins.c 2009-07-30 17:10:26 UTC (rev 103) @@ -22,6 +22,7 @@ #include <libpayload.h> #include <config.h> #include <fs.h> +#include <lib.h> #include <grub/shared.h> #include <arch/timer.h> #ifdef CONFIG_USE_MD5_PASSWORDS @@ -74,6 +75,8 @@ int show_menu = 1; +static int last_normal_color = -1, last_highlight_color = -1; + /* Initialize the data for builtins. */ void init_builtins(void) { @@ -108,13 +111,20 @@ /* boot */ static int boot_func(char *arg, int flags) { - void boot(const char *line); + int boot(const char *line); + int ret; if(!boot_line[0]) { - grub_printf("No kernel.\n"); + errnum = ERR_BOOT_COMMAND; return 1; } + /* Set color back to black and white, or Linux booting will look + * very funny. + */ + console_setcolor((COLOR_BLACK << 4) | COLOR_WHITE, + (COLOR_WHITE << 4) | COLOR_BLACK); + cls(); if (initrd_space[0]) { @@ -123,7 +133,27 @@ } grub_printf("\nBooting '%s'\n", boot_line); - boot(boot_line); + + ret = boot(boot_line); + + /* If we regain control, something went wrong. */ + + /* The menu color was changed and we failed to boot, so we + * need to restore the colors in order to make the menu look as + * it did before. + */ + if (last_normal_color != -1) { + console_setcolor(last_normal_color, last_highlight_color); + } + + /* If no loader felt responsible for this image format, it's + * a bad file format, otherwise we don't really know. + */ + if (ret == LOADER_NOT_SUPPORT) + errnum = ERR_EXEC_FORMAT; + else + errnum = ERR_BOOT_FAILURE; + return 1; } @@ -238,6 +268,10 @@ console_setcolor(new_normal_color, new_highlight_color); + // keep the state so we can restore after a failed boot + last_normal_color = new_normal_color; + last_highlight_color = new_highlight_color; + return 0; } Modified: trunk/filo/main/grub/char_io.c =================================================================== --- trunk/filo/main/grub/char_io.c 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/main/grub/char_io.c 2009-07-30 17:10:26 UTC (rev 103) @@ -125,7 +125,7 @@ num_history++; } -static int real_get_cmdline(char *prompt, char *cmdline, int maxlen, int echo_char, int readline) +static int real_get_cmdline(char *prompt, char *cmdline, int maxlen, int echo_char, int readline_like) { /* This is a rather complicated function. So explain the concept. @@ -369,7 +369,7 @@ while ((c = ASCII_CHAR(getkey())) != '\n' && c != '\r') { /* If READLINE is non-zero, handle readline-like key bindings. */ - if (readline) { + if (readline_like) { switch (c) { case 9: /* TAB lists completions */ { @@ -560,7 +560,7 @@ /* If the readline-like feature is turned on and CMDLINE is not empty, add it into the history list. */ - if (readline && lpos < llen) + if (readline_like && lpos < llen) add_history(cmdline, 0); refresh(); @@ -576,7 +576,7 @@ or zero-length). If ECHO_CHAR is nonzero, echo it instead of the typed character. */ -int get_cmdline(char *prompt, char *cmdline, int maxlen, int echo_char, int readline) +int get_cmdline(char *prompt, char *cmdline, int maxlen, int echo_char, int readline_like) { int old_cursor; int ret; @@ -628,7 +628,7 @@ } /* Complicated features are left to real_get_cmdline. */ - ret = real_get_cmdline(prompt, cmdline, maxlen, echo_char, readline); + ret = real_get_cmdline(prompt, cmdline, maxlen, echo_char, readline_like); setcursor(old_cursor); refresh(); return ret; Modified: trunk/filo/main/grub/cmdline.c =================================================================== --- trunk/filo/main/grub/cmdline.c 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/main/grub/cmdline.c 2009-07-30 17:10:26 UTC (rev 103) @@ -204,7 +204,7 @@ intervention. */ if (fallback_entryno < 0) { grub_printf("\nPress any key to continue..."); - (void) getchar(); + (void)getkey(); } return 1; Modified: trunk/filo/main/grub/completions.c =================================================================== --- trunk/filo/main/grub/completions.c 2009-07-18 14:44:04 UTC (rev 102) +++ trunk/filo/main/grub/completions.c 2009-07-30 17:10:26 UTC (rev 103) @@ -62,7 +62,7 @@ int print_completions(int is_filename, int is_completion) { -#if CONFIG_EXPERIMENTAL +#ifdef CONFIG_EXPERIMENTAL char *buf = (char *) COMPLETION_BUF; char *ptr = buf;

1 0

← Newer
1
2
3
4
5
6
7
8
...
31
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 July 2009