coreboot October 2007

coreboot@coreboot.org

84 participants
481 discussions

[LinuxBIOS] [PATCH] superiotool: Copyright lines, credits
by Uwe Hermann 18 Oct '07

18 Oct '07

See patch. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

1 0

Re: [LinuxBIOS] r2846 - trunk/util/flashrom
by Stefan Reinauer 18 Oct '07

18 Oct '07

svn(a)openbios.org wrote: > Cosmetic changes to make the flashrom output more consistent (trivial). > > > - printf("OK.\n"); > + printf("OK\n"); > Removing the periods makes the output inconsistent. Please dont do this. > - printf("Flash image seems to be a legacy BIOS. Disabling checks.\n"); > + printf("Flash image seems to be a legacy BIOS - disabling checks\n"); > Why is this considered more consistent than before ? Removing periods from complete sentences is wrong. > printf_debug("LinuxBIOS last image size " > - "(not rom size) is %d bytes.\n", *walk); > + "(not ROM size) is %d bytes\n", *walk); > > You are removing all dots all over the place. It was consistent before. Why did you change this? I put all of them there on purpose before. :-( > printf_debug("This firmware image matches " > - "this motherboard.\n"); > + "this motherboard\n"); > Full sentences should end with a period. > } else { > if (force) { > printf("WARNING: This firmware image does not " > - "seem to fit to this machine - forcing it.\n"); > + "seem to fit to this machine - forcing it\n"); > ... It seems this was pretty consistent before. And it was correct. > - if (i & 1) { > + if (i & 1) > value <<= 8; > - } > Please don't do this. Stefan

3 7

[LinuxBIOS] r2875 - trunk/util/flashrom
by svn＠openbios.org 18 Oct '07

18 Oct '07

Author: uwe Date: 2007-10-18 02:29:05 +0200 (Thu, 18 Oct 2007) New Revision: 2875 Modified: trunk/util/flashrom/README trunk/util/flashrom/flashrom.8 Log: Documentation fixes and updates (trivial). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/util/flashrom/README =================================================================== --- trunk/util/flashrom/README 2007-10-18 00:24:07 UTC (rev 2874) +++ trunk/util/flashrom/README 2007-10-18 00:29:05 UTC (rev 2875) @@ -18,8 +18,8 @@ Usage ----- -usage: ./flashrom [-rwvEVfh] [-c chipname] [-s exclude_start] - [-e exclude_end] [-m vendor:part] [-l file.layout] [-i imagename] [file] + $ flashrom [-rwvEVfh] [-c chipname] [-s exclude_start] [-e exclude_end] + [-m vendor:part] [-l file.layout] [-i imagename] [file] -r | --read: read flash and save into file -w | --write: write file into flash (default when file is specified) @@ -41,11 +41,11 @@ LinuxBIOS Table and Mainboard Identification -------------------------------------------- -Flashrom reads the LinuxBIOS table to determine the current mainboard. -(Parse DMI as well in future?) If no LinuxBIOS table could be read +Flashrom reads the LinuxBIOS table to determine the current mainboard +(parse DMI as well in future?). If no LinuxBIOS table could be read or if you want to override these values, you can specify -m, e.g.: - flashrom -w --mainboard ISLAND:ARUMA island_aruma.rom + flashrom -w --mainboard AGAMI:ARUMA agami_aruma.rom The following boards require the specification of the board name, if no LinuxBIOS table is found: @@ -55,9 +55,11 @@ * ASUS P5A: use -m asus:p5a * IBM x3455: use -m ibm:x3455 * EPoX EP-BX3: use -m epox:ep-bx3 -* GIGABYTE GA-M57SLI v2.0: use -m gigabyte:m57sli -* GIGABYTE GA-M61P-S3: use -m gigabyte:m61ps3 +* GIGABYTE GA-M57SLI-S4 v2.0: use -m gigabyte:m57sli +* GIGABYTE GA-M61P-S3: use -m gigabyte:m61p +* MSI K8N Neo3: use -m msi:k8n-neo3 + ROM Layout Support ------------------ @@ -71,27 +73,27 @@ i.e.: startaddr:endaddr name - all addresses are offsets within the file, not absolute addresses! + All addresses are offsets within the file, not absolute addresses! If you only want to update the normal image in a ROM you can say: - flashrom -w --layout rom.layout --image normal island_aruma.rom + flashrom -w --layout rom.layout --image normal agami_aruma.rom To update normal and fallback but leave the VGA BIOS alone, say: - flashrom -w -l rom.layout -i normal -i fallback island_aruma.rom + flashrom -w -l rom.layout -i normal -i fallback agami_aruma.rom Currently overlapping sections are not supported. ROM layouts should replace the -s and -e option since they are more flexible and they should lead to a ROM update file format with the -ROM layout and the ROM image in one file (cpio, zip or something?) +ROM layout and the ROM image in one file (cpio, zip or something?). -DOC support ------------ +Disk on Chip support +-------------------- -DISK on Chip support is currently disabled since it is considered unstable. +Disk on Chip support is currently disabled since it is considered unstable. Change CFLAGS in the Makefile to enable it: Remove -DDISABLE_DOC from CFLAGS. Modified: trunk/util/flashrom/flashrom.8 =================================================================== --- trunk/util/flashrom/flashrom.8 2007-10-18 00:24:07 UTC (rev 2874) +++ trunk/util/flashrom/flashrom.8 2007-10-18 00:29:05 UTC (rev 2875) @@ -1,4 +1,4 @@ -.TH FLASHROM 8 "December 20, 2006" +.TH FLASHROM 8 "October 18, 2007" .SH NAME flashrom \- a universal flash programming utility .SH SYNOPSIS @@ -6,24 +6,23 @@ [\fB-m\fR vendor:part] [\fB-l\fR file.layout] [\fB-i\fR image_name] [file] .SH DESCRIPTION .B flashrom -is a universal flash programming utility for flash chips -(e.g. in DIP or PLCC packaging). It can be used to flash BIOS images, -for example. +is a universal flash programming utility for DIP, PLCC, or SPI flash ROM +chips. It can be used to flash BIOS/LinuxBIOS/firmware images, for example. .SH OPTIONS If no file is specified, then all that happens is that flash info is dumped and the flash chip is set to writable. .TP .B "\-r, \-\-read" -Read flash and save contents into file. +Read flash ROM contents an save them into the given file. .TP .B "\-w, \-\-write" Write file into flash (default when file is specified). .TP .B "\-v, \-\-verify" -Verify flash against file. +Verify the flash ROM contents against the given file. .TP .B "\-E, \-\-erase" -Erase flash device. +Erase the flash device. .TP .B "\-V, \-\-verbose" More verbose output. @@ -38,16 +37,25 @@ Exclude end postion. (obsolete) .TP .B "\-m, \-\-mainboard" <vendor:part> -Override mainboard settings. +Override mainboard settings. This option is needed for some mainboards, +see the +.B flashrom +README for a list. .TP .B "\-f, \-\-force" -Force write without checking image. +Force write without checking whether the ROM image file is really meant +to be used on this board. +.sp +Note: This check only works while LinuxBIOS is running, and only for those +boards where the LinuxBIOS code supports it. .TP .B "\-l, \-\-layout" <layout.file> Read ROM layout from file. .TP .B "\-i, \-\-image" <name> -Only flash image name from flash layout. +Only flash image +.B <name> +from flash layout. .TP .B "\-h, \-\-help" Show a help text and exit. @@ -55,13 +63,12 @@ .\".B "\-\-version" .\"Show version information and exit. .SH BUGS -Please report any bugs at http://tracker.linuxbios.org/trac/LinuxBIOS/. +Please report any bugs at http://tracker.linuxbios.org/trac/LinuxBIOS/, +or on the LinuxBIOS mailing list (http://linuxbios.org/Mailinglist). .SH LICENCE .B flashrom is covered by the GNU General Public License (GPL), version 2 or later. -.SH SEE ALSO -.BR romcc (1), -.BR abuild (1). +.\" .SH SEE ALSO .SH COPYRIGHT 2000 Silicon Integrated System Corporation .br

1 0

[LinuxBIOS] r2874 - trunk/util/flashrom
by svn＠openbios.org 18 Oct '07

18 Oct '07

Author: hailfinger Date: 2007-10-18 02:24:07 +0200 (Thu, 18 Oct 2007) New Revision: 2874 Modified: trunk/util/flashrom/flash.h trunk/util/flashrom/flashchips.c trunk/util/flashrom/spi.c Log: Add generic SPI flash erase and write support to flashrom. The first chip the code was tested and verified with is the Macronix MX25L4005, but other chips should work as well. Timeouts are still hardcoded to data sheet maxima, but the status register checking code is already there. Thanks to Harald Gutmann for the initial code on which this is loosely based. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/util/flashrom/flash.h =================================================================== --- trunk/util/flashrom/flash.h 2007-10-17 23:55:15 UTC (rev 2873) +++ trunk/util/flashrom/flash.h 2007-10-18 00:24:07 UTC (rev 2874) @@ -210,6 +210,11 @@ /* spi.c */ int probe_spi(struct flashchip *flash); int it87xx_probe_spi_flash(const char *name); +int generic_spi_command(unsigned char writecnt, unsigned char readcnt, const unsigned char *writearr, unsigned char *readarr); +void generic_spi_write_enable(); +void generic_spi_write_disable(); +int generic_spi_chip_erase(struct flashchip *flash); +int generic_spi_chip_write(struct flashchip *flash, uint8_t *buf); /* 82802ab.c */ int probe_82802ab(struct flashchip *flash); Modified: trunk/util/flashrom/flashchips.c =================================================================== --- trunk/util/flashrom/flashchips.c 2007-10-17 23:55:15 UTC (rev 2873) +++ trunk/util/flashrom/flashchips.c 2007-10-18 00:24:07 UTC (rev 2874) @@ -39,7 +39,7 @@ {"Mx29f002", MX_ID, MX_29F002, 256, 64 * 1024, probe_29f002, erase_29f002, write_29f002}, {"MX25L4005", MX_ID, MX_25L4005, 512, 4 * 1024, - probe_spi, NULL, NULL}, + probe_spi, generic_spi_chip_erase, generic_spi_chip_write}, {"SST29EE020A", SST_ID, SST_29EE020A, 256, 128, probe_jedec, erase_chip_jedec, write_jedec}, {"SST28SF040A", SST_ID, SST_28SF040, 512, 256, Modified: trunk/util/flashrom/spi.c =================================================================== --- trunk/util/flashrom/spi.c 2007-10-17 23:55:15 UTC (rev 2873) +++ trunk/util/flashrom/spi.c 2007-10-18 00:24:07 UTC (rev 2874) @@ -30,12 +30,40 @@ #define ITE_SUPERIO_PORT1 0x2e #define ITE_SUPERIO_PORT2 0x4e +/* Read Electronic ID */ #define JEDEC_RDID {0x9f} #define JEDEC_RDID_OUTSIZE 0x01 #define JEDEC_RDID_INSIZE 0x03 -static uint16_t it8716f_flashport = 0; +/* Write Enable */ +#define JEDEC_WREN {0x06} +#define JEDEC_WREN_OUTSIZE 0x01 +#define JEDEC_WREN_INSIZE 0x00 +/* Write Disable */ +#define JEDEC_WRDI {0x04} +#define JEDEC_WRDI_OUTSIZE 0x01 +#define JEDEC_WRDI_INSIZE 0x00 + +/* Both Chip Erase commands below should work */ +/* Chip Erase 0x60 */ +#define JEDEC_CE_1 {0x60}; +#define JEDEC_CE_1_OUTSIZE 0x01 +#define JEDEC_CE_1_INSIZE 0x00 + +/* Chip Erase 0xc7 */ +#define JEDEC_CE_2 {0xc7}; +#define JEDEC_CE_2_OUTSIZE 0x01 +#define JEDEC_CE_2_INSIZE 0x00 + +/* Read Status Register */ +#define JEDEC_RDSR {0x05}; +#define JEDEC_RDSR_OUTSIZE 0x01 +#define JEDEC_RDSR_INSIZE 0x01 +#define JEDEC_RDSR_BIT_WIP (0x01 << 0) + +uint16_t it8716f_flashport = 0; + /* Generic Super I/O helper functions */ uint8_t regval(uint16_t port, uint8_t reg) { @@ -119,6 +147,8 @@ static int it8716f_spi_command(uint16_t port, unsigned char writecnt, unsigned char readcnt, const unsigned char *writearr, unsigned char *readarr) { uint8_t busy, writeenc; + int i; + do { busy = inb(port) & 0x80; } while (busy); @@ -164,13 +194,15 @@ do { busy = inb(port) & 0x80; } while (busy); - readarr[0] = inb(port + 5); - readarr[1] = inb(port + 6); - readarr[2] = inb(port + 7); + + for (i = 0; i < readcnt; i++) { + readarr[i] = inb(port + 5 + i); + } + return 0; } -static int generic_spi_command(unsigned char writecnt, unsigned char readcnt, const unsigned char *writearr, unsigned char *readarr) +int generic_spi_command(unsigned char writecnt, unsigned char readcnt, const unsigned char *writearr, unsigned char *readarr) { if (it8716f_flashport) return it8716f_spi_command(it8716f_flashport, writecnt, readcnt, writearr, readarr); @@ -188,6 +220,23 @@ return 0; } +void generic_spi_write_enable() +{ + const unsigned char cmd[] = JEDEC_WREN; + + /* Send WREN (Write Enable) */ + generic_spi_command(JEDEC_WREN_OUTSIZE, JEDEC_WREN_INSIZE, cmd, NULL); + +} + +void generic_spi_write_disable() +{ + const unsigned char cmd[] = JEDEC_WRDI; + + /* Send WRDI (Write Disable) */ + generic_spi_command(JEDEC_WRDI_OUTSIZE, JEDEC_WRDI_INSIZE, cmd, NULL); +} + int probe_spi(struct flashchip *flash) { unsigned char readarr[3]; @@ -204,3 +253,72 @@ return 0; } +uint8_t generic_spi_read_status_register() +{ + const unsigned char cmd[] = JEDEC_RDSR; + unsigned char readarr[1]; + + /* Read Status Register */ + generic_spi_command(JEDEC_RDSR_OUTSIZE, JEDEC_RDSR_INSIZE, cmd, readarr); + return readarr[0]; +} + +int generic_spi_chip_erase(struct flashchip *flash) +{ + const unsigned char cmd[] = JEDEC_CE_2; + + generic_spi_write_enable(); + /* Send CE (Chip Erase) */ + generic_spi_command(1, 0, cmd, NULL); + /* The chip needs some time for erasing, the MX25L4005A has a maximum + * time of 7.5 seconds. + * FIXME: Check the status register instead + * Do we have to check the status register before calling + * write_disable()? The data sheet suggests we don't have to call + * write_disable() at all because WEL is reset automatically. + while (generic_spi_read_status_register() & JEDEC_RDSR_BIT_WIP) + sleep(1); + */ + generic_spi_write_disable(); + sleep(8); + return 0; +} + +void it8716f_spi_page_program(int block, uint8_t *buf, uint8_t *bios) { + int i; + + generic_spi_write_enable(); + outb(0x06 , it8716f_flashport + 1); + outb((3 << 4), it8716f_flashport); + for (i = 0; i < 256; i++) { + bios[256 * block + i] = buf[256 * block + i]; + } + outb(0, it8716f_flashport); + /* The chip needs some time for page program, the MX25L4005A has a + * maximum time of 5 ms. + * FIXME: Check the status register instead. + * Do we have to check the status register before calling + * write_disable()? The data sheet suggests we don't have to call + * write_disable() at all because WEL is reset automatically. + while (generic_spi_read_status_register() & JEDEC_RDSR_BIT_WIP) + usleep(1000); + */ + generic_spi_write_disable(); + usleep(5000); +} + +void generic_spi_page_program(int block, uint8_t *buf, uint8_t *bios) +{ + if (it8716f_flashport) + it8716f_spi_page_program(block, buf, bios); +} + +int generic_spi_chip_write(struct flashchip *flash, uint8_t *buf) { + int total_size = 1024 * flash->total_size; + int i; + for (i = 0; i < total_size / 256; i++) { + generic_spi_page_program(i, buf, (uint8_t *)flash->virtual_memory); + } + return 0; +} +

1 0

[LinuxBIOS] r45 - buildrom-devel/config/payloads
by svn＠openbios.org 18 Oct '07

18 Oct '07

Author: jcrouse Date: 2007-10-18 02:10:57 +0200 (Thu, 18 Oct 2007) New Revision: 45 Modified: buildrom-devel/config/payloads/Config.in buildrom-devel/config/payloads/payloads.conf Log: [BUILDROM]: Disable OFW Since OFW in buildrom was only for OLPC, not having OLPC means that OFW isn't useful right now - hopefully somebody can do do the work to make OFW or a clone useful for generic x86 platforms. Signed-off-by: Jordan Crouse <jordan.crouse(a)amd.com> Acked-by: Stefan Reinauer <stepan at coresystems.de> Modified: buildrom-devel/config/payloads/Config.in =================================================================== --- buildrom-devel/config/payloads/Config.in 2007-10-18 00:09:03 UTC (rev 44) +++ buildrom-devel/config/payloads/Config.in 2007-10-18 00:10:57 UTC (rev 45) @@ -31,11 +31,11 @@ bool "Linux As Bootloader" select PAYLOAD -config PAYLOAD_OFW - depends !PLATFORM_M57SLI - depends !PLATFORM_TYAN_S2891 - bool "OpenFirmware" - select PAYLOAD +#config PAYLOAD_OFW +# depends !PLATFORM_M57SLI +# depends !PLATFORM_TYAN_S2891 +# bool "OpenFirmware" +# select PAYLOAD config PAYLOAD_MEMTEST depends !PLATFORM_M57SLI Modified: buildrom-devel/config/payloads/payloads.conf =================================================================== --- buildrom-devel/config/payloads/payloads.conf 2007-10-18 00:09:03 UTC (rev 44) +++ buildrom-devel/config/payloads/payloads.conf 2007-10-18 00:10:57 UTC (rev 45) @@ -19,7 +19,7 @@ PCONF-$(CONFIG_PAYLOAD_LAB) = lab.conf PCONF-$(CONFIG_PAYLOAD_ETHERBOOT) = etherboot.conf PCONF-$(CONFIG_PAYLOAD_FILO) = filo.conf -PCONF-$(CONFIG_PAYLOAD_OFW) = ofw.conf +#PCONF-$(CONFIG_PAYLOAD_OFW) = ofw.conf PCONF-$(CONFIG_PAYLOAD_MEMTEST) = memtest.conf PCONF-$(CONFIG_PAYLOAD_KERNEL) = kernel.conf PCONF-$(CONFIG_PAYLOAD_CUSTOM) = custom.conf

1 0

[LinuxBIOS] r44 - in buildrom-devel: . config/payloads config/platforms packages/bootmenu packages/crc32sum packages/fwsig packages/linuxbios packages/linuxbios/patches packages/olpcflash
by svn＠openbios.org 18 Oct '07

18 Oct '07

Author: jcrouse Date: 2007-10-18 02:09:03 +0200 (Thu, 18 Oct 2007) New Revision: 44 Removed: buildrom-devel/README.signature buildrom-devel/config/platforms/olpc.conf buildrom-devel/packages/bootmenu/bootmenu.mk buildrom-devel/packages/crc32sum/crc32sum.mk buildrom-devel/packages/fwsig/fwsig.c buildrom-devel/packages/linuxbios/cache.patch buildrom-devel/packages/linuxbios/dcon-detect.patch buildrom-devel/packages/linuxbios/fix.patch buildrom-devel/packages/linuxbios/linuxbios-olpc.mk buildrom-devel/packages/linuxbios/linuxbios.mk buildrom-devel/packages/linuxbios/lzma-config.patch buildrom-devel/packages/linuxbios/olpc-linuxbios.mk buildrom-devel/packages/linuxbios/patches/cache.patch buildrom-devel/packages/linuxbios/patches/dcon-detect.patch buildrom-devel/packages/linuxbios/patches/disable_swapsifs.patch buildrom-devel/packages/linuxbios/patches/fix.patch buildrom-devel/packages/linuxbios/patches/lzma-config.patch buildrom-devel/packages/olpcflash/Makefile buildrom-devel/packages/olpcflash/olpcflash.c buildrom-devel/packages/olpcflash/olpcflash.mk Modified: buildrom-devel/README buildrom-devel/config/payloads/Config.in buildrom-devel/config/payloads/ofw.conf buildrom-devel/config/platforms/Config.in buildrom-devel/config/platforms/platforms.conf Log: [BUILDROM] Remove bitrotten OPC support OLPC support is bitrotten, and will never really be useful for the general public, so eliminate it. Signed-off-by: Jordan Crouse <jordan.crouse(a)amd.com> Totally-acked-by: Ronald G. Minnich <rminnich at gmail.com> Modified: buildrom-devel/README =================================================================== --- buildrom-devel/README 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/README 2007-10-18 00:09:03 UTC (rev 44) @@ -48,8 +48,6 @@ CONFIG_KBL_KEXEC_ONLY - Build only the Kexec part of the KBL CONFIG_KBL - Build Marcelo Toscatti's kernel boot loader CONFIG_BUSYBOX - Build busybox - CONFIG_BOOTMENU - Build the OLPC bootmenu - CONFIG_OLPCFLASH - Build the 'olpcflash' utility memtest: CONFIG_MEMTEST_SERIAL - say 'y' here to enable serial output for memtest Deleted: buildrom-devel/README.signature =================================================================== --- buildrom-devel/README.signature 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/README.signature 2007-10-18 00:09:03 UTC (rev 44) @@ -1,35 +0,0 @@ -Description of the fimrware signature - -Pulled from http://dev.laptop.org/ticket/153. - -Here's the format: - -At offset f.ffc0 in FLASH: -BW2 Q1A82 Q1A -------..... --- - | | | - | | |---First 3 characters of revision - | | - | |---Revision - | - |--- Model - -Revision is: - -Q - Manufacturer, i.e. Quanta -1 - board revision number -A - Major firmware revision -82- Minor firmware revision - -------- Quanta describes their release sequence: - -Let me explain our ISO sequence: Qxxxx First x: 1 for A test, 2 for B test, 3 for C test Second x: A~Z: milestone Third x: 1~9: change when test team release to customer, manufacture (outside R&D) Forth x: 1~9: change when sw team release to test team.(inside R&D) - -Take EC as example: Q1A11 when sw team release to test team. Test team find some problems, can not relase out Q1A12 when sw team fix the problem and release to test team again Test team test OK, and release out - -Next version sw team release will be Q1A21 - -As I mentioned we will use file name to distinguish the release. - -EC release will be PQ1A21.bin (Leading by P) BIOS release will be BQ2A11.bin (leading by B) - Modified: buildrom-devel/config/payloads/Config.in =================================================================== --- buildrom-devel/config/payloads/Config.in 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/config/payloads/Config.in 2007-10-18 00:09:03 UTC (rev 44) @@ -89,19 +89,6 @@ help Say 'Y' here to include the busybox tools -config BOOTMENU - bool "Bootmenu" - default y - help - Say 'Y' here to include the bootmenu selector - -config OLPCFLASH - bool "OLPC flash utility" - depends PLATFORM_OLPC - default y - help - Say 'Y' here to include the OLPC flash utility - endmenu menu "Memtest86 Configuration" Modified: buildrom-devel/config/payloads/ofw.conf =================================================================== --- buildrom-devel/config/payloads/ofw.conf 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/config/payloads/ofw.conf 2007-10-18 00:09:03 UTC (rev 44) @@ -12,4 +12,4 @@ # target PAYLOAD-y=ofw -HOSTTOOLS-y=crc32sum +#HOSTTOOLS-y=crc32sum Modified: buildrom-devel/config/platforms/Config.in =================================================================== --- buildrom-devel/config/platforms/Config.in 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/config/platforms/Config.in 2007-10-18 00:09:03 UTC (rev 44) @@ -10,10 +10,6 @@ bool "AMD Geode LX 'Norwich'" select PLATFORM -config PLATFORM_OLPC - bool "OLPC Laptop" - select PLATFORM - config PLATFORM_DBE61 bool "Artec Group dbe61" select PLATFORM Deleted: buildrom-devel/config/platforms/olpc.conf =================================================================== --- buildrom-devel/config/platforms/olpc.conf 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/config/platforms/olpc.conf 2007-10-18 00:09:03 UTC (rev 44) @@ -1,86 +0,0 @@ -# Configuration file for the OLPC platform - -# Basic platform configuration - -CC=gcc -STRIP=strip -AS=as - -MACHINE_ARCH=i586 -CFLAGS_platform = -fpic -m32 -ASFLAGS_platform = -32 - -# Targets -LINUXBIOS_MK=$(PACKAGE_DIR)/linuxbios/olpc-linuxbios.mk -KERNEL_MK=$(PACKAGE_DIR)/linuxbios/olpc-kernel.mk - -#### Kernel configuration - -KERNEL_VERSION=2.6.18-rc4-olpc1 -KERNEL_TAG=1d386c71d46aed41683be5644f397c4fbfbc4d3f -KERNEL_CONFIG=$(PACKAGE_DIR)/kernel/conf/defconfig-olpc - -# The following components are used to create the firmware signature in -# the ROM. see README.signature for information about how this is -# constructed. - -# The firmware model is a 6 byte string that identifies the model -# This should stay static for the entire CL1 run. - -FIRMWARE_MODEL=CL1 - -# The firmware revision is a 7 byte string that identifies the current -# version. The first three bytes of this will be repeated at the end of -# the string, but that will be pulled out automatically -# I set this now from a script that calls make -# I wanted the default to be something non-offical but the boot scripts -# in the build system look for the Q2A to determine that we are on an -# OLPC (opposed to QEmu) So I have to have the Q2A. - -FIRMWARE_REVISION = Q2B43 - -# This is the version number for the embedded controller code pulled -# in during the LinuxBIOS bulid - -EC_VER=B43 - -# These are LinuxBIOS flags that may be useful - -LINUXBIOS_CAS25=y -LINUXBIOS_ENABLE_FS2=y - -# If you uncomment and fill this in then it will override the firmware thats -# # pulled from dev.laptop.org -# -#EC_FIRMWARE_OVERRIDE=PQ2B11T.bin - -#### You probably shouldn't change anything under this point - -LINUXBIOS_VENDOR=olpc -LINUXBIOS_BOARD=rev_a -LINUXBIOS_CONFIG=Config.SPI.lb -LINUXBIOS_TDIR=rev_a_1M -LINUXBIOS_ROM_NAME=linuxbios.rom - -LINUXBIOS_TAG=f6ec588df29f39a9b3db7fcbde2181d79ff7c5bd - -EC_FIRMWARE_URL=http://dev.laptop.org/pub/ec - -ifeq ($(PAYLOAD_LAB),y) -LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/dcon-detect.patch -endif - -ifeq ($(LINUXBIOS_CAS25),y) -LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/CL2.5.patch -LINUXBIOS_CL2_MARKER=_CL2.5 -endif - -ifeq ($(LINUXBIOS_ENABLE_FS2),y) -LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/disable_swapsifs.patch -endif - -ifeq ($(EC_FIRMWARE_OVERRIDE),) -EC_FIRMWARE_REV=ec_v$(EC_VER).img -else -EC_FIRMWARE_REV=$(EC_FIRMWARE_OVERRIDE) -endif Modified: buildrom-devel/config/platforms/platforms.conf =================================================================== --- buildrom-devel/config/platforms/platforms.conf 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/config/platforms/platforms.conf 2007-10-18 00:09:03 UTC (rev 44) @@ -7,7 +7,6 @@ PLATFORM-y= PLATFORM-$(CONFIG_PLATFORM_NORWICH) = norwich.conf -PLATFORM-$(CONFIG_PLATFORM_OLPC) = olpc.conf PLATFORM-$(CONFIG_PLATFORM_MSM800SEV) = msm800sev.conf PLATFORM-$(CONFIG_PLATFORM_ALIX1C) = alix1c.conf PLATFORM-$(CONFIG_PLATFORM_DB800) = db800.conf Deleted: buildrom-devel/packages/bootmenu/bootmenu.mk =================================================================== --- buildrom-devel/packages/bootmenu/bootmenu.mk 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/bootmenu/bootmenu.mk 2007-10-18 00:09:03 UTC (rev 44) @@ -1,52 +0,0 @@ -BOOTMENU_URL=http://dev.laptop.org/~jcrouse/bootmenu -BOOTMENU_SOURCE=bootmenu-0.3.tar.gz -BOOTMENU_DIR=$(BUILD_DIR)/bootmenu -BOOTMENU_SRC_DIR=$(BOOTMENU_DIR)/bootmenu-0.3 -BOOTMENU_STAMP_DIR=$(BOOTMENU_DIR)/stamps -BOOTMENU_LOG_DIR=$(BOOTMENU_DIR)/logs - -ifeq ($(CONFIG_VERBOSE),y) -BOOTMENU_BUILD_LOG=/dev/stdout -BOOTMENU_INSTALL_LOG=/dev/stdout -else -BOOTMENU_BUILD_LOG=$(BOOTMENU_LOG_DIR)/build.log -BOOTMENU_INSTALL_LOG=$(BOOTMENU_LOG_DIR)/install.log -endif - -$(SOURCE_DIR)/$(BOOTMENU_SOURCE): - @ mkdir -p $(SOURCE_DIR) - @ wget -P $(SOURCE_DIR) $(BOOTMENU_URL)/$(BOOTMENU_SOURCE) - -$(BOOTMENU_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(BOOTMENU_SOURCE) - @ echo "Unpacking bootmenu..." - @ tar -C $(BOOTMENU_DIR) -zxf $(SOURCE_DIR)/$(BOOTMENU_SOURCE) - @ touch $@ - -$(BOOTMENU_SRC_DIR)/bootmenu: $(BOOTMENU_STAMP_DIR)/.unpacked - @ echo "Building bootmenu..." - $(MAKE) LDFLAGS="$(CROSS_CFLAGS) $(LDFLAGS)" -C $(BOOTMENU_SRC_DIR) > $(BOOTMENU_BUILD_LOG) 2>&1 - -$(INITRD_DIR)/bin/bootmenu: $(BOOTMENU_SRC_DIR)/bootmenu - @ install -d $(INITRD_DIR)/bin - @ install -m 0755 $(BOOTMENU_SRC_DIR)/bootmenu \ - $(INITRD_DIR)/bin/bootmenu - @ $(STRIPCMD) $(INITRD_DIR)/bin/bootmenu - @ install -d $(INITRD_DIR)/images - @ install -m 0644 $(BOOTMENU_SRC_DIR)/images/*.ppm $(INITRD_DIR)/images - -$(BOOTMENU_STAMP_DIR) $(BOOTMENU_LOG_DIR): - @ mkdir -p $@ - -bootmenu: $(BOOTMENU_STAMP_DIR) $(BOOTMENU_LOG_DIR) $(INITRD_DIR)/bin/bootmenu - -bootmenu-clean: - @ echo "Cleaning bootmenu..." - @ $(MAKE) -C $(BOOTMENU_SRC_DIR) clean > /dev/null 2>&1 - -bootmenu-distclean: - @ rm -rf $(BOOTMENU_DIR)/* - -bootmenu-bom: - @ echo "Package: bootmenu" - @ echo "Source: $(BOOTMENU_URL)/$(BOOTMENU_SOURCE)" - @ echo "" Deleted: buildrom-devel/packages/crc32sum/crc32sum.mk =================================================================== --- buildrom-devel/packages/crc32sum/crc32sum.mk 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/crc32sum/crc32sum.mk 2007-10-18 00:09:03 UTC (rev 44) @@ -1,49 +0,0 @@ -CRC32SUM_URL=http://dev.laptop.org/~rsmith -CRC32SUM_SOURCE=crc32sum_0.1.0.tar.gz -CRC32SUM_DIR=$(BUILD_DIR)/crc32sum -CRC32SUM_SRC_DIR=$(CRC32SUM_DIR)/crc32sum_0.1.0 -CRC32SUM_STAMP_DIR=$(CRC32SUM_DIR)/stamps -CRC32SUM_LOG_DIR=$(CRC32SUM_DIR)/logs - -ifeq ($(CONFIG_VERBOSE),y) -CRC32SUM_BUILD_LOG=/dev/stdout -CRC32SUM_CONFIG_LOG=/dev/stdout -else -CRC32SUM_BUILD_LOG=$(CRC32SUM_LOG_DIR)/build.log -CRC32SUM_CONFIG_LOG=$(CRC32SUM_LOG_DIR)/config.log -endif - -$(SOURCE_DIR)/$(CRC32SUM_SOURCE): - @ mkdir -p $(SOURCE_DIR) - @ wget -P $(SOURCE_DIR) $(CRC32SUM_URL)/$(CRC32SUM_SOURCE) - -$(CRC32SUM_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(CRC32SUM_SOURCE) - @ echo "Unpacking crc32sum..." - @ tar -C $(CRC32SUM_DIR) -zxf $(SOURCE_DIR)/$(CRC32SUM_SOURCE) - @ touch $@ - -$(CRC32SUM_SRC_DIR)/crc32sum: $(CRC32SUM_STAMP_DIR)/.unpacked - @ echo "Building crc32sum..." - @ ( export CC=$(HOST_CC); export CFLAGS=$(HOST_CFLAGS); \ - export LDFLAGS=$(HOST_LDFLAGS); unset LIBS; \ - $(MAKE) -C $(CRC32SUM_SRC_DIR) all > $(CRC32SUM_BUILD_LOG) 2>&1) - -$(STAGING_DIR)/bin/crc32sum: $(CRC32SUM_SRC_DIR)/crc32sum - @ install -d $(STAGING_DIR)/bin - @ install -m 0755 $< $@ - -$(CRC32SUM_STAMP_DIR) $(CRC32SUM_LOG_DIR): - @ mkdir -p $@ - -crc32sum: $(CRC32SUM_STAMP_DIR) $(CRC32SUM_LOG_DIR) $(STAGING_DIR)/bin/crc32sum - -crc32sum-clean: - @ $(MAKE) -C $(CRC32SUM_SRC_DIR) clean > /dev/null 2>&1 - -crc32sum-distclean: - @ rm -rf $(CRC32SUM_DIR)/* - -crc32sum-bom: - echo "Package: crc32sum" - echo "Source: $(CRC32SUM_URL)/$(CRC32SUM_SOURCE)" - echo "" Deleted: buildrom-devel/packages/fwsig/fwsig.c =================================================================== --- buildrom-devel/packages/fwsig/fwsig.c 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/fwsig/fwsig.c 2007-10-18 00:09:03 UTC (rev 44) @@ -1,133 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <fcntl.h> -#include <sys/stat.h> - -#define FIRMWARE_SIG_OFFSET 0xffc0 -#define FIRMWARE_SIG_SIZE 16 - -void usage(void) { - printf("usage: <file> [sig]\n"); - printf("- Read or write the firmware signature of the file.\n"); - printf("- if no signature is provided, then read it from the file.\n"); - printf("- otherwise, write it into the file.\n"); -} - -int openfile(const char *filename, int flags) { - - int fd = open(filename, O_RDONLY); - struct stat s; - - if (fd == -1) { - printf("Couldn't open %s for reading.\n", filename); - return -1; - } - - if (fstat(fd, &s)) { - printf("Couldn't stat %s\n", filename); - goto error; - } - - if (s.st_size < (FIRMWARE_SIG_OFFSET + FIRMWARE_SIG_SIZE)) { - printf("Oops - %s is too small for this operation.\n", filename); - goto error; - } - - return fd; - - error: - close(fd); - return -1; -} - -int read_sig(const char *filename) { - - int ret; - int fd = openfile(filename, O_RDONLY); - char sig[FIRMWARE_SIG_SIZE + 1]; - - if (fd == -1) - return -1; - - ret = lseek(fd, FIRMWARE_SIG_OFFSET, SEEK_SET); - - if (ret == -1) { - printf("Couldn't seek to %d in %s\n", FIRMWARE_SIG_OFFSET, filename); - goto error; - } - - memset(sig, 0, FIRMWARE_SIG_SIZE + 1); - ret = read(fd, sig, FIRMWARE_SIG_SIZE); - - if (ret == 0) - printf("%s: \"%16s\"\n", filename, sig); - else - printf("Error while reading the signature.\n"); - - error: - close(fd); - return ret; -} - -int write_sig(const char *filename, const char *sig) { - - int ret; - char temp[FIRMWARE_SIG_SIZE + 1]; - int fd = openfile(filename, O_RDONLY); - int i; - - if (fd == -1) - return -1; - - ret = lseek(fd, FIRMWARE_SIG_OFFSET, SEEK_SET); - - if (ret == -1) { - printf("Couldn't seek to %d in %s\n", FIRMWARE_SIG_OFFSET, filename); - goto error; - } - - strncpy(temp, sig, FIRMWARE_SIG_SIZE); - - if (strlen(sig) < FIRMWARE_SIG_SIZE) { - printf("*** WARNING - the firmware signature is less then %d bytes.\n", FIRMWARE_SIG_SIZE); - printf(" It will be padded - this may not have the inteded effect you want.\n"); - - - for(i = strlen(sig); i < FIRMWARE_SIG_SIZE; i++) - temp[i] = ' '; - - temp[i] = 0; - } - else if (strlen(sig) > FIRMWARE_SIG_SIZE) { - printf("*** WARNING - the firmware signature is less then %d bytes.\n", FIRMWARE_SIG_SIZE); - printf(" It will be truncated - this may not have the inteded effect you want.\n"); - temp[FIRMWARE_SIG_SIZE] = 0; - } - - ret = write(fd, sig, FIRMWARE_SIG_SIZE); - - if (ret) - printf("Error while writing the signature.\n"); - - error: - close(fd); - return ret; -} - -int main(int argc, char **argv) { - - int ret = 1; - - if (argc < 2) - usage(); - else if (argc == 2) - ret = read_sig(argv[1]); - else - ret = write_sig(argv[1], argv[2]); - - return ret; -} - - Deleted: buildrom-devel/packages/linuxbios/cache.patch =================================================================== --- buildrom-devel/packages/linuxbios/cache.patch 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/cache.patch 2007-10-18 00:09:03 UTC (rev 44) @@ -1,14 +0,0 @@ -Index: LinuxBIOSv2/src/arch/i386/init/crt0.S.lb -=================================================================== ---- LinuxBIOSv2.orig/src/arch/i386/init/crt0.S.lb 2006-08-28 11:24:58.000000000 -0600 -+++ LinuxBIOSv2/src/arch/i386/init/crt0.S.lb 2006-08-28 15:18:04.000000000 -0600 -@@ -65,6 +65,9 @@ - - cld /* clear direction flag */ - -+ /* Invalidate the cache (if they are enabled) */ -+ wbinvd -+ - /* copy linuxBIOS from it's initial load location to - * the location it is compiled to run at. - * Normally this is copying from FLASH ROM to RAM. Deleted: buildrom-devel/packages/linuxbios/dcon-detect.patch =================================================================== --- buildrom-devel/packages/linuxbios/dcon-detect.patch 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/dcon-detect.patch 2007-10-18 00:09:03 UTC (rev 44) @@ -1,80 +0,0 @@ -diff --git a/src/mainboard/olpc/rev_a/mainboard.c b/src/mainboard/olpc/rev_a/mainboard.c -index d23255b..05abbfa 100755 ---- a/src/mainboard/olpc/rev_a/mainboard.c -+++ b/src/mainboard/olpc/rev_a/mainboard.c -@@ -6,6 +6,67 @@ #include <device/pci_ops.h> - #include <arch/io.h> - #include <pc80/mc146818rtc.h> - #include "chip.h" -+#include "../southbridge/amd/cs5536/cs5536_smbus2.h" -+ -+/* Borrowed from mc146818rtc.c */ -+ -+#define CMOS_READ(addr) ({ \ -+ outb((addr),RTC_PORT(0)); \ -+ inb(RTC_PORT(1)); \ -+ }) -+ -+#define CMOS_WRITE(val, addr) ({ \ -+ outb((addr),RTC_PORT(0)); \ -+ outb((val),RTC_PORT(1)); \ -+ }) -+ -+static void write_bit(unsigned char val) { -+ -+ unsigned char byte = CMOS_READ(440 / 8); -+ -+ /* Don't change it if its already set */ -+ -+ if ((byte & 1) == (val & 1)) -+ return; -+ -+ byte &= ~1; -+ byte |= val & 1; -+ CMOS_WRITE(val, 440/8); -+} -+ -+static unsigned short _getsmbusbase(void) { -+ unsigned devfn = PCI_DEVFN(0xf, 0); -+ device_t dev = dev_find_slot(0x0, devfn); -+ unsigned long addr = pci_read_config32(dev, PCI_BASE_ADDRESS_0); -+ -+ return (unsigned short) (addr & ~1); -+} -+ -+static void init_dcon(void) { -+ -+ int ret = 1; -+ unsigned short rev = 0; -+ unsigned short iobase = _getsmbusbase(); -+ -+ printk_debug("CHECKING FOR DCON (%x)\n", iobase); -+ -+ /* Get the IO base for the SMBUS */ -+ -+ rev = do_smbus_read_word(iobase, 0x0D << 1, 0x00); -+ -+ if (rev & 0xDC00) { -+ printk_debug("DCON FOUND - REV %x\n", rev); -+ -+ /* Enable the DCON */ -+ ret = do_smbus_write_word(iobase, 0x0D << 1, 0x01, 0x0069); -+ if (ret != 0) -+ printk_debug("DCON ENABLE FAILED\n", ret); -+ } -+ else -+ printk_debug("DCON NOT FOUND (%x)\n", rev); -+ -+ write_bit(rev > 0 ? 1 : 0); -+} - - // indexed access to EC registers - #define EC_INDEX(n) (0x380 + (n)) -@@ -98,6 +159,7 @@ #define EC_3700_SIGNATURE 0xa0 - } - #endif - -+ init_dcon(); - printk_debug("OLPC REVA EXIT %s\n", __FUNCTION__); - } - Deleted: buildrom-devel/packages/linuxbios/fix.patch =================================================================== --- buildrom-devel/packages/linuxbios/fix.patch 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/fix.patch 2007-10-18 00:09:03 UTC (rev 44) @@ -1,56 +0,0 @@ -diff --git a/src/southbridge/amd/cs5536/cs5536.c b/src/southbridge/amd/cs5536/cs5536.c -index 3e6f96b..6c0c8c0 100755 ---- a/src/southbridge/amd/cs5536/cs5536.c -+++ b/src/southbridge/amd/cs5536/cs5536.c -@@ -90,6 +90,29 @@ static unsigned char ec_inb(unsigned sho - return inb(EC_INDEX(3)); - } - -+#define EC_3920_SIGNATURE 0x09 -+ -+static unsigned char eccmd(unsigned char command) { -+ -+ unsigned char ret; -+ -+ if ((ret = inb(0x6c)) & 1) -+ ret = inb(0x68); -+ -+ /* Write the command */ -+ outb(command, 0x6C); -+ -+ /* Wait for the EC response */ -+ while((inb(0x6C) & 3) != 1); -+ -+ /* get the response */ -+ ret = inb(0x68); -+ -+ /* Clear the "ownership flag" */ -+ outb(0xFF, 0x6C); -+ return ret; -+} -+ - static void southbridge_init(struct device *dev) - { - struct southbridge_amd_cs5536_config *sb = (struct southbridge_amd_cs5536_config *)dev->chip_info; -@@ -107,13 +130,15 @@ static void southbridge_init(struct devi - setup_i8259(); - - if (sb->lpc_serirq_enable) { -+ int ret; - msr.lo = sb->lpc_serirq_enable; --#if 0 // Not Yet --#define EC_3700_SIGNATURE 0xa0 -- if (ec_inb(0xff00) == EC_3700_SIGNATURE) { -- msr.lo |= 0x40; // Set quiet mode bit -- } --#endif -+ -+ /* Get the HW version */ -+ ret = eccmd(0x09); -+ -+ if (ret != EC_3920_SIGNATURE) -+ msr.lo |= 0x40; -+ - msr.hi = 0; - wrmsr(MDD_LPC_SIRQ, msr); - } Deleted: buildrom-devel/packages/linuxbios/linuxbios-olpc.mk =================================================================== --- buildrom-devel/packages/linuxbios/linuxbios-olpc.mk 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/linuxbios-olpc.mk 2007-10-18 00:09:03 UTC (rev 44) @@ -1,64 +0,0 @@ -# This is the OLPC LinuxBIOS target - -ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LINUXBIOS_TAG),) -$(error You need to specify a version to pull in your platform config) -endif -endif - -LINUXBIOS_ROM_FILENAME=olpc-$(FIRMWARE_REVISION)$(LINUXBIOS_CL2_MARKER).rom -LINUXBIOS_FETCHSH=$(BIN_DIR)/fetchgit.sh -LINUXBIOS_BASE_DIR=git -LINUXBIOS_URL=git://dev.laptop.org/projects/linuxbios -LINUXBIOS_TARBALL=linuxbios-git-$(LINUXBIOS_TAG).tar.gz -LINUXBIOS_PAYLOAD_TARGET = /tmp/olpcpayload.elf -LINUXBIOS_VSA=$(PACKAGE_DIR)/bin/olpc_vsa.64k.bin - -MANUFACTURER_STRING = `printf "%-6s%-7s%-3s" $(FIRMWARE_MODEL) $(FIRMWARE_REVISION) $(FIRMWARE_REV2)` - -ifeq ($(_LINUXBIOS_INC_),) -include $(PACKAGE_DIR)/linuxbios/linuxbios.inc -endif - -$(SOURCE_DIR)/$(LINUXBIOS_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchgit.sh $(LINUXBIOS_URL) $(SOURCE_DIR)/linuxbios \ - $(LINUXBIOS_TAG) $(SOURCE_DIR)/$(LINUXBIOS_TARBALL) \ - > $(LINUXBIOS_FETCH_LOG) 2>&1 - -ifeq ($(EC_FIRMWARE_OVERRIDE),) -$(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV): - @ echo "Fetching the EC bits..." - @ wget -N -P $(LINUXBIOS_BUILD_DIR) $(EC_FIRMWARE_URL)/$(EC_FIRMWARE_REV) - @ wget -N -P $(LINUXBIOS_BUILD_DIR) $(EC_FIRMWARE_URL)/MD5SUMS - @ if [ "`md5sum $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) |cut -d' ' -f1`" != "`grep $(EC_FIRMWARE_REV) $(LINUXBIOS_BUILD_DIR)/MD5SUMS | cut -d' ' -f1`" ]; then echo "ERROR! EC firmware hash does not match"; exit 1; fi - @ echo "EC Bits fetched and verified" - @ touch $@ -else -$(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV): - @ echo "EC_FIRMWARE_OVERRIDE active so using custom EC bits from $(EC_FIRMWARE_OVERRIDE)" - @ cp -f $(PACKAGE_DIR)/bin/$(EC_FIRMWARE_OVERRIDE) $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) - @ touch $@ -endif - - -$(OUTPUT_DIR)/$(OLPC_ROM_FILENAME).nosig: $(LINUXBIOS_OUTPUT) $(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV) - @ echo "Creating FIRMWARE_REVISON = $(FIRMWARE_REVISION) ROM and md5 files" - @ cat $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) $(LINUXBIOS_VSA) \ - $(LINUXBIOS_BUILD_DIR)/$(LINUXBIOS_OUTPUT) > $@ - -$(OUTPUT_DIR)/$(LINUXBIOS_ROM_FILENAME): $(OUTPUT_DIR)/$(OLPC_ROM_FILENAME).nosig - @ $(BIN_DIR)/setsig.sh $< "$(MANUFACTURER_STRING)" $@ - @ $(STAGING_DIR)/bin/crc32sum -a $@ > $(LINUXBIOS_BUILD_LOG) - @ md5sum $@ | cut -d ' ' -f 1 > $(OUTPUT_DIR)/$(LINUXBIOS_ROM_FILENAME).md5 - - -olpc-linuxbios: $(OUTPUT_DIR)/$(LINUXBIOS_ROM_FILENAME) -olpc-linuxbios-clean: generic-linuxbios-clean - @ rm -f $(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV) - @ rm -f $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) \ - $(LINUXBIOS_BUILD_DIR)/MD5SUMS - -olpc-linuxbios-distclean: generic-linuxbios-distclean - Deleted: buildrom-devel/packages/linuxbios/linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/linuxbios.mk 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/linuxbios.mk 2007-10-18 00:09:03 UTC (rev 44) @@ -1,171 +0,0 @@ -# LinuxBIOS build script - -ifeq ($(LINUXBIOS_VENDOR),) -LINUXBIOS_VENDOR=olpc -endif -ifeq ($(LINUXBIOS_BOARD),) -LINUXBIOS_BOARD=rev_a -endif -ifeq ($(LINUXBIOS_CONFIG),) -LINUXBIOS_CONFIG=Config.SPI.lb -endif -ifeq ($(LINUXBIOS_TDIR),) -LINUXBIOS_TDIR=rev_a_1M -endif -ifeq ($(LINUXBIOS_FETCH),) -LINUXBIOS_FETCH=git -endif - -LINUXBIOS_PATCHES = - -ifeq ($(PAYLOAD_LAB),y) -LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/dcon-detect.patch -endif - -ifeq ($(LINUXBIOS_ENABLE_LZMA),y) -LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/lzma-config.patch -endif - -ifeq ($(LINUXBIOS_CAS25),y) -LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/CL2.5.patch -LINUXBIOS_CL2_MARKER=_CL2.5 -endif - -EC_FIRMWARE_URL=http://dev.laptop.org/pub/ec - -ifeq ($(EC_FIRMWARE_OVERRIDE),) -EC_FIRMWARE_REV=ec_v$(EC_VER).img -else -EC_FIRMWARE_REV=$(EC_FIRMWARE_OVERRIDE) -endif - -LINUXBIOS_ROM_FILENAME=olpc-$(FIRMWARE_REVISION)$(LINUXBIOS_CL2_MARKER).rom - -LINUXBIOS_DIR=$(BUILD_DIR)/linuxbios - -LINUXBIOS_TARGET_DIR=$(LINUXBIOS_SRC_DIR)/targets/ -LINUXBIOS_TARGET_NAME=$(LINUXBIOS_VENDOR)/$(LINUXBIOS_BOARD) -LINUXBIOS_CONFIG_NAME=$(LINUXBIOS_TARGET_NAME)/$(LINUXBIOS_CONFIG) -LINUXBIOS_BUILD_DIR=$(LINUXBIOS_TARGET_DIR)/$(LINUXBIOS_TARGET_NAME)/$(LINUXBIOS_TDIR) - -# Choose the right variables to use based on our fetch method - -ifeq ($(LINUXBIOS_FETCH),git) -LINUXBIOS_FETCHSH=$(BIN_DIR)/fetchgit.sh -LINUXBIOS_SRC_DIR=$(LINUXBIOS_DIR)/git -LINUXBIOS_TAG=$(LINUXBIOS_GIT_TAG) -LINUXBIOS_URL=$(LINUXBIOS_GIT_URL) -else -LINUXBIOS_FETCHSH=$(BIN_DIR)/fetchsvn.sh -LINUXBIOS_SRC_DIR=$(LINUXBIOS_DIR)/svn -LINUXBIOS_TAG=$(LINUXBIOS_SVN_TAG) -LINUXBIOS_URL=$(LINUXBIOS_SVN_URL) -endif - -ifeq ($(LINUXBIOS_TAG),) -$(error LINUXBIOS_TAG was not defined. Check your Config.mk) -endif - -ifeq ($(LINUXBIOS_URL),) -$(error LINUXBIOS_URL was not defined. Check your Config.mk) -endif - -LINUXBIOS_TARBALL=linuxbios-$(LINUXBIOS_FETCH)-$(LINUXBIOS_TAG).tar.gz - -LINUXBIOS_STAMP_DIR=$(LINUXBIOS_DIR)/stamps -LINUXBIOS_LOG_DIR=$(LINUXBIOS_DIR)/logs - -ifeq ($(VERBOSE),y) -LINUXBIOS_FETCH_LOG=/dev/stdout -LINUXBIOS_CONFIG_LOG=/dev/stdout -LINUXBIOS_BUILD_LOG=/dev/stdout -LINUXBIOS_INSTALL_LOG=/dev/stdout -else -LINUXBIOS_FETCH_LOG=$(LINUXBIOS_LOG_DIR)/fetch.log -LINUXBIOS_BUILD_LOG=$(LINUXBIOS_LOG_DIR)/build.log -LINUXBIOS_CONFIG_LOG=$(LINUXBIOS_LOG_DIR)/config.log -LINUXBIOS_INSTALL_LOG=$(LINUXBIOS_LOG_DIR)/install.log -endif - -# Build the manufacturer string from the firmware model and revision - -FIRMWARE_REV2 = $(shell echo $(FIRMWARE_REVISION) | awk '{print substr($$1,0,3)}') -MANUFACTURER_STRING = `printf "%-6s%-7s%-3s" $(FIRMWARE_MODEL) $(FIRMWARE_REVISION) $(FIRMWARE_REV2)` - -# fix me sooner or later! -/tmp/olpcpayload.elf: $(PAYLOAD_TARGET) - @ cp $< $@ - -$(SOURCE_DIR)/$(LINUXBIOS_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(LINUXBIOS_FETCHSH) $(LINUXBIOS_URL) $(SOURCE_DIR)/linuxbios \ - $(LINUXBIOS_TAG) $(SOURCE_DIR)/$(LINUXBIOS_TARBALL) \ - > $(LINUXBIOS_FETCH_LOG) 2>&1 - -$(LINUXBIOS_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(LINUXBIOS_TARBALL) - @ echo "Unpacking LinuxBIOS..." - @ tar -C $(LINUXBIOS_DIR) -zxf $(SOURCE_DIR)/$(LINUXBIOS_TARBALL) - @ touch $@ - -$(LINUXBIOS_STAMP_DIR)/.patched: $(LINUXBIOS_STAMP_DIR)/.unpacked - @ echo "Patching LinuxBIOS..." - @ $(BIN_DIR)/doquilt.sh $(LINUXBIOS_SRC_DIR) $(LINUXBIOS_PATCHES) - @ touch $@ - -$(LINUXBIOS_STAMP_DIR)/.configured: $(LINUXBIOS_STAMP_DIR)/.patched - @ echo "Building target config file..." - @( cd $(LINUXBIOS_TARGET_DIR); \ - ./buildtarget $(LINUXBIOS_CONFIG_NAME) > $(LINUXBIOS_CONFIG_LOG) 2>&1) - @ touch $@ - -ifeq ($(EC_FIRMWARE_OVERRIDE),) -$(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV): - @ echo "Fetching the EC bits..." - @ wget -N -P $(LINUXBIOS_BUILD_DIR) $(EC_FIRMWARE_URL)/$(EC_FIRMWARE_REV) - @ wget -N -P $(LINUXBIOS_BUILD_DIR) $(EC_FIRMWARE_URL)/MD5SUMS - @ if [ "`md5sum $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) |cut -d' ' -f1`" != "`grep $(EC_FIRMWARE_REV) $(LINUXBIOS_BUILD_DIR)/MD5SUMS | cut -d' ' -f1`" ]; then echo "ERROR! EC firmware hash does not match"; exit 1; fi - @ echo "EC Bits fetched and verified" - @ touch $@ -else -$(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV): - @ echo "EC_FIRMWARE_OVERRIDE active so using custom EC bits from $(EC_FIRMWARE_OVERRIDE)" - @ cp -f $(PACKAGE_DIR)/bin/$(EC_FIRMWARE_OVERRIDE) $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) - @ touch $@ -endif - -$(LINUXBIOS_BUILD_DIR)/$(LINUXBIOS_ROM_FILENAME): $(LINUXBIOS_STAMP_DIR)/.configured /tmp/olpcpayload.elf - @ echo "Building linuxbios..." - @ make -C $(LINUXBIOS_BUILD_DIR) > $(LINUXBIOS_BUILD_LOG) 2>&1 - -$(LINUXBIOS_BUILD_DIR)/$(LINUXBIOS_ROM_FILENAME).nosig: $(LINUXBIOS_BUILD_DIR)/$(LINUXBIOS_ROM_FILENAME) $(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV) - @ echo "Creating FIRMWARE_REVISON = $(FIRMWARE_REVISION) ROM and md5 files" - @ cat $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) $(PACKAGE_DIR)/bin/olpc_vsa.64k.bin $(LINUXBIOS_BUILD_DIR)/linuxbios.rom > $@ - -$(OUTPUT_DIR)/$(LINUXBIOS_ROM_FILENAME): $(LINUXBIOS_BUILD_DIR)/$(LINUXBIOS_ROM_FILENAME).nosig - @ $(BIN_DIR)/setsig.sh $< "$(MANUFACTURER_STRING)" $@ - @ $(STAGING_DIR)/bin/crc32sum -a $@ > $(LINUXBIOS_BUILD_LOG) - @ md5sum $@ | cut -d ' ' -f 1 > $(OUTPUT_DIR)/$(LINUXBIOS_ROM_FILENAME).md5 - -$(LINUXBIOS_STAMP_DIR) $(LINUXBIOS_LOG_DIR): - @ mkdir -p $@ - -linuxbios: $(LINUXBIOS_STAMP_DIR) $(LINUXBIOS_LOG_DIR) $(OUTPUT_DIR)/$(LINUXBIOS_ROM_FILENAME) - -linuxbios-clean: - @ echo "Cleaning linuxbios..." - @ $(MAKE) -C $(LINUXBIOS_BUILD_DIR) clean > /dev/null 2>&1 - @ rm -f $(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV) - @ rm -f $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) \ - $(LINUXBIOS_BUILD_DIR)/MD5SUMS - -linuxbios-distclean: - @ rm -rf $(LINUXBIOS_DIR)/* - -linuxbios-bom: - @ echo "Package: linuxbios" - @ echo "Source: $(LINUXBIOS_URL)" - @ echo "Revison: $(LINUXBIOS_TAG)" - @ echo "Tarball: `basename $(LINUXBIOS_TARBALL)" - @ echo "" - Deleted: buildrom-devel/packages/linuxbios/lzma-config.patch =================================================================== --- buildrom-devel/packages/linuxbios/lzma-config.patch 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/lzma-config.patch 2007-10-18 00:09:03 UTC (rev 44) @@ -1,15 +0,0 @@ -Index: LinuxBIOSv2/targets/olpc/rev_a/Config.SPI.lb -=================================================================== ---- LinuxBIOSv2.orig/targets/olpc/rev_a/Config.SPI.lb 2006-09-15 11:54:44.000000000 -0600 -+++ LinuxBIOSv2/targets/olpc/rev_a/Config.SPI.lb 2006-09-15 11:55:04.000000000 -0600 -@@ -5,8 +5,8 @@ - - # Don't let LinuxBIOS compress the payload - #option CONFIG_COMPRESSED_ROM_STREAM_NRV2B=0 --#option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1 --#option CONFIG_PRECOMPRESSED_ROM_STREAM=0 -+option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1 -+option CONFIG_PRECOMPRESSED_ROM_STREAM=1 - - # leave 64k for vsa and 64k for EC code - option ROM_SIZE=(1024*1024)-(64*1024)-(64*1024) Deleted: buildrom-devel/packages/linuxbios/olpc-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/olpc-linuxbios.mk 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/olpc-linuxbios.mk 2007-10-18 00:09:03 UTC (rev 44) @@ -1,65 +0,0 @@ -# This is the OLPC LinuxBIOS target - -ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LINUXBIOS_TAG),) -$(error You need to specify a version to pull in your platform config) -endif -endif - -TARGET_ROM=olpc-$(FIRMWARE_REVISION)$(LINUXBIOS_CL2_MARKER).rom -LINUXBIOS_FETCHSH=$(BIN_DIR)/fetchgit.sh -LINUXBIOS_BASE_DIR=git -LINUXBIOS_URL=git://dev.laptop.org/projects/linuxbios -LINUXBIOS_TARBALL=linuxbios-git-$(LINUXBIOS_TAG).tar.gz -LINUXBIOS_PAYLOAD_TARGET = /tmp/olpcpayload.elf -LINUXBIOS_VSA=$(PACKAGE_DIR)/bin/olpc_vsa.64k.bin - -MANUFACTURER_STRING = `printf "%-6s%-7s%-3s" $(FIRMWARE_MODEL) $(FIRMWARE_REVISION) $(FIRMWARE_REV2)` - -ifeq ($(CONFIG_USE_LZMA),y) -LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/lzma-config.patch -endif - -include $(PACKAGE_DIR)/linuxbios/linuxbios.inc - -$(SOURCE_DIR)/$(LINUXBIOS_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchgit.sh $(LINUXBIOS_URL) $(SOURCE_DIR)/linuxbios \ - $(LINUXBIOS_TAG) $(SOURCE_DIR)/$(LINUXBIOS_TARBALL) \ - > $(LINUXBIOS_FETCH_LOG) 2>&1 - -ifeq ($(EC_FIRMWARE_OVERRIDE),) -$(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV): - @ echo "Fetching the EC bits..." - @ wget -N -P $(LINUXBIOS_BUILD_DIR) $(EC_FIRMWARE_URL)/$(EC_FIRMWARE_REV) - @ wget -N -P $(LINUXBIOS_BUILD_DIR) $(EC_FIRMWARE_URL)/MD5SUMS - @ if [ "`md5sum $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) |cut -d' ' -f1`" != "`grep $(EC_FIRMWARE_REV) $(LINUXBIOS_BUILD_DIR)/MD5SUMS | cut -d' ' -f1`" ]; then echo "ERROR! EC firmware hash does not match"; exit 1; fi - @ echo "EC Bits fetched and verified" - @ touch $@ -else -$(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV): - @ echo "EC_FIRMWARE_OVERRIDE active so using custom EC bits from $(EC_FIRMWARE_OVERRIDE)" - @ cp -f $(PACKAGE_DIR)/bin/$(EC_FIRMWARE_OVERRIDE) $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) - @ touch $@ -endif - - -$(OUTPUT_DIR)/$(OLPC_ROM_FILENAME).nosig: $(LINUXBIOS_OUTPUT) $(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV) - @ echo "Creating FIRMWARE_REVISON = $(FIRMWARE_REVISION) ROM and md5 files" - @ cat $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) $(LINUXBIOS_VSA) \ - $(LINUXBIOS_BUILD_DIR)/$(LINUXBIOS_OUTPUT) > $@ - -$(TARGET_ROM): $(OUTPUT_DIR)/$(OLPC_ROM_FILENAME).nosig - @ $(BIN_DIR)/setsig.sh $< "$(MANUFACTURER_STRING)" $@ - @ $(STAGING_DIR)/bin/crc32sum -a $@ > $(LINUXBIOS_BUILD_LOG) - @ md5sum $@ | cut -d ' ' -f 1 > $(OUTPUT_DIR)/$(LINUXBIOS_ROM_FILENAME).md5 - -linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean - @ rm -f $(LINUXBIOS_STAMP_DIR)/.pull_ecf_$(EC_FIRMWARE_REV) - @ rm -f $(LINUXBIOS_BUILD_DIR)/$(EC_FIRMWARE_REV) \ - $(LINUXBIOS_BUILD_DIR)/MD5SUMS - -linuxbios-distclean: generic-linuxbios-distclean - Deleted: buildrom-devel/packages/linuxbios/patches/cache.patch =================================================================== --- buildrom-devel/packages/linuxbios/patches/cache.patch 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/patches/cache.patch 2007-10-18 00:09:03 UTC (rev 44) @@ -1,14 +0,0 @@ -Index: LinuxBIOSv2/src/arch/i386/init/crt0.S.lb -=================================================================== ---- LinuxBIOSv2.orig/src/arch/i386/init/crt0.S.lb 2006-08-28 11:24:58.000000000 -0600 -+++ LinuxBIOSv2/src/arch/i386/init/crt0.S.lb 2006-08-28 15:18:04.000000000 -0600 -@@ -65,6 +65,9 @@ - - cld /* clear direction flag */ - -+ /* Invalidate the cache (if they are enabled) */ -+ wbinvd -+ - /* copy linuxBIOS from it's initial load location to - * the location it is compiled to run at. - * Normally this is copying from FLASH ROM to RAM. Deleted: buildrom-devel/packages/linuxbios/patches/dcon-detect.patch =================================================================== --- buildrom-devel/packages/linuxbios/patches/dcon-detect.patch 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/patches/dcon-detect.patch 2007-10-18 00:09:03 UTC (rev 44) @@ -1,80 +0,0 @@ -diff --git a/src/mainboard/olpc/rev_a/mainboard.c b/src/mainboard/olpc/rev_a/mainboard.c -index d23255b..05abbfa 100755 ---- a/src/mainboard/olpc/rev_a/mainboard.c -+++ b/src/mainboard/olpc/rev_a/mainboard.c -@@ -6,6 +6,67 @@ #include <device/pci_ops.h> - #include <arch/io.h> - #include <pc80/mc146818rtc.h> - #include "chip.h" -+#include "../southbridge/amd/cs5536/cs5536_smbus2.h" -+ -+/* Borrowed from mc146818rtc.c */ -+ -+#define CMOS_READ(addr) ({ \ -+ outb((addr),RTC_PORT(0)); \ -+ inb(RTC_PORT(1)); \ -+ }) -+ -+#define CMOS_WRITE(val, addr) ({ \ -+ outb((addr),RTC_PORT(0)); \ -+ outb((val),RTC_PORT(1)); \ -+ }) -+ -+static void write_bit(unsigned char val) { -+ -+ unsigned char byte = CMOS_READ(440 / 8); -+ -+ /* Don't change it if its already set */ -+ -+ if ((byte & 1) == (val & 1)) -+ return; -+ -+ byte &= ~1; -+ byte |= val & 1; -+ CMOS_WRITE(val, 440/8); -+} -+ -+static unsigned short _getsmbusbase(void) { -+ unsigned devfn = PCI_DEVFN(0xf, 0); -+ device_t dev = dev_find_slot(0x0, devfn); -+ unsigned long addr = pci_read_config32(dev, PCI_BASE_ADDRESS_0); -+ -+ return (unsigned short) (addr & ~1); -+} -+ -+static void init_dcon(void) { -+ -+ int ret = 1; -+ unsigned short rev = 0; -+ unsigned short iobase = _getsmbusbase(); -+ -+ printk_debug("CHECKING FOR DCON (%x)\n", iobase); -+ -+ /* Get the IO base for the SMBUS */ -+ -+ rev = do_smbus_read_word(iobase, 0x0D << 1, 0x00); -+ -+ if (rev & 0xDC00) { -+ printk_debug("DCON FOUND - REV %x\n", rev); -+ -+ /* Enable the DCON */ -+ ret = do_smbus_write_word(iobase, 0x0D << 1, 0x01, 0x0069); -+ if (ret != 0) -+ printk_debug("DCON ENABLE FAILED\n", ret); -+ } -+ else -+ printk_debug("DCON NOT FOUND (%x)\n", rev); -+ -+ write_bit(rev > 0 ? 1 : 0); -+} - - // indexed access to EC registers - #define EC_INDEX(n) (0x380 + (n)) -@@ -98,6 +159,7 @@ #define EC_3700_SIGNATURE 0xa0 - } - #endif - -+ init_dcon(); - printk_debug("OLPC REVA EXIT %s\n", __FUNCTION__); - } - Deleted: buildrom-devel/packages/linuxbios/patches/disable_swapsifs.patch =================================================================== --- buildrom-devel/packages/linuxbios/patches/disable_swapsifs.patch 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/patches/disable_swapsifs.patch 2007-10-18 00:09:03 UTC (rev 44) @@ -1,23 +0,0 @@ -Index: LinuxBIOSv2/src/cpu/amd/model_gx2/cpubug.c -=================================================================== ---- LinuxBIOSv2.orig/src/cpu/amd/model_gx2/cpubug.c 2006-08-29 08:44:01.000000000 -0600 -+++ LinuxBIOSv2/src/cpu/amd/model_gx2/cpubug.c 2006-08-29 08:45:21.000000000 -0600 -@@ -176,7 +176,7 @@ - wrmsr(0x3003, msr); - - /* change this value to zero if you need to disable this BTB SWAPSiF. */ -- if (1) { -+ if (0) { - - /* Disable enable_actions in DIAGCTL while setting up GLCP */ - msr.hi = 0; -@@ -373,7 +373,8 @@ - pcideadlock(); - eng1398(); - eng2900(); -- bug118339(); -+ /* Disabled because it freaks out FS2 */ -+ //bug118339(); - break; - case 0x22: - case 0x30: Deleted: buildrom-devel/packages/linuxbios/patches/fix.patch =================================================================== --- buildrom-devel/packages/linuxbios/patches/fix.patch 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/patches/fix.patch 2007-10-18 00:09:03 UTC (rev 44) @@ -1,56 +0,0 @@ -diff --git a/src/southbridge/amd/cs5536/cs5536.c b/src/southbridge/amd/cs5536/cs5536.c -index 3e6f96b..6c0c8c0 100755 ---- a/src/southbridge/amd/cs5536/cs5536.c -+++ b/src/southbridge/amd/cs5536/cs5536.c -@@ -90,6 +90,29 @@ static unsigned char ec_inb(unsigned sho - return inb(EC_INDEX(3)); - } - -+#define EC_3920_SIGNATURE 0x09 -+ -+static unsigned char eccmd(unsigned char command) { -+ -+ unsigned char ret; -+ -+ if ((ret = inb(0x6c)) & 1) -+ ret = inb(0x68); -+ -+ /* Write the command */ -+ outb(command, 0x6C); -+ -+ /* Wait for the EC response */ -+ while((inb(0x6C) & 3) != 1); -+ -+ /* get the response */ -+ ret = inb(0x68); -+ -+ /* Clear the "ownership flag" */ -+ outb(0xFF, 0x6C); -+ return ret; -+} -+ - static void southbridge_init(struct device *dev) - { - struct southbridge_amd_cs5536_config *sb = (struct southbridge_amd_cs5536_config *)dev->chip_info; -@@ -107,13 +130,15 @@ static void southbridge_init(struct devi - setup_i8259(); - - if (sb->lpc_serirq_enable) { -+ int ret; - msr.lo = sb->lpc_serirq_enable; --#if 0 // Not Yet --#define EC_3700_SIGNATURE 0xa0 -- if (ec_inb(0xff00) == EC_3700_SIGNATURE) { -- msr.lo |= 0x40; // Set quiet mode bit -- } --#endif -+ -+ /* Get the HW version */ -+ ret = eccmd(0x09); -+ -+ if (ret != EC_3920_SIGNATURE) -+ msr.lo |= 0x40; -+ - msr.hi = 0; - wrmsr(MDD_LPC_SIRQ, msr); - } Deleted: buildrom-devel/packages/linuxbios/patches/lzma-config.patch =================================================================== --- buildrom-devel/packages/linuxbios/patches/lzma-config.patch 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/linuxbios/patches/lzma-config.patch 2007-10-18 00:09:03 UTC (rev 44) @@ -1,15 +0,0 @@ -Index: LinuxBIOSv2/targets/olpc/rev_a/Config.SPI.lb -=================================================================== ---- LinuxBIOSv2.orig/targets/olpc/rev_a/Config.SPI.lb 2006-09-15 11:54:44.000000000 -0600 -+++ LinuxBIOSv2/targets/olpc/rev_a/Config.SPI.lb 2006-09-15 11:55:04.000000000 -0600 -@@ -5,8 +5,8 @@ - - # Don't let LinuxBIOS compress the payload - #option CONFIG_COMPRESSED_ROM_STREAM_NRV2B=0 --#option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1 --#option CONFIG_PRECOMPRESSED_ROM_STREAM=0 -+option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1 -+option CONFIG_PRECOMPRESSED_ROM_STREAM=1 - - # leave 64k for vsa and 64k for EC code - option ROM_SIZE=(1024*1024)-(64*1024)-(64*1024) Deleted: buildrom-devel/packages/olpcflash/Makefile =================================================================== --- buildrom-devel/packages/olpcflash/Makefile 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/olpcflash/Makefile 2007-10-18 00:09:03 UTC (rev 44) @@ -1,9 +0,0 @@ -CC=gcc -CFLAGS_extra= -Wall -LDFLAGS_extra= - -olpcflash: olpcflash.c - $(CC) $(CFLAGS) $(CFLAGS_extra) $(LDFLAGS) $(LDFLAGS_extra) -o $@ olpcflash.c $(LIBS) - -clean: - rm -f olpcflash Deleted: buildrom-devel/packages/olpcflash/olpcflash.c =================================================================== --- buildrom-devel/packages/olpcflash/olpcflash.c 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/olpcflash/olpcflash.c 2007-10-18 00:09:03 UTC (rev 44) @@ -1,937 +0,0 @@ -/* - * olpcflash.c: SPI Flash programming utility for OLPC. - * - * Copyright 2000 Silicon Integrated System Corporation - * Copyright 2004 Tyan Corp - * yhlu yhlu(a)tyan.com add exclude start and end option - * Copyright 2005-2006 coresystems GmbH - * Stefan Reinauer <stepan(a)coresystems.de> added rom layout - * support, and checking for suitable rom image, various fixes - * support for flashing the Technologic Systems 5300. - * Copyright 2006 Ron Minniich <rminnich(a)lanl.gov> - * Initial support for EnE KB3920 EC and the spansion - * 25FL008A 8Mibit SPI part on the OLPC - * Copyright 2006 Richard A. Smith <smithbone(a)gmail.com> - * Added lots of additional stuff to make writing to spansion part - * work correctly with the OLPC EnE EC. - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#include <errno.h> -#include <fcntl.h> -#include <sys/mman.h> -#include <unistd.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <getopt.h> -#include <sys/io.h> -#include <sys/time.h> -#include <time.h> - -#define printf_debug(x...) { if(verbose) printf(x); } -#define printf_super_debug(x...) { if(verbose > 1) printf(x); } - -#define VER_MAJOR 0 -#define VER_MINOR 3 -#define VER_RELEASE 0 - -#define LINUXBIOS_START 0x10000 -#define PAGE_SIZE 256 -#define EC_CODE_SIZE (64*1024) -#define ROM_SIZE (1024*1024) -#define IOBASE_DEFAULT (0x381) - -enum { - GPIO5 = 0xfc2a, - SPIA0 = 0xfea8, - SPIA1, - SPIA2, - SPIDAT, - SPICMD, - SPICFG, - SPIDATR -}; - -enum { - DUMMY, - WRITESTATUS = 1, - BYTEPROGRAM, - READ, - WRITEDISABLE, - READSTATUS, - WRITEENABLE, - HIGHSPEEDREAD = 0xb, - SECTORERASESST = 0x20, - ENABLEWRITESTATUSSST = 0x50, - BLOCKERASESST = 0x52, /* 32k block */ - CHIPERASESST = 0x60, - READJDECID = 0x9f, - AUTOINCPROGSST = 0xad, - CHIPERASEPCM = 0xc7, /* also nexflash */ - SECTORERASEPCM = 0xd7, - BLOCKERASEPCM = 0xd8, /* also nexflash, and spansion, SST (64k) */ -}; - -enum { - SPIBUSY = 2, - SPIFIRMWAREMODE = 1 << 4, - SPICMDWE = 8, - SPIFLASHREADCE = 1 << 6 -}; - -enum { - WIP = 1 << 0 -}; - -enum { - SPANSION = 0x01, - SST = 0xbf, - WINBOND = 0xef -}; - -struct flashchip { - int manufacture_id; - int model_type; - int model_id; - - int total_size; - int page_size; - - int (*write_page) (unsigned char *buf, unsigned long addr, unsigned long size); - -}; - -char *chip_to_probe = NULL; - -int exclude_start_page, exclude_end_page; -int force=0, verbose=0; int noop=0; - -/* this is the defaut index and data IO base address for - * EC register access. - * setup by the EC code. - */ - -unsigned short iobase = IOBASE_DEFAULT; - -// count to a billion. Time it. If it's < 1 sec, count to 10B, etc. -unsigned long micro = 1; - - -void myusec_delay(int time) -{ - volatile unsigned long i; - for (i = 0; i < time * micro; i++); -} - -void myusec_calibrate_delay() -{ - int count = 1000; - unsigned long timeusec; - struct timeval start, end; - int ok = 0; - - printf_debug("Setting up microsecond timing loop\n"); - while (!ok) { - gettimeofday(&start, 0); - myusec_delay(count); - gettimeofday(&end, 0); - timeusec = 1000000 * (end.tv_sec - start.tv_sec) + - (end.tv_usec - start.tv_usec); - count *= 2; - if (timeusec < 1000000 / 4) - continue; - ok = 1; - } - - // compute one microsecond. That will be count / time - micro = count / timeusec; - - printf_debug("%ldM loops per second\n", (unsigned long) micro); -} - - -void setecindex(unsigned short index) -{ - unsigned char hi = index>>8; - unsigned char lo = index; - - if (noop) return; - - outb(hi, iobase); - outb(lo, iobase+1); - printf_super_debug("%s: set 0x%x to 0x%x, 0x%x to 0x%x\n", __FUNCTION__, - iobase, hi, iobase+1, lo); -} - -unsigned char getecdata(void) -{ - unsigned char data; - - if (noop) return 0; - - data = inb(iobase+2); - printf_super_debug("%s: read 0x%x from 0x%x\n", __FUNCTION__, data, iobase+2); - return data; -} - -void putecdata(unsigned char data) -{ - - if (noop) return; - - outb(data, iobase+2); - printf_super_debug("%s: wrote 0x%x to 0x%x\n", __FUNCTION__, data, iobase+2); -} - -unsigned char readecdata(unsigned short index) -{ - setecindex(index); - return getecdata(); -} - -void writeecdata(unsigned short index, unsigned char data) -{ - setecindex(index); - putecdata(data); -} - -void setaddr(unsigned long addr){ - unsigned char data; - data = addr; - writeecdata(SPIA0, data); - data = addr >> 8; - writeecdata(SPIA1, data); - data = addr >> 16; - writeecdata(SPIA2, data); -} - -unsigned char rdata(void) -{ - unsigned char data; - data = readecdata(SPIDAT); - return data; -} - -void wdata(unsigned char data) -{ - writeecdata(SPIDAT, data); -} - -unsigned char cmd(void) -{ - return readecdata(SPICMD); -} - -void docmd(unsigned char cmd) -{ - printf_super_debug("docmd: cmd 0x%x\n", cmd); - writeecdata(SPICMD, cmd); - printf_super_debug("docmd: cmd 0x%x\n", cmd); -} - -void wait_cmd_sent(void) -{ - int trycount = 0; - myusec_delay(10); - - if (noop) return; - - while (readecdata(SPICFG) & SPIBUSY){ - trycount++; - myusec_delay(10); - if (trycount > 100000){ /* 1 second! */ - printf("wait_sent: Err: waited for > 1 second\n"); - trycount = 0; - } - } -} - -/* - * The EnE code has lots of small delays inbetween - * many of the actions. Route all this through - * one function so I can play with how long they - * need to be. - */ -void short_delay(void) -{ - // EnE code did 4 pci reads of the base address - // which should be around 800nS - // 2 uS should cover it in case I'm wrong - myusec_delay(2); -} - -/* - * Firmware mode allows you raw control over the SPI bus - * the spansion part is not supported by the EC in - * "hardware" mode. - * in this mode bytes written to the SPICMD register - * are clocked out the bus. - * This also asserts SPICS# - */ -void start_SPI_firmware_mode_access(void) -{ - writeecdata(SPICFG,0x18); -} - -void end_SPI_firmware_mode_access(void) -{ - writeecdata(SPICFG,0x08); -} - -/* - * You must do this prior to _every_ command that - * writes data to the part. The write enable - * latch resets after write commands complete. - */ -void send_write_enable(void) { - start_SPI_firmware_mode_access(); - short_delay(); - docmd(WRITEENABLE); - wait_cmd_sent(); - end_SPI_firmware_mode_access(); -} - -void send_addr(unsigned long addr) -{ - unsigned char data; - - data = addr >> 16 & 0xff; - docmd(data); - wait_cmd_sent(); - - data = addr >> 8 & 0xff; - docmd(data); - wait_cmd_sent(); - - data = addr & 0xff; - docmd(data); -} - -void enable_flash_cmd(void) -{ - writeecdata(SPICFG, SPICMDWE|readecdata(SPICFG)); -} - -void enable_flash_write_protect(void) -{ - unsigned char val; - val = readecdata(GPIO5); - val &= ~0x80; - writeecdata(GPIO5,val); -} - -void disable_flash_write_protect(void) -{ - unsigned char val; - val = readecdata(GPIO5); - val |= 0x80; - writeecdata(GPIO5,val); -} - -/* - * This appears to be necessary. If you watch the lines with - * scope you will see that there is constant activity on the SPI - * bus to the part. Trying to write to the port while all that - * is going on is sure to muck things up. - * Putting this into reset stops all that - * activity. - - * Plus Ray Tseng said so. - * - */ -void put_kbc_in_reset(void) -{ - unsigned char val; - unsigned long timeout = 500000; - - if (noop) return; - - outb(0xd8,0x66); - while((inb(0x66) & 0x02) && (timeout>0)) { - timeout--; - } - val = readecdata(0xff14); - val |= 0x01; - writeecdata(0xff14,val); -} - -void restore_kbc_run_mode(void) -{ - unsigned char val; - - val = readecdata(0xff14); - val &= ~0x01; - writeecdata(0xff14,val); -} - -unsigned char read_status_register(void) -{ - unsigned char data=0; - start_SPI_firmware_mode_access(); - short_delay(); - docmd(READSTATUS); - wait_cmd_sent(); - docmd(DUMMY); - wait_cmd_sent(); - data = rdata(); - end_SPI_firmware_mode_access(); - return data; -} - -// Staus reg writes; erases and programs all need to -// check this status bit. -int wait_write_done(void) -{ - int trycount = 0; - - if (noop) return 0; - - while (read_status_register() & WIP){ - trycount++; - myusec_delay(10); - // For the spansion part datasheet claims that - // the only thing that takes longer than 500mS is - // bulk erase and we don't ever want to use that - // command - if (trycount > 100000){ /* 1 second! */ - printf("wait_write_done: Err: waited for > 1 second\n"); - trycount = 0; - return -1; - } - } - - return 0; -} - -int erase_sector(unsigned long addr) -{ - send_write_enable(); - short_delay(); - - start_SPI_firmware_mode_access(); - short_delay(); - - docmd(BLOCKERASEPCM); - wait_cmd_sent(); - - send_addr(addr); - wait_cmd_sent(); - - end_SPI_firmware_mode_access(); - - return wait_write_done(); -} - -/* - Erase from sectors 0x10000 to 0xf0000 -*/ -int erase_linuxbios_area(void) -{ - unsigned long addr; - - for (addr = 0x10000;addr < 0xfffff;addr+=0x10000) { - printf("Erasing Sector: 0x%08lx\r\n",addr); - erase_sector(addr); - } - return 0; -} - -int erase_EC_area(void) -{ - unsigned long addr = 0; - printf("Erasing Sector: 0x%08lx\r\n",addr); - erase_sector(addr); - return 0; -} - -int erase_flash(int mode) -{ - if (mode == 1) { - erase_EC_area(); - } - erase_linuxbios_area(); - return 0; -} - - -unsigned char read_flash_byte(unsigned long addr) -{ - unsigned char data; - - setaddr(addr); - docmd(READ); - wait_cmd_sent(); - data = rdata(); - printf_debug("read 0x%x@0x%lx\n", data, addr); - return data; -} - -int read_flash(unsigned char *buf, unsigned long start, unsigned long size) -{ - unsigned long i; - - printf("Reading %ld bytes from %lx\r\n",size,start); - for (i = start; i < start+size; i++) { - if ((i % 0x10000) == 0) printf("Sector 0x%08lx\r\n", i); - *buf = read_flash_byte(i); - buf++; - } - return 0; -} - -int read_jdec_id(struct flashchip *flash) -{ - unsigned char data; - - start_SPI_firmware_mode_access(); - short_delay(); - - docmd(READJDECID); - wait_cmd_sent(); - docmd(DUMMY); - wait_cmd_sent(); - data = rdata(); - flash->manufacture_id = data; - docmd(DUMMY); - wait_cmd_sent(); - data = rdata(); - flash->model_type = data; - docmd(DUMMY); - wait_cmd_sent(); - data = rdata(); - flash->model_id = data; - - end_SPI_firmware_mode_access(); - - return 0; -} - -int write_flash_byte(unsigned long addr, unsigned char data) { - - send_write_enable(); - short_delay(); - - start_SPI_firmware_mode_access(); - short_delay(); - - docmd(BYTEPROGRAM); - wait_cmd_sent(); - - send_addr(addr); - wait_cmd_sent(); - - docmd(data); - wait_cmd_sent(); - - end_SPI_firmware_mode_access(); - - wait_write_done(); -/* - unsigned char verify; - verify = read_flash_byte(addr); - if (verify != data) { - printf("addr 0x%x, want 0x%x, got 0x%x\n", - addr, data, verify); - return -1; - } -*/ - return 0; -} - -int write_flash_page(unsigned char *buf, unsigned long addr, unsigned long size) -{ - - send_write_enable(); - short_delay(); - - start_SPI_firmware_mode_access(); - short_delay(); - - docmd(BYTEPROGRAM); - wait_cmd_sent(); - - send_addr(addr); - wait_cmd_sent(); - - while (size > 0) { - docmd(*buf); - wait_cmd_sent(); - size--; - buf++; - } - - end_SPI_firmware_mode_access(); - - wait_write_done(); -/* - unsigned char verify; - verify = read_flash_byte(addr); - if (verify != data) { - printf("addr 0x%x, want 0x%x, got 0x%x\n", - addr, data, verify); - return -1; - } -*/ - return 0; -} - -int -write_flash(unsigned char *buf, unsigned long start, unsigned long size){ - unsigned long p=0; - unsigned long pages=0; - unsigned long short_page=0; - - pages = (size+(PAGE_SIZE-1))/PAGE_SIZE; - short_page = size-(pages*PAGE_SIZE); - - printf("Writing %ld bytes starting at address 0x%lx\r\n",size,start); - - for (p=0;p<pages;p++) { - if ((start % 0x10000) == 0) printf("Sector 0x%08lx\r\n", start); - printf_debug("Page %ld/%ld\r",p+1,pages); - - if (write_flash_page(buf,start,PAGE_SIZE)) { - return -1; - } - - buf+=PAGE_SIZE; - start+=PAGE_SIZE; - } - printf_debug("\r\n"); - - if (short_page) { - printf_debug("Short Page of %ld bytes\r\n",short_page); - printf_debug("Address %ld\r\n",start); - - if (write_flash_page(buf,start,short_page)) { - return -1; - } - } - - return 0; -} - -int verify_flash(unsigned char *buf, unsigned long start, unsigned long size) -{ - unsigned long idx; - unsigned char r_val; - - printf("Verifying flash\n"); - - if(verbose) printf("address: 0x00000000\b\b\b\b\b\b\b\b\b\b"); - - for (idx = start; idx < start+size; idx++) { - if (verbose && ( (idx & 0xfff) == 0xfff )) - printf("0x%08lx", idx); - - if ((idx % 0x10000) == 0) - printf("Sector 0x%08lx\r\n", idx); - - r_val = read_flash_byte(idx); - - if ( r_val != *buf ) { - printf("0x%08lx: ", idx); - printf("Expected 0x%02x Got 0x%02x\n",*buf,r_val); - printf("Verify FAILED\n"); - return 1; - } - buf++; - - if (verbose && ( (idx & 0xfff) == 0xfff )) - printf("\b\b\b\b\b\b\b\b\b\b"); - } - if (verbose) - printf("\b\b\b\b\b\b\b\b\b\b "); - - printf("- VERIFIED \n"); - return 0; -} - - -void usage(const char *name) -{ - printf("%s Ver: %d.%d.%d\n",name,VER_MAJOR,VER_MINOR,VER_RELEASE); - printf("usage: %s [-rwv] [-V] [file]\n", name); - printf(" -r | --read read flash and save into file\n" - " -w | --write write file into flash\n" - " -v | --verify verify flash against file\n" - " -E | --erase erase LinuxBIOS area (0x10000-0xfffff)\n" - " -V | --verbose more verbose output\n" - " -n | --noop Noop mode. Do the motions but no io\n" - " -h | --help This message\n" - " --no-verify skip the autoverify on write\n" - " -P | --nobrick: Partial mode. Writes start @ 64Kib\n" - " -I | --id print out part JDEC ID values\n" - " -f | --force-id <id> Force a specific ID\n" - "\n\n"); - exit(1); -} - -int main(int argc, char *argv[]) -{ - unsigned long size; - unsigned long start_addr=LINUXBIOS_START; - FILE *image; - int opt; - int option_index = 0; - int read_it = 0, - write_it = 0, - erase_it = 0, - verify_it = 0, - show_id =0; - int auto_verify = 1; - int force_id = 0; - int brick_mode = 1; - int ret = 0; - int i=0; - int forced_id=0; - unsigned char buf[ROM_SIZE]; - unsigned char* buf_start=NULL; - - struct flashchip flash; - - static struct option long_options[]= { - { "read", 0, 0, 'r' }, - { "write", 0, 0, 'w' }, - { "erase", 0, 0, 'E' }, - { "verify", 0, 0, 'v' }, - { "iobase", 1, 0, 'i' }, - { "verbose", 0, 0, 'V' }, - { "help", 0, 0, 'h' }, - { "brick", 0, 0, 'B' }, - { "nobrick", 0, 0, 'P' }, - { "noop", 0, 0, 'n' }, - { "no-verify", 0, 0, 'a' }, - { "id", 0, 0, 'I' }, - { "force-id", 1, 0, 'f' }, - { 0, 0, 0, 0 } - }; - - char *filename = NULL; - - setbuf(stdout, NULL); - while ((opt = getopt_long(argc, argv, "rwvVEnIhPi:f:", long_options, - &option_index)) != EOF) { - switch (opt) { - case 'r': - read_it = 1; - break; - case 'w': - write_it = 1; - break; - case 'v': - verify_it = 1; - break; - case 'V': - verbose++; - break; - case 'E': - erase_it = 1; - break; - case 'i': - errno = 0; - iobase = (unsigned short) strtol(optarg,0,0); - if (errno || (iobase == 0)) { - printf("Invalid IO base\n"); - exit(1); - } - break; - case 'B': - brick_mode = 1; - break; - case 'P': - brick_mode = 0; - break; - case 'n': - noop = 1; - break; - case 'a': - auto_verify = 0; - break; - case 'I': - show_id = 1; - break; - - case 'f': - force_id = 1; - errno = 0; - forced_id = (int) strtol(optarg,0,0); - if (errno || (forced_id == 0)) { - printf("Invalid Mfg ID\n"); - exit(1); - } - break; - - case 'h': - default: - usage(argv[0]); - break; - } - } - - if (argc > 1) { - /* Yes, print them. */ - int i; - printf_debug ("The arguments are:\n"); - for (i = 1; i < argc; ++i) - printf_debug ("%s\n", argv[i]); - } - - if (!noop) { - if (iopl(3) < 0){ - perror("iop(3)"); - exit(1); - } - } - - if (iobase != IOBASE_DEFAULT) { - printf("Useing IO base of 0x%x\n",(unsigned int)iobase); - } - - if (read_it && write_it) { - printf("-r and -w are mutually exclusive\n"); - usage(argv[0]); - } - - if (optind < argc) - filename = argv[optind++]; - - if (!erase_it && !write_it && !read_it && !verify_it && !show_id) { - printf("No command specified so no operations performed\n"); - printf("Use -h for details\n"); - exit(2); - } - - printf("Calibrating delay loop... "); - myusec_calibrate_delay(); - printf("ok\n"); - - enable_flash_cmd(); - /* - * This is required prior to _all_ commands. Otherwise the kbc can steal your data - */ - put_kbc_in_reset(); - - read_jdec_id(&flash); - - if (show_id) { - printf("Manufacture ID = 0x%x\n",flash.manufacture_id); - printf("Model Type = 0x%x\n",flash.model_type); - printf("Model ID = 0x%x\n",flash.model_id); - } - - if (force_id) { - flash.manufacture_id = forced_id; - } - - switch (flash.manufacture_id) { - - case SST: -// flash.write_page = write_flash_page_sst; - printf("SST part found\n"); - break; - - case WINBOND: - flash.write_page = write_flash_page; - printf("Windbond part found\n"); - break; - case SPANSION: - flash.write_page = write_flash_page; - printf("Spansion part found\n"); - break; - - default: - printf("Unable to determine flash type\n"); - printf("use the -f option to force\n"); - exit(1); - } - - size = ROM_SIZE; - start_addr = 0; - buf_start = buf; - - for (i=0;i<size;i++) { - buf[i] = 0xff; - } - - if (brick_mode != 1) { - // Normal image - // Skip the 1st 64k of the part and the - // file we loaded - size -= EC_CODE_SIZE; - start_addr = LINUXBIOS_START; - buf_start+= EC_CODE_SIZE; - - printf("Partial modei. Skipping first 64Kib\n"); - } - else { - printf("Brick mode. Will operate on the first 64Kib\n"); - } - - if (erase_it) { - put_kbc_in_reset(); - disable_flash_write_protect(); - erase_flash(brick_mode); - enable_flash_write_protect(); - exit(0); - } else if (read_it) { - if ((image = fopen(filename, "w")) == NULL) { - perror(filename); - exit(1); - } - - put_kbc_in_reset(); - - // Reading allways read the entire part - read_flash(buf,0,ROM_SIZE); - - fwrite(buf, sizeof(char),ROM_SIZE, image); - fclose(image); - printf("done\n"); - - } else { - if ((image = fopen(filename, "r")) == NULL) { - perror(filename); - exit(1); - } - printf("Loading 0x%x bytes from %s\r\n",ROM_SIZE,filename); - fread(buf, sizeof(char), ROM_SIZE, image); - fclose(image); - } - - if (write_it) { - put_kbc_in_reset(); - disable_flash_write_protect(); - erase_flash(brick_mode); - write_flash(buf_start,start_addr, size); - enable_flash_write_protect(); - if (auto_verify) { - ret |= verify_flash(buf_start,start_addr,size); - } - } - - if (verify_it) { - put_kbc_in_reset(); - ret |= verify_flash(buf_start,start_addr,size); - } - - printf("IMPORTANT! The kbc has been left in reset. You keyboard and mouse WILL NOT WORK until you POWER CYCLE.\n"); - printf("A warm reboot is NOT good enough.\n"); - return ret; -} - Deleted: buildrom-devel/packages/olpcflash/olpcflash.mk =================================================================== --- buildrom-devel/packages/olpcflash/olpcflash.mk 2007-10-18 00:02:58 UTC (rev 43) +++ buildrom-devel/packages/olpcflash/olpcflash.mk 2007-10-18 00:09:03 UTC (rev 44) @@ -1,43 +0,0 @@ -OLPCFLASH_DIR=$(BUILD_DIR)/olpcflash -OLPCFLASH_SRC_DIR=$(OLPCFLASH_DIR)/olpcflash -OLPCFLASH_STAMP_DIR=$(OLPCFLASH_DIR)/stamps -OLPCFLASH_LOG_DIR=$(OLPCFLASH_DIR)/logs - -ifeq ($(CONFIG_VERBOSE),y) -OLPCFLASH_BUILD_LOG=/dev/stdout -OLPCFLASH_INSTALL_LOG=/dev/stdout -else -OLPCFLASH_BUILD_LOG=$(OLPCFLASH_LOG_DIR)/build.log -OLPCFLASH_INSTALL_LOG=$(OLPCFLASH_LOG_DIR)/install.log -endif - -$(OLPCFLASH_SRC_DIR)/olpcflash.c: $(PACKAGE_DIR)/olpcflash/Makefile $(PACKAGE_DIR)/olpcflash/olpcflash.c - @ mkdir -p $(OLPCFLASH_SRC_DIR) - @ cp $(PACKAGE_DIR)/olpcflash/Makefile $(OLPCFLASH_SRC_DIR) - @ cp $(PACKAGE_DIR)/olpcflash/olpcflash.c $(OLPCFLASH_SRC_DIR) - -$(OLPCFLASH_SRC_DIR)/olpcflash: $(OLPCFLASH_SRC_DIR)/olpcflash.c - @ echo "Building olpcflash..." - @ $(MAKE) -C $(OLPCFLASH_SRC_DIR) > $(OLPCFLASH_BUILD_LOG) 2>&1 - -$(INITRD_DIR)/bin/olpcflash: $(OLPCFLASH_SRC_DIR)/olpcflash - @ install -d $(INITRD_DIR)/bin - @ install -m 0755 $(OLPCFLASH_SRC_DIR)/olpcflash $@ - @ $(STRIP) $(INITRD_DIR)/bin/olpcflash - -$(OLPCFLASH_STAMP_DIR) $(OLPCFLASH_LOG_DIR): - @ mkdir -p $@ - -olpcflash: $(OLPCFLASH_STAMP_DIR) $(OLPCFLASH_LOG_DIR) $(INITRD_DIR)/bin/olpcflash - -olpcflash-clean: - @ echo "Cleaning olpcflash..." - @ $(MAKE) -C $(OLPCFLASH_SRC_DIR) clean > /dev/null 2>&1 - -olpcflash-distclean: - @ rm -rf $(OLPCFLASH_DIR)/* - -olpcflash-bom: - @ echo "Package: olpcflash" - @ echo "Source: (local) buildrom/packages/olpcflash/olpcflash.c" - @ echo ""

1 0

[LinuxBIOS] r43 - in buildrom-devel/packages: bin nanox/conf
by svn＠openbios.org 18 Oct '07

18 Oct '07

Author: jcrouse Date: 2007-10-18 02:02:58 +0200 (Thu, 18 Oct 2007) New Revision: 43 Removed: buildrom-devel/packages/bin/README buildrom-devel/packages/bin/README.md5sums buildrom-devel/packages/nanox/conf/defconfig Log: [BUILDROM] Clean up some files that are no longer needed or never used Remove files that snuck in there by mistake or are no longer needed. Signed-off-by: Jordan Crouse <jordan.crouse(a)amd.com> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Deleted: buildrom-devel/packages/bin/README =================================================================== --- buildrom-devel/packages/bin/README 2007-09-26 22:15:06 UTC (rev 42) +++ buildrom-devel/packages/bin/README 2007-10-18 00:02:58 UTC (rev 43) @@ -1,4 +0,0 @@ -This directory contains the binary bits that make up various parts of the -ROM: - -olpc_vsa.64k.bin - VSA code for the ROM. Stored from 32k to 64k in the ROM. Deleted: buildrom-devel/packages/bin/README.md5sums =================================================================== --- buildrom-devel/packages/bin/README.md5sums 2007-09-26 22:15:06 UTC (rev 42) +++ buildrom-devel/packages/bin/README.md5sums 2007-10-18 00:02:58 UTC (rev 43) @@ -1 +0,0 @@ -fdf7a6ed9f3d27b901b87e30dce5a14d olpc_vsa.64k.bin Deleted: buildrom-devel/packages/nanox/conf/defconfig =================================================================== --- buildrom-devel/packages/nanox/conf/defconfig 2007-09-26 22:15:06 UTC (rev 42) +++ buildrom-devel/packages/nanox/conf/defconfig 2007-10-18 00:02:58 UTC (rev 43) @@ -1,386 +0,0 @@ -#################################################################### -# Microwindows and Nano-X configuration file -# -# This package can be configured to run on Linux (MIPS, ARM, POWERPC or x86) -# UNIX, ELKS, DJGPP, or RTEMS. -# On Linux, we've got drivers for Linux 2.x framebuffers, X11, or, -# svgalib for VGA hardware. -# In addition, a gpm or direct serial mouse driver can be configured. -# On ELKS, the bios screen driver and serial mouse driver are always used. -# -# Either Microwindows and/or Nano-X can be built. -# Microwindows and Nano-X have several demos. -# -# For MSDOS makes, see mcmwin.mak and mcnanox.mak -#################################################################### - -#################################################################### -# -# build target platform -# -# Valid ARCH values are: -# -# LINUX-NATIVE -# LINUX-TCC -# LINUX-ARM -# LINUX-MIPS -# LINUX-POWERPC (BIGENDIAN=Y) -# LINUX-SPARC (BIGENDIAN=Y) -# LINUX-SH -# FREEBSD-X86 -# SOLARIS (BIGENDIAN=Y) -# TRIMEDIA -# RTEMS -# DJGPP -# ELKS -# -# note: ELKS can't build client/server nano-X, nor widget lib -# -#################################################################### -ARCH = LINUX-NATIVE -BIGENDIAN = N -NATIVETOOLSPREFIX = -ARMTOOLSPREFIX = arm-linux- -MIPSTOOLSPREFIX = mipsel-linux- -POWERPCTOOLSPREFIX = powerpc-linux- -SHTOOLSPREFIX = sh-linux-gnu -RTEMSTOOLSPREFIX = i386-rtemself- - -#################################################################### -# -# Compiling options -# -#################################################################### -OPTIMIZE = Y -DEBUG = N -VERBOSE = Y -THREADSAFE = N - -#################################################################### -# -# Libraries to build: microwin, nano-X, nanowidget, object frameworks -# -#################################################################### -MICROWIN = N -NANOX = Y -SHAREDLIBS = N -OBJFRAMEWORK = N - - -#################################################################### -# -# Demos to build -# -#################################################################### -MICROWINDEMO = N -NANOXDEMO = N - -#################################################################### -# -# Applications to build -# -#################################################################### -NANOWM = N - -#################################################################### -# -# The pixeltype of the native hardware or underlying graphics library. -# This definition defines the PIXELVAL to be 32, 16 or 8 bits wide. -# If using Linux framebuffer, set to MWPF_TRUECOLOR0888, and use fbset. -# It also enables GdArea/GrArea for this particular pixel packing format. -# -# define MWPF_PALETTE /* pixel is packed 8 bits 1, 4 or 8 pal index*/ -# define MWPF_TRUECOLOR8888 /* pixel is packed 32 bits 8/8/8/8 truecolor w/alpha*/ -# define MWPF_TRUECOLOR0888 /* pixel is packed 32 bits 8/8/8 truecolor*/ -# define MWPF_TRUECOLOR888 /* pixel is packed 24 bits 8/8/8 truecolor*/ -# define MWPF_TRUECOLOR565 /* pixel is packed 16 bits 5/6/5 truecolor*/ -# define MWPF_TRUECOLOR555 /* pixel is packed 16 bits 5/5/5 truecolor*/ -# define MWPF_TRUECOLOR332 /* pixel is packed 8 bits 3/3/2 truecolor*/ -# -#################################################################### -#SCREEN_PIXTYPE = MWPF_TRUECOLOR0888 -SCREEN_PIXTYPE = MWPF_TRUECOLOR565 - -#################################################################### -# -# NanoX: Put Y to the following line to link the nano-X application -# with the server. This is required for ELKS, if no network is present, -# or for speed or debugging. This affects the nano-X server only. -# -#################################################################### -LINK_APP_INTO_SERVER = Y - -#################################################################### -# Shared memory support for Nano-X client/server protocol speedup -#################################################################### -HAVE_SHAREDMEM_SUPPORT = N - -#################################################################### -# -# File I/O support -# Supporting either below drags in libc stdio, which may not be wanted -# -#################################################################### -HAVE_FILEIO = Y - -#################################################################### -# BMP, GIF reading support -#################################################################### -HAVE_BMP_SUPPORT = N -HAVE_GIF_SUPPORT = N -HAVE_PNM_SUPPORT = Y -HAVE_XPM_SUPPORT = N - -#################################################################### -# JPEG support through libjpeg, see README.txt in contrib/jpeg -#################################################################### -HAVE_JPEG_SUPPORT = N -INCJPEG = . -LIBJPEG = /usr/lib/libjpeg.a - -#################################################################### -# PNG support via libpng and libz -#################################################################### -HAVE_PNG_SUPPORT = N -INCPNG = . -LIBPNG = /usr/lib/libpng.a -LIBZ = /usr/lib/libz.a - -#################################################################### -# TIFF support through libtiff -#################################################################### -HAVE_TIFF_SUPPORT = N -INCTIFF = . -LIBTIFF = /usr/lib/libtiff.a - -#################################################################### -# native .fnt loadable font support -#################################################################### -HAVE_FNT_SUPPORT = N -HAVE_FNTGZ_SUPPORT = N -FNT_FONT_DIR = "fonts/bdf" - -#################################################################### -# T1 adobe type1 font support thru t1lib -#################################################################### -HAVE_T1LIB_SUPPORT = N -INCT1LIB = . -LIBT1LIB = /usr/local/lib/libt1.a - -#################################################################### -# TrueType font support thru FreeType 1.x -#################################################################### -HAVE_FREETYPE_SUPPORT = N -INCFTLIB = /usr/include/freetype1 -LIBFTLIB = /usr/lib/libttf.so -FREETYPE_FONT_DIR = "fonts/truetype" - -#################################################################### -# Support for many kinds of font thru FreeType 2.x -# Must also set FREETYPE_FONT_DIR in the Freetype 1.x section -#################################################################### -HAVE_FREETYPE_2_SUPPORT = N -INCFT2LIB = . -LIBFT2LIB = /usr/lib/libfreetype.a - -#################################################################### -# PCF font support -# Selecting HAVE_PCFGZ_SUPPORT will allow you to directly read -# .pcf.gz files, but it will add libz to the size of the server -#################################################################### -HAVE_PCF_SUPPORT = N -HAVE_PCFGZ_SUPPORT = N -PCF_FONT_DIR = "fonts/pcf" - -#################################################################### -# Chinese Han Zi Ku loadable font support -#################################################################### -HAVE_HZK_SUPPORT = N -HZK_FONT_DIR = "fonts/chinese" - -#################################################################### -# Chinese BIG5 compiled in font support (big5font.c) -#################################################################### -HAVE_BIG5_SUPPORT = N - -#################################################################### -# Chinese GB2312 compiled in font support (gb2312font.c) -#################################################################### -HAVE_GB2312_SUPPORT = N - -#################################################################### -# Japanese JISX0213 compiled in font support (jisx0213-12x12.c) -#################################################################### -HAVE_JISX0213_SUPPORT = N - -#################################################################### -# Korean HANGUL font support (jo16x16.c) -#################################################################### -HAVE_KSC5601_SUPPORT = N - -#################################################################### -# Japanese EUC-JP support using loadable MGL font -#################################################################### -HAVE_EUCJP_SUPPORT = N -EUCJP_FONT_DIR = "fonts/japanese" - -#################################################################### -# Generate screen driver interface only with no fonts or clipping -#################################################################### -NOFONTSORCLIPPING = N - -#################################################################### -# -# Window move algorithms for Microwindows -# Change for tradeoff between cpu speed and looks -# ERASEMOVE repaints only backgrounds while window dragging, quicker. -# Otherwise an XOR redraw is used for window moves only after button up, -# quickest (should set for ELKS) -# UPDATEREGIONS paints in update clipping region only for better look and feel -# -#################################################################### -ERASEMOVE = Y -UPDATEREGIONS = Y - -#################################################################### -# -# Link with Gray Palette (valid only for 4bpp modes) -# -#################################################################### -GRAYPALETTE = N - -#################################################################### -# -# If the platform is running UNIX, Linux or RTEMS... -# -#################################################################### -ifneq ($(ARCH), ELKS) - -# X Window screen, mouse and kbd drivers -X11 = N - -ifeq ($(X11), Y) -# startup screen width, height, (depth for palette mode only) -SCREEN_WIDTH = 800 -SCREEN_HEIGHT = 600 -SCREEN_DEPTH = 4 - -# You may want to turn this on for XFree86 4.x or if your backing store -# isn't functioning properly -USE_EXPOSURE = Y - -else - -# framebuffer screen driver (linear and/or vga 4 planes) -# set VTSWITCH to include virtual terminal switch code -# set FBREVERSE to reverse bit orders in 1,2,4 bpp -# set FBVGA=N for all systems without VGA hardware (for MIPS must=N) -FRAMEBUFFER = Y -FBVGA = N -VTSWITCH = N -FBREVERSE = N - -# set HAVETEXTMODE=Y for systems that can switch between text & graphics. -# On a graphics-only embedded system, such as Osprey and Embedded -# Planet boards, set HAVETEXTMODE=N -HAVETEXTMODE = Y - -# svgalib screen driver -VGALIB = N - -# direct VGA hardware access screen driver -HWVGA = N - -#################################################################### -# Mouse drivers -# GPMMOUSE gpm mouse -# SERMOUSE serial Microsoft, PC, Logitech, PS/2 mice (/dev/psaux) -# SUNMOUSE Sun Workstation mouse (/dev/sunmouse) -# NOMOUSE no mouse driver -# -# Touchscreen drivers -# IPAQMOUSE Compaq iPAQ, Intel Assabet (/dev/h3600_tsraw) -# ZAURUSMOUSE Sharp Zaurus (/dev/sharp_ts) -# TUXMOUSE TuxScreen (/dev/ucb1x00-ts) -# ADSMOUSE Applied Data Systems GC+ (/dev/ts) -# ADS7846MOUSE ADS7846 chip, PSI OMAP Innovator (/dev/innnovator_ts) -# EPMOUSE Embedded Planet (/dev/tpanel) -# VHMOUSE Vtech Helio (/dev/tpanel) -# MTMOUSE MicroTouch serial (/dev/ttyS1) -# PSIONMOUSE Psion 5 (/dev/touch_psion) -# YOPYMOUSE Yopy (/dev/yopy-ts) -# HARRIERMOUSE NEC Harrier (/dev/tpanel) -#################################################################### -GPMMOUSE = N -SERMOUSE = N -SUNMOUSE = N -NOMOUSE = Y -IPAQMOUSE = N -ZAURUSMOUSE = N -TUXMOUSE = N -ADSMOUSE = N -ADS7846MOUSE = N -EPMOUSE = N -VHMOUSE = N -MTMOUSE = N -PSIONMOUSE = N -YOPYMOUSE = N -HARRIERMOUSE = N -LIRCMOUSE = N - -# keyboard or null kbd driver -TTYKBD = Y -SCANKBD = N -PIPEKBD = N -IPAQKBD = N -LIRCKBD = N -NOKBD = N - -endif - -# Secondary keyboard drivers. -# You may have a normal keyboard driver in addition to these -# drivers, e.g. for both normal keyboard and IR input. -LIRCKBD2 = N - -#################################################################### -# Screen driver specific configuration -# SA1100_LCD_LTLEND 4bpp driver with arm SA1100 LCD controller -# INVERT4BPP 4bpp inverted pixel driver for VTech Helio -#################################################################### -SA1100_LCD_LTLEND = N -INVERT4BPP = N - -#################################################################### -# -# If the platform is a RTEMS box .... -# -#################################################################### -ifeq ($(ARCH), RTEMS) - -# Location & BSP information of the RTEMS build -RTEMS_BUILD = /tools/build-i386-elf-rtems -RTEMS_BSP = pc386 -LINK_APP_INTO_SERVER = Y - -endif - -endif - -#################################################################### -# -# If the platform is an ELKS box ... -# -#################################################################### -ifeq ($(ARCH), ELKS) - -# Higher speed asm driver, c driver of hercules screen driver -ASMVGADRIVER = Y -CVGADRIVER = N -HERCDRIVER = N -DBGDRIVER = N - -# Mouse support -SERMOUSE = Y - -endif

1 0

[LinuxBIOS] r2873 - trunk/util/flashrom
by svn＠openbios.org 18 Oct '07

18 Oct '07

Author: uwe Date: 2007-10-18 01:55:15 +0200 (Thu, 18 Oct 2007) New Revision: 2873 Modified: trunk/util/flashrom/82802ab.c trunk/util/flashrom/board_enable.c trunk/util/flashrom/chipset_enable.c trunk/util/flashrom/flashrom.c trunk/util/flashrom/jedec.c trunk/util/flashrom/layout.c trunk/util/flashrom/lbtable.c trunk/util/flashrom/m29f400bt.c trunk/util/flashrom/msys_doc.c trunk/util/flashrom/mx29f002.c trunk/util/flashrom/pm49fl004.c trunk/util/flashrom/sharplhf00l04.c trunk/util/flashrom/spi.c trunk/util/flashrom/sst28sf040.c trunk/util/flashrom/sst39sf020.c trunk/util/flashrom/sst49lf040.c trunk/util/flashrom/sst49lfxxxc.c trunk/util/flashrom/sst_fwhub.c trunk/util/flashrom/udelay.c trunk/util/flashrom/w49f002u.c Log: Some cosmetic cleanups in the flashrom code and output. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/util/flashrom/82802ab.c =================================================================== --- trunk/util/flashrom/82802ab.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/82802ab.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -172,7 +172,7 @@ printf("ERASE FAILED\n"); return -1; } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); write_page_82802ab(bios, buf + i * page_size, Modified: trunk/util/flashrom/board_enable.c =================================================================== --- trunk/util/flashrom/board_enable.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/board_enable.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -161,7 +161,7 @@ dev = pci_dev_find(0x1106, 0x3177); /* VT8235 ISA bridge */ if (!dev) { - fprintf(stderr, "\nERROR: VT8235 ISA Bridge not found.\n"); + fprintf(stderr, "\nERROR: VT8235 ISA bridge not found.\n"); return -1; } @@ -355,9 +355,9 @@ struct board_pciid_enable board_pciid_enables[] = { {0x10de, 0x0360, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - "gigabyte", "m57sli", "GIGABYTE GA-M57SLI", it87xx_probe_spi_flash}, + "gigabyte", "m57sli", "GIGABYTE GA-M57SLI-S4", it87xx_probe_spi_flash}, {0x10de, 0x03e0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - "gigabyte", "m61ps3", "GIGABYTE GA-M61P-S3", it87xx_probe_spi_flash}, + "gigabyte", "m61p", "GIGABYTE GA-M61P-S3", it87xx_probe_spi_flash}, {0x1022, 0x7468, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, "iwill", "dk8_htx", "IWILL DK8-HTX", w83627hf_gpio24_raise_2e}, {0x10de, 0x005e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -456,12 +456,12 @@ board = board_match_pci_card_ids(); if (board) { - printf("Found board \"%s\": Enabling flash write... ", + printf("Found board \"%s\": enabling flash write... ", board->name); ret = board->enable(board->name); if (ret) - printf("Failed!\n"); + printf("FAILED!\n"); else printf("OK.\n"); } Modified: trunk/util/flashrom/chipset_enable.c =================================================================== --- trunk/util/flashrom/chipset_enable.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/chipset_enable.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -499,12 +499,12 @@ } if (dev) { - printf("Found chipset \"%s\": Enabling flash write... ", + printf("Found chipset \"%s\", enabling flash write... ", enables[i].name); ret = enables[i].doit(dev, enables[i].name); if (ret) - printf("Failed!\n"); + printf("FAILED!\n"); else printf("OK.\n"); } Modified: trunk/util/flashrom/flashrom.c =================================================================== --- trunk/util/flashrom/flashrom.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/flashrom.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -143,7 +143,7 @@ flash->virtual_memory = bios; if (flash->probe(flash) == 1) { - printf("%s found at physical address: 0x%lx\n", + printf("%s found at physical address 0x%lx.\n", flash->name, flash_baseaddr); return flash; } @@ -161,7 +161,7 @@ int total_size = flash->total_size * 1024; volatile uint8_t *bios = flash->virtual_memory; - printf("Verifying flash "); + printf("Verifying flash... "); if (verbose) printf("address: 0x00000000\b\b\b\b\b\b\b\b\b\b"); @@ -174,7 +174,7 @@ if (verbose) { printf("0x%08x ", idx); } - printf("- FAILED\n"); + printf("FAILED!\n"); return 1; } @@ -184,7 +184,7 @@ if (verbose) printf("\b\b\b\b\b\b\b\b\b\b "); - printf("- VERIFIED \n"); + printf("VERIFIED. \n"); return 0; } @@ -369,7 +369,7 @@ exit(1); } - printf("Flash part is %s (%d KB)\n", flash->name, flash->total_size); + printf("Flash part is %s (%d KB).\n", flash->name, flash->total_size); if (!(read_it | write_it | verify_it | erase_it)) { printf("No operations were specified.\n"); Modified: trunk/util/flashrom/jedec.c =================================================================== --- trunk/util/flashrom/jedec.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/jedec.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -281,12 +281,12 @@ // dumb check if erase was successful. for (i = 0; i < total_size; i++) { if (bios[i] != (uint8_t) 0xff) { - printf("ERASE FAILED @%d, val %02x\n", i, bios[i]); + printf("ERASE FAILED @%d, val %02x!\n", i, bios[i]); return -1; } } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); write_page_write_jedec(bios, buf + i * page_size, Modified: trunk/util/flashrom/layout.c =================================================================== --- trunk/util/flashrom/layout.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/layout.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -47,14 +47,14 @@ } printf_debug("LinuxBIOS last image size " - "(not rom size) is %d bytes.\n", *walk); + "(not ROM size) is %d bytes.\n", *walk); walk--; mainboard_part = strdup((const char *)(bios + size - *walk)); walk--; mainboard_vendor = strdup((const char *)(bios + size - *walk)); - printf_debug("MANUFACTURER: %s\n", mainboard_vendor); - printf_debug("MAINBOARD ID: %s\n", mainboard_part); + printf_debug("Manufacturer: %s\n", mainboard_vendor); + printf_debug("Mainboard ID: %s\n", mainboard_part); /* * If lb_vendor is not set, the linuxbios table was @@ -63,7 +63,7 @@ if (!lb_vendor || !lb_part) { printf("Note: If the following flash access fails, " - "you might need to specify -m <vendor>:<mainboard>\n"); + "you might need to specify -m <vendor>:<mainboard>.\n"); return 0; } @@ -104,7 +104,7 @@ romlayout = fopen(name, "r"); if (!romlayout) { - fprintf(stderr, "ERROR: Could not open rom layout (%s).\n", + fprintf(stderr, "ERROR: Could not open ROM layout (%s).\n", name); return -1; } @@ -154,8 +154,7 @@ return i; } } - printf("not found.\n"); - // Not found. Error. + printf("not found.\n"); // Not found. Error. return -1; } Modified: trunk/util/flashrom/lbtable.c =================================================================== --- trunk/util/flashrom/lbtable.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/lbtable.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -105,26 +105,26 @@ printf_debug("Found canidate at: %08lx-%08lx\n", addr, addr + head->table_bytes); if (head->header_bytes != sizeof(*head)) { - fprintf(stderr, "Header bytes of %d are incorrect\n", + fprintf(stderr, "Header bytes of %d are incorrect.\n", head->header_bytes); continue; } if (count_lb_records(head) != head->table_entries) { - fprintf(stderr, "bad record count: %d\n", + fprintf(stderr, "Bad record count: %d.\n", head->table_entries); continue; } if (compute_checksum((uint8_t *) head, sizeof(*head)) != 0) { - fprintf(stderr, "bad header checksum\n"); + fprintf(stderr, "Bad header checksum.\n"); continue; } if (compute_checksum(recs, head->table_bytes) != head->table_checksum) { - fprintf(stderr, "bad table checksum: %04x\n", + fprintf(stderr, "Bad table checksum: %04x.\n", head->table_checksum); continue; } - fprintf(stdout, "Found LinuxBIOS table at: %08lx\n", addr); + fprintf(stdout, "Found LinuxBIOS table at 0x%08lx.\n", addr); return head; }; @@ -140,7 +140,7 @@ rec = (struct lb_mainboard *)ptr; max_size = rec->size - sizeof(*rec); - printf("vendor id: %.*s part id: %.*s\n", + printf("Vendor ID: %.*s, part ID: %.*s\n", max_size - rec->vendor_idx, rec->strings + rec->vendor_idx, max_size - rec->part_number_idx, @@ -151,7 +151,7 @@ rec->strings + rec->part_number_idx); if (lb_part) { - printf("overwritten by command line, vendor id: %s part id: %s\n", lb_vendor, lb_part); + printf("Overwritten by command line, vendor ID: %s, part ID: %s.\n", lb_vendor, lb_part); } else { lb_part = strdup(part); lb_vendor = strdup(vendor); @@ -201,7 +201,7 @@ if (lb_table) { unsigned long addr; addr = ((char *)lb_table) - ((char *)low_1MB); - printf_debug("lb_table found at address %p\n", lb_table); + printf_debug("LinuxBIOS table found at %p.\n", lb_table); rec = (struct lb_record *)(((char *)lb_table) + lb_table->header_bytes); last = (struct lb_record *)(((char *)rec) + lb_table->table_bytes); printf_debug("LinuxBIOS header(%d) checksum: %04x table(%d) checksum: %04x entries: %d\n", Modified: trunk/util/flashrom/m29f400bt.c =================================================================== --- trunk/util/flashrom/m29f400bt.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/m29f400bt.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -124,7 +124,7 @@ volatile uint8_t *bios = flash->virtual_memory; //erase_m29f400bt (flash); - printf("Programming Page:\n "); + printf("Programming page:\n "); /********************************* *Pages for M29F400BT: * 16 0x7c000 0x7ffff TOP @@ -175,7 +175,7 @@ { volatile uint8_t *bios = flash->virtual_memory; - printf("Programming Page:\n "); + printf("Programming page:\n "); /********************************* *Pages for M29F400BT: * 16 0x7c000 0x7ffff TOP Modified: trunk/util/flashrom/msys_doc.c =================================================================== --- trunk/util/flashrom/msys_doc.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/msys_doc.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -169,10 +169,10 @@ return (1); erase_md2802(flash); if (*bios != (uint8_t) 0xff) { - printf("ERASE FAILED\n"); + printf("ERASE FAILED!\n"); return -1; } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); //write_page_md2802(bios, buf + i * page_size, bios + i * page_size, page_size); Modified: trunk/util/flashrom/mx29f002.c =================================================================== --- trunk/util/flashrom/mx29f002.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/mx29f002.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -88,7 +88,7 @@ erase_29f002(flash); //*bios = 0xF0; #if 1 - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size; i++) { /* write to the sector */ if ((i & 0xfff) == 0) Modified: trunk/util/flashrom/pm49fl004.c =================================================================== --- trunk/util/flashrom/pm49fl004.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/pm49fl004.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -30,7 +30,7 @@ int page_size = flash->page_size; volatile uint8_t *bios = flash->virtual_memory; - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { if ((i >= exclude_start_page) && (i < exclude_end_page)) continue; Modified: trunk/util/flashrom/sharplhf00l04.c =================================================================== --- trunk/util/flashrom/sharplhf00l04.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/sharplhf00l04.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -164,10 +164,10 @@ erase_lhf00l04(flash); if (*bios != 0xff) { - printf("ERASE FAILED\n"); + printf("ERASE FAILED!\n"); return -1; } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); write_page_lhf00l04(bios, buf + i * page_size, Modified: trunk/util/flashrom/spi.c =================================================================== --- trunk/util/flashrom/spi.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/spi.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -123,7 +123,7 @@ busy = inb(port) & 0x80; } while (busy); if (readcnt > 3) { - printf("%s called with unsupported readcnt %i\n", + printf("%s called with unsupported readcnt %i.\n", __FUNCTION__, readcnt); return 1; } @@ -153,7 +153,7 @@ writeenc = 0x3; break; default: - printf("%s called with unsupported writecnt %i\n", + printf("%s called with unsupported writecnt %i.\n", __FUNCTION__, writecnt); return 1; } @@ -184,7 +184,7 @@ if (generic_spi_command(JEDEC_RDID_OUTSIZE, JEDEC_RDID_INSIZE, cmd, readarr)) return 1; - printf("RDID returned %02x %02x %02x\n", readarr[0], readarr[1], readarr[2]); + printf("RDID returned %02x %02x %02x.\n", readarr[0], readarr[1], readarr[2]); return 0; } Modified: trunk/util/flashrom/sst28sf040.c =================================================================== --- trunk/util/flashrom/sst28sf040.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/sst28sf040.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -143,7 +143,7 @@ unprotect_28sf040(bios); - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* erase the page before programming */ erase_sector_28sf040(bios, i * page_size); Modified: trunk/util/flashrom/sst39sf020.c =================================================================== --- trunk/util/flashrom/sst39sf020.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/sst39sf020.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -46,7 +46,7 @@ erase_chip_jedec(flash); - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* write to the sector */ printf("%04d at address: 0x%08x", i, i * page_size); Modified: trunk/util/flashrom/sst49lf040.c =================================================================== --- trunk/util/flashrom/sst49lf040.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/sst49lf040.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -44,7 +44,7 @@ int page_size = flash->page_size; volatile uint8_t *bios = flash->virtual_memory; - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* erase the page before programming * Chip erase only works in parallel programming mode Modified: trunk/util/flashrom/sst49lfxxxc.c =================================================================== --- trunk/util/flashrom/sst49lfxxxc.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/sst49lfxxxc.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -170,7 +170,7 @@ volatile uint8_t *bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash->virtual_registers, total_size, 0); - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* erase the page before programming */ erase_sector_49lfxxxc(bios, i * page_size); Modified: trunk/util/flashrom/sst_fwhub.c =================================================================== --- trunk/util/flashrom/sst_fwhub.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/sst_fwhub.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -83,12 +83,12 @@ // dumb check if erase was successful. for (i = 0; i < total_size; i++) { if (bios[i] != 0xff) { - printf("ERASE FAILED\n"); + printf("ERASE FAILED!\n"); return -1; } } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); write_sector_jedec(bios, buf + i * page_size, Modified: trunk/util/flashrom/udelay.c =================================================================== --- trunk/util/flashrom/udelay.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/udelay.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -56,5 +56,5 @@ micro = count / timeusec; printf_debug("%ldM loops per second. ", (unsigned long)micro); - printf("ok\n"); + printf("OK.\n"); } Modified: trunk/util/flashrom/w49f002u.c =================================================================== --- trunk/util/flashrom/w49f002u.c 2007-10-17 23:43:59 UTC (rev 2872) +++ trunk/util/flashrom/w49f002u.c 2007-10-17 23:55:15 UTC (rev 2873) @@ -30,7 +30,7 @@ erase_chip_jedec(flash); - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* write to the sector */ printf("%04d at address: 0x%08x ", i, i * page_size);

1 0

[LinuxBIOS] [PATCH] superiotool: Drop --dump-readable option
by Uwe Hermann 18 Oct '07

18 Oct '07

See patch. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

2 2

[LinuxBIOS] r2872 - trunk/util/superiotool
by svn＠openbios.org 18 Oct '07

18 Oct '07

Author: uwe Date: 2007-10-18 01:43:59 +0200 (Thu, 18 Oct 2007) New Revision: 2872 Modified: trunk/util/superiotool/README trunk/util/superiotool/ali.c trunk/util/superiotool/fintek.c trunk/util/superiotool/ite.c trunk/util/superiotool/nsc.c trunk/util/superiotool/smsc.c trunk/util/superiotool/superiotool.8 trunk/util/superiotool/superiotool.c trunk/util/superiotool/superiotool.h trunk/util/superiotool/winbond.c Log: Drop support for the --human-readable option. It's not any more useful than the --dump option, it just means lots of additional work for no gain, IMO. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/util/superiotool/README =================================================================== --- trunk/util/superiotool/README 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/README 2007-10-17 23:43:59 UTC (rev 2872) @@ -33,7 +33,6 @@ $ superiotool [-d] [-D] [-V] [-v] [-h] -d | --dump Dump Super I/O registers - -D | --dump-readable Dump Super I/O registers in human-readable format -V | --verbose Verbose mode -v | --version Show the superiotool version -h | --help Show a short help text @@ -51,11 +50,7 @@ $ superiotool -d - - Detailed register dump in human-readable format: - $ superiotool -D - - Supported Super I/O Chips ------------------------- Modified: trunk/util/superiotool/ali.c =================================================================== --- trunk/util/superiotool/ali.c 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/ali.c 2007-10-17 23:43:59 UTC (rev 2872) @@ -92,7 +92,6 @@ chip_found = 1; dump_superio("ALi", reg_table, port, id); - dump_superio_readable(port); /* TODO */ exit_conf_mode_ali(port); } Modified: trunk/util/superiotool/fintek.c =================================================================== --- trunk/util/superiotool/fintek.c 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/fintek.c 2007-10-17 23:43:59 UTC (rev 2872) @@ -70,68 +70,6 @@ {EOT} }; -static void dump_readable_fintek(uint16_t port, uint16_t did) -{ - if (!dump_readable) - return; - - printf("Human-readable register dump:\n"); - - printf("Flash write is %s.\n", - regval(port, 0x28) & 0x80 ? "enabled" : "disabled"); - printf("Flash control is 0x%04x.\n", regval(port, 0x28)); - printf("27=%02x\n", regval(port, 0x27)); - printf("29=%02x\n", regval(port, 0x29)); - printf("2a=%02x\n", regval(port, 0x2a)); - printf("2b=%02x\n", regval(port, 0x2b)); - - /* Select UART 1. */ - regwrite(port, 0x07, 0x01); - printf("UART1 is %s\n", - regval(port, 0x30) & 1 ? "enabled" : "disabled"); - printf("UART1 base=%02x%02x, irq=%02x, mode=%s\n", regval(port, 0x60), - regval(port, 0x61), regval(port, 0x70) & 0x0f, - regval(port, 0xf0) & 0x10 ? "RS485" : "RS232"); - - /* Select UART 2. */ - regwrite(port, 0x07, 0x02); - printf("UART2 is %s\n", - regval(port, 0x30) & 1 ? "enabled" : "disabled"); - printf("UART2 base=%02x%02x, irq=%02x, mode=%s\n", regval(port, 0x60), - regval(port, 0x61), regval(port, 0x70) & 0x0f, - regval(port, 0xf0) & 0x10 ? "RS485" : "RS232"); - - /* Select parallel port. */ - regwrite(port, 0x07, 0x03); - printf("PARPORT is %s\n", - regval(port, 0x30) & 1 ? "enabled" : "disabled"); - printf("PARPORT base=%02x%02x, irq=%02x\n", regval(port, 0x60), - regval(port, 0x61), regval(port, 0x70) & 0x0f); - - /* Select HW monitor. */ - regwrite(port, 0x07, 0x04); - printf("HW monitor is %s\n", - regval(port, 0x30) & 1 ? "enabled" : "disabled"); - printf("HW monitor base=%02x%02x, irq=%02x\n", regval(port, 0x60), - regval(port, 0x61), regval(port, 0x70) & 0x0f); - - /* Select GPIO. */ - regwrite(port, 0x07, 0x05); - printf("GPIO is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled"); - printf - ("GPIO 70=%02x, e0=%02x, e1=%02x, e2=%02x, e3=%02x, e4=%02x, e5=%02x\n", - regval(port, 0x70), regval(port, 0xe0), regval(port, 0xe1), - regval(port, 0xe2), regval(port, 0xe3), regval(port, 0xe4), - regval(port, 0xe5)); - printf - ("GPIO e6=%02x, e7=%02x, e8=%02x, e9=%02x, f0=%02x, f1=%02x, f3=%02x, f4=%02x\n", - regval(port, 0xe6), regval(port, 0xe7), regval(port, 0xe8), - regval(port, 0xe9), regval(port, 0xf0), regval(port, 0xf1), - regval(port, 0xf3), regval(port, 0xf4)); - printf("GPIO f5=%02x, f6=%02x, f7=%02x, f8=%02x\n", regval(port, 0xf5), - regval(port, 0xf6), regval(port, 0xf7), regval(port, 0xf8)); -} - void probe_idregs_fintek(uint16_t port) { uint16_t vid, did; @@ -158,7 +96,6 @@ chip_found = 1; dump_superio("Fintek", reg_table, port, did); - dump_readable_fintek(port, did); exit_conf_mode_winbond_fintek_ite_8787(port); } Modified: trunk/util/superiotool/ite.c =================================================================== --- trunk/util/superiotool/ite.c 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/ite.c 2007-10-17 23:43:59 UTC (rev 2872) @@ -369,7 +369,6 @@ chip_found = 1; dump_superio("ITE", reg_table, port, id); - dump_superio_readable(port); /* TODO */ } void probe_idregs_ite(uint16_t port) Modified: trunk/util/superiotool/nsc.c =================================================================== --- trunk/util/superiotool/nsc.c 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/nsc.c 2007-10-17 23:43:59 UTC (rev 2872) @@ -135,42 +135,6 @@ {EOT} }; -static void dump_readable_pc8374l(uint16_t port) -{ - if (!dump_readable) - return; - - printf("Human-readable register dump:\n"); - - printf("Enables: 21=%02x, 22=%02x, 23=%02x, 24=%02x, 26=%02x\n", - regval(port, 0x21), regval(port, 0x22), regval(port, 0x23), - regval(port, 0x24), regval(port, 0x26)); - printf("SMBUS at %02x\n", regval(port, 0x2a)); - - /* Check COM1. This is all we care about at present. */ - printf("COM 1 is globally %s\n", - regval(port, 0x26) & 8 ? "disabled" : "enabled"); - - /* Select COM1. */ - regwrite(port, 0x07, 0x03); - printf("COM 1 is locally %s\n", - regval(port, 0x30) & 1 ? "enabled" : "disabled"); - printf - ("COM1 60=%02x, 61=%02x, 70=%02x, 71=%02x, 74=%02x, 75=%02x, f0=%02x\n", - regval(port, 0x60), regval(port, 0x61), regval(port, 0x70), - regval(port, 0x71), regval(port, 0x74), regval(port, 0x75), - regval(port, 0xf0)); - - /* Select GPIO. */ - regwrite(port, 0x07, 0x07); - printf("GPIO is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled"); - printf - ("GPIO 60=%02x, 61=%02x, 70=%02x, 71=%02x, 74=%02x, 75=%02x, f0=%02x\n", - regval(port, 0x60), regval(port, 0x61), regval(port, 0x70), - regval(port, 0x71), regval(port, 0x74), regval(port, 0x75), - regval(port, 0xf0)); -} - void probe_idregs_nsc(uint16_t port) { uint8_t id, rev; @@ -205,7 +169,5 @@ chip_found = 1; dump_superio("NSC", reg_table, port, id); - if (id == 0xf1) - dump_readable_pc8374l(port); } Modified: trunk/util/superiotool/smsc.c =================================================================== --- trunk/util/superiotool/smsc.c 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/smsc.c 2007-10-17 23:43:59 UTC (rev 2872) @@ -381,7 +381,6 @@ chip_found = 1; dump_superio((id == 0x77 ? "ASUS" : "SMSC"), reg_table, port, id); - dump_superio_readable(port); /* TODO */ exit_conf_mode_smsc(port); } Modified: trunk/util/superiotool/superiotool.8 =================================================================== --- trunk/util/superiotool/superiotool.8 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/superiotool.8 2007-10-17 23:43:59 UTC (rev 2872) @@ -2,7 +2,7 @@ .SH NAME superiotool \- Super I/O detection tool .SH SYNOPSIS -.B superiotool \fR[\fB\-dDVvh\fR] +.B superiotool \fR[\fB\-dVvh\fR] .SH DESCRIPTION .B superiotool is a GPL'd user-space utility which can @@ -72,17 +72,6 @@ detailed information about the .BR MM " fields." .TP -.B "\-D, \-\-dump-readable" -Dump Super I/O registers in human-readable format (if the Super I/O chip -is detected and -.B superiotool -supports the -.B "\-\-dump-readable" -option for this chip). -.sp -The output format of this option is different for every Super I/O, and only -very few Super I/Os currently support this option. -.TP .B "\-V, \-\-verbose" Enable verbose mode. This option can be used together with the .BR "\-d" " or " "\-D" " option (or both)." Modified: trunk/util/superiotool/superiotool.c =================================================================== --- trunk/util/superiotool/superiotool.c 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/superiotool.c 2007-10-17 23:43:59 UTC (rev 2872) @@ -23,7 +23,7 @@ #include "superiotool.h" /* Command line options. */ -int dump = 0, dump_readable = 0, verbose = 0; +int dump = 0, verbose = 0; /* Global flag which indicates whether a chip was detected at all. */ int chip_found = 0; @@ -151,13 +151,6 @@ } } -void dump_superio_readable(uint16_t port) -{ - /* TODO */ - if (dump_readable) - printf("No human-readable dump available for this Super I/O\n"); -} - void probing_for(const char *vendor, const char *info, uint16_t port) { if (!verbose) @@ -179,22 +172,18 @@ const static struct option long_options[] = { {"dump", no_argument, NULL, 'd'}, - {"dump-readable", no_argument, NULL, 'D'}, {"verbose", no_argument, NULL, 'V'}, {"version", no_argument, NULL, 'v'}, {"help", no_argument, NULL, 'h'}, {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "dDVvh", + while ((opt = getopt_long(argc, argv, "dVvh", long_options, &option_index)) != EOF) { switch (opt) { case 'd': dump = 1; break; - case 'D': - dump_readable = 1; - break; case 'V': verbose = 1; break; Modified: trunk/util/superiotool/superiotool.h =================================================================== --- trunk/util/superiotool/superiotool.h 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/superiotool.h 2007-10-17 23:43:59 UTC (rev 2872) @@ -29,9 +29,8 @@ #include <getopt.h> #include <sys/io.h> -#define USAGE "Usage: superiotool [-d] [-D] [-V] [-v] [-h]\n\n\ +#define USAGE "Usage: superiotool [-d] [-V] [-v] [-h]\n\n\ -d | --dump Dump Super I/O registers\n\ - -D | --dump-readable Dump Super I/O registers in human-readable format\n\ -V | --verbose Verbose mode\n\ -v | --version Show the superiotool version\n\ -h | --help Show a short help text\n\n\ @@ -55,7 +54,7 @@ #define MAXNUMPORTS (6 + 1) /* Maximum number of Super I/O ports */ /* Command line parameters. */ -extern int dump, dump_readable, verbose; +extern int dump, verbose; extern int chip_found; @@ -80,7 +79,6 @@ uint16_t id); void dump_superio(const char *name, const struct superio_registers reg_table[], uint16_t port, uint16_t id); -void dump_superio_readable(uint16_t port); void probing_for(const char *vendor, const char *info, uint16_t port); /* ali.c */ Modified: trunk/util/superiotool/winbond.c =================================================================== --- trunk/util/superiotool/winbond.c 2007-10-17 23:42:02 UTC (rev 2871) +++ trunk/util/superiotool/winbond.c 2007-10-17 23:43:59 UTC (rev 2872) @@ -428,7 +428,6 @@ /* TODO: Special notes in dump output for the MISC entries. */ dump_superio("Winbond", reg_table, port, id); - dump_superio_readable(port); /* TODO */ } void probe_idregs_winbond(uint16_t port)

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
49
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 October 2007