coreboot.git
16 years agoUse the preferred order of 'static const' instead of 'const static'.
Uwe Hermann [Wed, 31 Oct 2007 22:22:11 +0000 (22:22 +0000)]
Use the preferred order of 'static const' instead of 'const static'.
This is the common style in both Linux as well as in LinuxBIOS.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2922 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAs started in
Torsten Duwe [Wed, 31 Oct 2007 00:49:38 +0000 (00:49 +0000)]
As started in
http://www.linuxbios.org/pipermail/linuxbios/2007-October/025385.html ,
but change all apparantly related values that differ on my board with
legacy BIOS.

This makes both PCI cards appear, as well as the firewire device
TSB43AB23.
* PCI 01:07.0 appears fully functional
* PCI 01:08.0 (closer to the board edge) appears, but no interrupts
* PCI 01:0a.0 (FireWire) untested

Since none of these was even present without the patch I suggest to
apply it.

Signed-off-by: Torsten Duwe <duwe@lst.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Tested-by: Harald Gutmann <harald.gutmann@gmx.net>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2921 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd initial support for the Compaq Deskpro EN SFF P600.
Uwe Hermann [Wed, 31 Oct 2007 00:26:08 +0000 (00:26 +0000)]
Add initial support for the Compaq Deskpro EN SFF P600.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2920 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd initial support for the Biostar M6TBA.
Uwe Hermann [Wed, 31 Oct 2007 00:25:06 +0000 (00:25 +0000)]
Add initial support for the Biostar M6TBA.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2919 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd initial support for the AZZA PT-6IBD.
Uwe Hermann [Wed, 31 Oct 2007 00:23:57 +0000 (00:23 +0000)]
Add initial support for the AZZA PT-6IBD.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2918 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd initial support for the A-Trend ATC-6220.
Uwe Hermann [Wed, 31 Oct 2007 00:22:32 +0000 (00:22 +0000)]
Add initial support for the A-Trend ATC-6220.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2917 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd initial support for the GIGABYTE GA-6BXC.
Uwe Hermann [Wed, 31 Oct 2007 00:07:31 +0000 (00:07 +0000)]
Add initial support for the GIGABYTE GA-6BXC.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2916 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd initial support for the ASUS P3B-F.
Uwe Hermann [Wed, 31 Oct 2007 00:00:57 +0000 (00:00 +0000)]
Add initial support for the ASUS P3B-F.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2915 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd initial support for the ASUS P2B-F.
Uwe Hermann [Tue, 30 Oct 2007 23:59:47 +0000 (23:59 +0000)]
Add initial support for the ASUS P2B-F.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2914 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoVarious smaller fixes to make the ASUS P2B match the format
Uwe Hermann [Tue, 30 Oct 2007 23:57:59 +0000 (23:57 +0000)]
Various smaller fixes to make the ASUS P2B match the format
of all the other boards in this patch series.

Add missing PIRQ table to make most devices work.
Enable VGA support. Add flashrom flashing protection code.
Make CPU init actually work (result: massive speed-up).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2913 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoVarious fixes and improvements of the 82801xx code.
Joseph Smith [Tue, 30 Oct 2007 21:55:11 +0000 (21:55 +0000)]
Various fixes and improvements of the 82801xx code.

Signed-off-by: Joseph Smith <joe@smittys.pointclark.net>
Acked-by: Corey Osgood <corey.osgood@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2912 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years ago[LINUXBIOS] Add the CPU_OPT flag to facilitate passing flags into the build
Jordan Crouse [Tue, 30 Oct 2007 17:53:53 +0000 (17:53 +0000)]
[LINUXBIOS] Add the CPU_OPT flag to facilitate passing flags into the build

buildROM passes build flags through the CPU_OPT environment variable -
especially -fno-stack-protector for those of us lucky enough to have
Debian/Ubuntu.  This adds  to the cache_as_ram_auto.inc target
for the GA-2761GXDK so that the resulting cpu0.S is clean.

Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2911 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoSmall rename to make abuild happy (trivial).
Uwe Hermann [Tue, 30 Oct 2007 17:21:45 +0000 (17:21 +0000)]
Small rename to make abuild happy (trivial).

This is not yet enough to actually successfully build the board, but
now abuild at least _attempts_ to build it.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2910 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDrop empty directories (trivial).
Uwe Hermann [Tue, 30 Oct 2007 17:06:28 +0000 (17:06 +0000)]
Drop empty directories (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2909 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoRename the SiS761GX/SiS966 board to the correct name, GIGABYTE GA-2761GXDK.
Uwe Hermann [Tue, 30 Oct 2007 15:58:59 +0000 (15:58 +0000)]
Rename the SiS761GX/SiS966 board to the correct name, GIGABYTE GA-2761GXDK.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2908 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd support for the VIA VT8237R southbridge.
Rudolf Marek [Tue, 30 Oct 2007 03:09:39 +0000 (03:09 +0000)]
Add support for the VIA VT8237R southbridge.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: <corey.osgood@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2907 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agomove target directory to have the same name as the directory in the
Stefan Reinauer [Tue, 30 Oct 2007 02:24:49 +0000 (02:24 +0000)]
move target directory to have the same name as the directory in the
mainboard/ path. Also add a Config.lb for abuild. It's required for the
three images variant as abuild doesnt detect this automatically.
Trivial patch - it does not even fix the build yet. Patches welcome.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2906 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agofix the readwrite/readonly clashes for the pci_driver structs in the sis
Stefan Reinauer [Tue, 30 Oct 2007 02:17:49 +0000 (02:17 +0000)]
fix the readwrite/readonly clashes for the pci_driver structs in the sis
code. This is trivial, I did it for the other components before.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2905 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoK8 resource dump utility from Rudolf Marek
Rudolf Marek [Tue, 30 Oct 2007 01:12:20 +0000 (01:12 +0000)]
K8 resource dump utility from Rudolf Marek

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2904 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd support for Intel 440MX systems.
Uwe Hermann [Tue, 30 Oct 2007 00:56:50 +0000 (00:56 +0000)]
Add support for Intel 440MX systems.
Add support for the Fujitsu MBM29F400TC flash part.

Detection and reading works, writing is not tested.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2903 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoThanks to the great efforts of Morgan Tsai of SiS we support the SiS966
Morgan Tsai [Mon, 29 Oct 2007 21:00:14 +0000 (21:00 +0000)]
Thanks to the great efforts of Morgan Tsai of SiS we support the SiS966
southbridge now:

From: Morgan Tsai <my_tsai@sis.com>

It supports SiS761GX / SiS966 chipset, only for AMD K8 platform so far.
Due to integrated VGA sharing system memory, some code in southbridge
folder have to init northbridge.

Copyright (C) 2007 Morgan Tsai <my_tsai@sis.com>
Copyright (C) 2007 Silicon Integrated Systems Corp. (SiS)

Change Log:

Newly support GIGABYTE GA-2761GXDK
CPU type: AMD AM2 socket
Northbridge: SiS 761GX
Southbridge: SiS 966
SuperIO: ITE8716F

Signed-off-by: Morgan Tsai <my_tsai@sis.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2902 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoMove ARRAY_SIZE to stdlib.h to make it available to all code (trivial).
Uwe Hermann [Sat, 27 Oct 2007 20:05:21 +0000 (20:05 +0000)]
Move ARRAY_SIZE to stdlib.h to make it available to all code (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2901 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDrop duplicated and unneeded #defines from some northbridges (trivial).
Uwe Hermann [Sat, 27 Oct 2007 19:45:49 +0000 (19:45 +0000)]
Drop duplicated and unneeded #defines from some northbridges (trivial).
This is generic PCI stuff, not nothbridge-specific in any way.
The respective #defines are already present in src/include/device/pci_def.h.

Abuild-tested, so shouldn't break anything.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2900 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoThis code gets us to a working linux boot on the alix1c. I have not tested
Ronald G. Minnich [Fri, 26 Oct 2007 14:57:46 +0000 (14:57 +0000)]
This code gets us to a working linux boot on the alix1c. I have not tested
Ethernet yet. The fixes are a board-specific fake spd_read_byte, cleaning up
comments, and just in general customizing for the 1c.

The lxraminit
change fixes a bug (&& used instead of ||), adds some debug prints which were
VERY useful debugging the alix1c, changes fatal error messages from print_debug
to print_emerg, and adds two functions:
banner, which just prints out a string with a banner, and
hcf, which print an emergency message and then pushes null bytes
into the uart forever, just to make sure that no bytes get lost
for any reason.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2899 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd support for the AXUS TC320 thin client.
Juergen Beisert [Fri, 26 Oct 2007 14:42:21 +0000 (14:42 +0000)]
Add support for the AXUS TC320 thin client.

This board uses nearly the same devices as the BCOM Winnet100, so most of
the new code here is from the BCOM Winnet100. They differ in the IRQ routing
table only.

BTW: The AXUS board uses standard DIMM memory and can be run at 100MHz SDRAM
clock speed (it runs reliably here since month).

Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2898 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdded Am29LV040B
Peter Lemenkov [Thu, 25 Oct 2007 04:11:11 +0000 (04:11 +0000)]
Added Am29LV040B

Looking through the sources of Uniflash utility I found that this chip
is no more no less than low-voltage variant of Am29F040B but with
different ID.

So I created a very quick patch (attached).

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2897 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoSome fixes for the BCOM WinNET100, mostly in Config.lb:
Uwe Hermann [Wed, 24 Oct 2007 20:17:04 +0000 (20:17 +0000)]
Some fixes for the BCOM WinNET100, mostly in Config.lb:

 - Add missing entry for the NIC:

     device pci 0f.0 on end           # Ethernet (onboard)

 - Drop the following lines:

     register "com1" = "{115200}"
     register "com2" = "{38400}"

   Those entries hardcode the BAUD rate (as far as I can tell, please
   correct me if I'm wrong). We don't want that -- instead the config option
   TTYS0_BAUD in Options.lb should be used(?) I verified that dropping those
   lines will not break serial output (COM1, 115200, 8n1).

 - Enable IDE (PCI device 00:12.2) and add the following register lines
   to tell the CS5530 code to actually enable IDE channel 0:

      register "ide0_enable" = "1"
      register "ide1_enable" = "0"     # Not available/needed on this board

   Tested with a 2.5" hard drive and FILO, works fine.

 - Enable USB (PCI device 00:13.0), not sure why it was commented.

 - Enable COM2 as it's used by the smartcard reader.

 - Add CONFIG_COMPRESSED_PAYLOAD_LZMA to Options.lb, in order to fix
   abuild for this board.

 - Add some more comments.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2896 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAnother CONSTification...
Stefan Reinauer [Wed, 24 Oct 2007 14:42:12 +0000 (14:42 +0000)]
Another CONSTification...
(trivial)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2895 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoThis change removes all warnings from romcc in my build environment,
Stefan Reinauer [Wed, 24 Oct 2007 11:14:14 +0000 (11:14 +0000)]
This change removes all warnings from romcc in my build environment,
making the output of "make -s" finally usable.. (still trivial, doesn't
change any logic or remove any code)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2894 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agosmaller changes to silence build warnings. (trivial)
Stefan Reinauer [Wed, 24 Oct 2007 11:12:15 +0000 (11:12 +0000)]
smaller changes to silence build warnings. (trivial)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2893 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoanalog changes for the cpu_driver structures...
Stefan Reinauer [Wed, 24 Oct 2007 11:10:21 +0000 (11:10 +0000)]
analog changes for the cpu_driver structures...
make them const before putting them into the read-only segment...
(trivial)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2892 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoEver wondered where those "setting incorrect section attributes for
Stefan Reinauer [Wed, 24 Oct 2007 09:08:58 +0000 (09:08 +0000)]
Ever wondered where those "setting incorrect section attributes for
rodata.pci_driver" warnings are coming from? We were packing those
structures into a read-only segment, but forgot to mark them const.

Despite its size, this is a fairly trivial patch created by a simple
search/replace

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2891 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agofix a whole bunch of warnings. (trivial)
Stefan Reinauer [Tue, 23 Oct 2007 22:17:45 +0000 (22:17 +0000)]
fix a whole bunch of warnings. (trivial)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2890 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agodrop unused variable (and thus warning). trivial patch.
Stefan Reinauer [Tue, 23 Oct 2007 19:23:52 +0000 (19:23 +0000)]
drop unused variable (and thus warning). trivial patch.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2889 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd support for the Intel mFCPGA 478 socket. (trivial)
Stefan Reinauer [Tue, 23 Oct 2007 18:59:21 +0000 (18:59 +0000)]
Add support for the Intel mFCPGA 478 socket. (trivial)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2888 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoThe s2882 ships with a 1MB rom chip. The targets/tyan/s2882/Config.lb file
Ward Vandewege [Tue, 23 Oct 2007 12:06:53 +0000 (12:06 +0000)]
The s2882 ships with a 1MB rom chip. The targets/tyan/s2882/Config.lb file
assumes a 1MB rom chip.

Hence the default position for the VGA bios should also assume a 1MB rom chip,
not a 512KB chip.

Signed-off-by: Ward Vandewege <ward@gnu.org>
Acked-by: Corey Osgood <corey.osgood@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2887 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoFix typo (trivial)
Ward Vandewege [Mon, 22 Oct 2007 20:56:13 +0000 (20:56 +0000)]
Fix typo (trivial)

Signed-off-by: Ward Vandewege <ward@gnu.org>
Acked-by: Ward Vandewege <ward@gnu.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2886 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd support for a precompressed LZMA payload (trivial).
Ward Vandewege [Mon, 22 Oct 2007 20:55:29 +0000 (20:55 +0000)]
Add support for a precompressed LZMA payload (trivial).

Signed-off-by: Ward Vandewege <ward@gnu.org>
Acked-by: Ward Vandewege <ward@gnu.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2885 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoFlashrom: Add more Vendor IDs and ensure correct sorting in flash.h.
Peter Lemenkov [Mon, 22 Oct 2007 20:36:16 +0000 (20:36 +0000)]
Flashrom: Add more Vendor IDs and ensure correct sorting in flash.h.

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2884 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoThis patch adds support for K8T890CE northbridge.
Rudolf Marek [Mon, 22 Oct 2007 19:59:57 +0000 (19:59 +0000)]
This patch adds support for K8T890CE northbridge.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2883 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoTrivial: remove unused variable.
Ronald G. Minnich [Mon, 22 Oct 2007 17:04:39 +0000 (17:04 +0000)]
Trivial: remove unused variable.
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2882 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoIntroduce block and sector erase routines to flashrom, but do not use
Carl-Daniel Hailfinger [Mon, 22 Oct 2007 16:15:28 +0000 (16:15 +0000)]
Introduce block and sector erase routines to flashrom, but do not use
them yet.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2881 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoThis is a hack for easier testing of GRUB2 in LinuxBIOSv2
Stefan Reinauer [Mon, 22 Oct 2007 10:07:46 +0000 (10:07 +0000)]
This is a hack for easier testing of GRUB2 in LinuxBIOSv2
since it is still our most wide-spread codebase.

The patch is pretty trivial, and nobody except Torsten even looked at
it in a week, so....

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2880 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoPut the print in the right place. This is trivial patch but a very
Ronald G. Minnich [Sun, 21 Oct 2007 04:33:02 +0000 (04:33 +0000)]
Put the print in the right place. This is trivial patch but a very
serious issue, so I am self-acking.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2879 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoI am signing off and acking this trivial patch, as I just wasted several
Ronald G. Minnich [Sun, 21 Oct 2007 03:51:06 +0000 (03:51 +0000)]
I am signing off and acking this trivial patch, as I just wasted several
days on a function named pll_reset that, on exit, says "Done
cpuRegInit", and which, in turn, made me think it was a lot farther
along that it was.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2878 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoRemove hardcoded wait from SPI write/erase routines and check the chip
Carl-Daniel Hailfinger [Thu, 18 Oct 2007 17:56:42 +0000 (17:56 +0000)]
Remove hardcoded wait from SPI write/erase routines and check the chip
status register instead.
This has been tested by Harald Gutmann <harald.gutmann@gmx.net> with a
MX25L4005 chip.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2876 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDocumentation fixes and updates (trivial).
Uwe Hermann [Thu, 18 Oct 2007 00:29:05 +0000 (00:29 +0000)]
Documentation fixes and updates (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2875 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd generic SPI flash erase and write support to flashrom. The first
Carl-Daniel Hailfinger [Thu, 18 Oct 2007 00:24:07 +0000 (00:24 +0000)]
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@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2874 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoSome cosmetic cleanups in the flashrom code and output.
Uwe Hermann [Wed, 17 Oct 2007 23:55:15 +0000 (23:55 +0000)]
Some cosmetic cleanups in the flashrom code and output.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2873 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDrop support for the --human-readable option. It's not any more useful than
Uwe Hermann [Wed, 17 Oct 2007 23:43:59 +0000 (23:43 +0000)]
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@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2872 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoPrint the version number always, not only in verbose mode.
Uwe Hermann [Wed, 17 Oct 2007 23:42:02 +0000 (23:42 +0000)]
Print the version number always, not only in verbose mode.

We often want to know the exact version number of superiotool which
was used to gather a certain output/dump.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2871 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd dump support for the Winbond W83697SF.
Idwer Vollering [Wed, 17 Oct 2007 23:37:36 +0000 (23:37 +0000)]
Add dump support for the Winbond W83697SF.

Signed-off-by: Idwer Vollering <idwer_v@hotmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2870 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd a debug message to keyboard init. This helped isolate at least one
Carl-Daniel Hailfinger [Wed, 17 Oct 2007 22:34:40 +0000 (22:34 +0000)]
Add a debug message to keyboard init. This helped isolate at least one
case of keyboard failure (the keyboard initialization was never hit).

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2869 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoFix wrong values/typos in chipset_enable.c. This has been confirmed by
Carl-Daniel Hailfinger [Wed, 17 Oct 2007 22:30:07 +0000 (22:30 +0000)]
Fix wrong values/typos in chipset_enable.c. This has been confirmed by
Ed Swierk in
http://www.mail-archive.com/linuxbios@linuxbios.org/msg09788.html .

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2868 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoFix up totally broken Super I/O setup on the MSI MS-7260 (K9N Neo).
Uwe Hermann [Wed, 17 Oct 2007 01:57:14 +0000 (01:57 +0000)]
Fix up totally broken Super I/O setup on the MSI MS-7260 (K9N Neo).

This has not been working at all until now. With this fix, keyboard,
mouse, parallel port, and the Super I/O sensors work fine (tested
on actual hardware).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2867 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoMultiple flashrom fixes:
Uwe Hermann [Tue, 16 Oct 2007 23:36:34 +0000 (23:36 +0000)]
Multiple flashrom fixes:

 - Install binary in /usr/sbin (not /usr/bin), as it's a root-only tool.

 - Rename manpage from flashrom.1 to flashrom.8, as section 8 contains
   "System administration commands (usually only for root)".

 - Actually install the manpage upon 'make install'.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2866 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd detection support for the Winbond W83977AF as found in the
Uwe Hermann [Tue, 16 Oct 2007 21:56:32 +0000 (21:56 +0000)]
Add detection support for the Winbond W83977AF as found in the
Advantech PCM-5820 board (confirmed by Erwan Velu <erwan@seanodes.com>
on IRC). Trivial (and tested) patch.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2865 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd Gigabyte M61P-S3 SPI flash support to board_enable.c
Michael van der Kolff [Tue, 16 Oct 2007 21:18:43 +0000 (21:18 +0000)]
Add Gigabyte M61P-S3 SPI flash support to board_enable.c

Signed-off-by: Michael van der Kolff <mvanderkolff@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2864 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoConvert the existing it8716f_* functions to generic_spi_* functions by
Carl-Daniel Hailfinger [Tue, 16 Oct 2007 21:09:06 +0000 (21:09 +0000)]
Convert the existing it8716f_* functions to generic_spi_* functions by
applying abstraction and wrapping.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2863 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd resource size and resource granularity reporting to device_util.c.
Carl-Daniel Hailfinger [Tue, 16 Oct 2007 18:21:22 +0000 (18:21 +0000)]
Add resource size and resource granularity reporting to device_util.c.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2862 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoFix the detection for the Winbond W83697SF. Unfortunately the revision
Uwe Hermann [Tue, 16 Oct 2007 18:15:25 +0000 (18:15 +0000)]
Fix the detection for the Winbond W83697SF. Unfortunately the revision
has a slightly different format than that of the W83697UF/UG so we have
to hack around it a bit.

This patch has been verified to work on real hardware by
Idwer Vollering <idwer_v@hotmail.com> on IRC (thanks!).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2861 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDump support for the Winbond W83977TF.
Idwer Vollering [Tue, 16 Oct 2007 00:34:03 +0000 (00:34 +0000)]
Dump support for the Winbond W83977TF.

Signed-off-by: Idwer Vollering <idwer_v@hotmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2860 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoCompletely rip out / replace the ASUS P2B code (which wasn't really working),
Uwe Hermann [Tue, 16 Oct 2007 00:13:59 +0000 (00:13 +0000)]
Completely rip out / replace the ASUS P2B code (which wasn't really working),
replacing it with a minimal, but working, framework which will be expanded.
Drop a bunch of useless and duplicated files, add missing license headers.

I'm self-acking it this time, the diff is a huge unreadable mess and the old
code is broken anyway...

This code is tested to build fine, and can boot a Linux kernel up to a
login-prompt via FILO (IDE). This is verified on actual hardware.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2859 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years ago(forgot to add spi.c)
Carl-Daniel Hailfinger [Mon, 15 Oct 2007 21:45:29 +0000 (21:45 +0000)]
(forgot to add spi.c)

Move SPI code out of board_enable.c where it started its life. The SPI
chip finding and SPI chip accessor code is moved as well. This can be
split later if we feel like it.

The non-use of svn cp is intentional because the only history we'd have
to preserve are a few commits which were early prototypes of chip
identification code. For those who intend to look at that history, they
can look at board_enable.c revision 2853.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2858 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoMove SPI code out of board_enable.c where it started its life. The SPI
Carl-Daniel Hailfinger [Mon, 15 Oct 2007 21:44:47 +0000 (21:44 +0000)]
Move SPI code out of board_enable.c where it started its life. The SPI
chip finding and SPI chip accessor code is moved as well. This can be
split later if we feel like it.

The non-use of svn cp is intentional because the only history we'd have
to preserve are a few commits which were early prototypes of chip
identification code. For those who intend to look at that history, they
can look at board_enable.c revision 2853.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2857 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoThis patch adds support for the Mobile Intel Celeron CPU (Micro-FC-BGA)
Joseph Smith [Mon, 15 Oct 2007 21:39:48 +0000 (21:39 +0000)]
This patch adds support for the Mobile Intel Celeron CPU (Micro-FC-BGA)

Signed-off-by: Joseph Smith <joe@smittys.pointclark.net>
Acked-by: Corey Osgood <corey.osgood@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2856 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoFix stupid thinko in the Winbond detection code which prevented some
Uwe Hermann [Mon, 15 Oct 2007 15:46:59 +0000 (15:46 +0000)]
Fix stupid thinko in the Winbond detection code which prevented some
of the Winbond chips from being detected (trivial fix).

This is verified on real hardware and works fine now.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2855 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd dump support for the NSC PC8374L (trivial).
Uwe Hermann [Sun, 14 Oct 2007 17:02:15 +0000 (17:02 +0000)]
Add dump support for the NSC PC8374L (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2854 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoFix the resource end in amdk8/northbridge.c.
Rudolf Marek [Sun, 14 Oct 2007 00:29:25 +0000 (00:29 +0000)]
Fix the resource end in amdk8/northbridge.c.

Without this bugfix, the resource for the PCI/ISA video memory at
0xa0000 - 0xbffff is too big, i.e. it goes up to 0xcffff instead of
just 0xbffff as it should.

Here's the diff from two runs of the tool from
http://www.linuxbios.org/pipermail/linuxbios/2007-June/022449.html
on the MSI MS-7260 (K9N Neo), with and without the bugfix. After applying,
the resource size is correct again.

--- dumpres_lb_pci_vgacard_without_resfix.txt
+++ dumpres_lb_pci_vgacard_with_resfix.txt
@@ -11,7 +11,7 @@
 MMIO map: #2 0x0000000000 - 0x000000ffff Access: /     Dstnode:0 DstLink 0
 MMIO map: #3 0x0000000000 - 0x000000ffff Access: /     Dstnode:0 DstLink 0
 MMIO map: #4 0x0000000000 - 0x000000ffff Access: /     Dstnode:0 DstLink 0
-MMIO map: #5 0x00000a0000 - 0x00000cffff Access: R/W     Dstnode:0 DstLink 0
+MMIO map: #5 0x00000a0000 - 0x00000bffff Access: R/W     Dstnode:0 DstLink 0
 MMIO map: #6 0x00fc000000 - 0x00fd1fffff Access: R/W     Dstnode:0 DstLink 0
 MMIO map: #7 0x00fd200000 - 0x00fd1fffff Access: R/W     Dstnode:0 DstLink 0
 MMIO map: #0  0x000000 - 0x003fff Access: R/W  ISA VGA Dstnode:0 DstLink 0

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2853 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoSet the superiotool version number from svn at build time.
Ulf Jordan [Sat, 13 Oct 2007 18:06:12 +0000 (18:06 +0000)]
Set the superiotool version number from svn at build time.

Signed-off-by: Ulf Jordan <jordan@chalmers.se>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2852 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDump support for the SMSC LPC47N227.
Stefan Reinauer [Sat, 13 Oct 2007 17:06:21 +0000 (17:06 +0000)]
Dump support for the SMSC LPC47N227.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2851 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoChanges to flashrom to support the K8N-NEO3, first tested at Google on GSOC day :-)
Ronald G. Minnich [Fri, 12 Oct 2007 21:22:40 +0000 (21:22 +0000)]
Changes to flashrom to support the K8N-NEO3, first tested at Google on GSOC day :-)

Also minor changes to remove tab-space combinations where possible.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Signed-off-by: David Hendricks <david.hendricks@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
Index: jedec.c
===================================================================
--- jedec.c (revision 2847)
+++ jedec.c (working copy)
@@ -281,7 +281,7 @@
  // dumb check if erase was successful.
  for (i = 0; i < total_size; i++) {
  if (bios[i] != (uint8_t) 0xff) {
- printf("ERASE FAILED\n");
+ printf("ERASE FAILED @%d, val %02x\n", i, bios[i]);
  return -1;
  }
  }
Index: board_enable.c
===================================================================
--- board_enable.c (revision 2847)
+++ board_enable.c (working copy)
@@ -153,7 +153,8 @@
  return 1;
  }
  /* Start IO, 33MHz, readcnt input bytes, writecnt output bytes. Note:
-    We can't use writecnt directly, but have to use a strange encoding */
+  * We can't use writecnt directly, but have to use a strange encoding
+  */
  outb((0x5 << 4) | ((readcnt & 0x3) << 2) | (writeenc), port);
  do {
  busy = inb(port) & 0x80;
@@ -202,43 +203,39 @@
 /*
  * Helper functions for many Winbond Super I/Os of the W836xx range.
  */
-#define W836_INDEX 0x2E
-#define W836_DATA  0x2F
-
 /* Enter extended functions */
-static void w836xx_ext_enter(void)
+static void w836xx_ext_enter(uint16_t port)
 {
- outb(0x87, W836_INDEX);
- outb(0x87, W836_INDEX);
+ outb(0x87, port);
+ outb(0x87, port);
 }

 /* Leave extended functions */
-static void w836xx_ext_leave(void)
+static void w836xx_ext_leave(uint16_t port)
 {
- outb(0xAA, W836_INDEX);
+ outb(0xAA, port);
 }

 /* General functions for reading/writing Winbond Super I/Os. */
-static unsigned char wbsio_read(unsigned char index)
+static unsigned char wbsio_read(uint16_t index, uint8_t reg)
 {
- outb(index, W836_INDEX);
- return inb(W836_DATA);
+ outb(reg, index);
+ return inb(index+1);
 }

-static void wbsio_write(unsigned char index, unsigned char data)
+static void wbsio_write(uint16_t index, uint8_t reg, uint8_t data)
 {
- outb(index, W836_INDEX);
- outb(data, W836_DATA);
+ outb(reg, index);
+ outb(data, index+1);
 }

-static void wbsio_mask(unsigned char index, unsigned char data,
-        unsigned char mask)
+static void wbsio_mask(uint16_t index, uint8_t reg, uint8_t data, uint8_t mask)
 {
- unsigned char tmp;
+ uint8_t tmp;

- outb(index, W836_INDEX);
- tmp = inb(W836_DATA) & ~mask;
- outb(tmp | (data & mask), W836_DATA);
+ outb(reg, index);
+ tmp = inb(index+1) & ~mask;
+ outb(tmp | (data & mask), index+1);
 }

 /**
@@ -248,37 +245,80 @@
  *  - Agami Aruma
  *  - IWILL DK8-HTX
  */
-static int w83627hf_gpio24_raise(const char *name)
+static int w83627hf_gpio24_raise(uint16_t index, const char *name)
 {
- w836xx_ext_enter();
+ w836xx_ext_enter(index);

  /* Is this the w83627hf? */
- if (wbsio_read(0x20) != 0x52) { /* SIO device ID register */
+ if (wbsio_read(index, 0x20) != 0x52) { /* Super I/O device ID register */
  fprintf(stderr, "\nERROR: %s: W83627HF: Wrong ID: 0x%02X.\n",
- name, wbsio_read(0x20));
- w836xx_ext_leave();
+ name, wbsio_read(index, 0x20));
+ w836xx_ext_leave(index);
  return -1;
  }

  /* PIN89S: WDTO/GP24 multiplex -> GPIO24 */
- wbsio_mask(0x2B, 0x10, 0x10);
+ wbsio_mask(index, 0x2B, 0x10, 0x10);

- wbsio_write(0x07, 0x08); /* Select logical device 8: GPIO port 2 */
+ wbsio_write(index, 0x07, 0x08); /* Select logical device 8: GPIO port 2 */

- wbsio_mask(0x30, 0x01, 0x01); /* Activate logical device. */
+ wbsio_mask(index, 0x30, 0x01, 0x01); /* Activate logical device. */

- wbsio_mask(0xF0, 0x00, 0x10); /* GPIO24 -> output */
+ wbsio_mask(index, 0xF0, 0x00, 0x10); /* GPIO24 -> output */

- wbsio_mask(0xF2, 0x00, 0x10); /* Clear GPIO24 inversion */
+ wbsio_mask(index, 0xF2, 0x00, 0x10); /* Clear GPIO24 inversion */

- wbsio_mask(0xF1, 0x10, 0x10); /* Raise GPIO24 */
+ wbsio_mask(index, 0xF1, 0x10, 0x10); /* Raise GPIO24 */

- w836xx_ext_leave();
+ w836xx_ext_leave(index);

  return 0;
 }

+static int w83627hf_gpio24_raise_2e(const char *name)
+{
+ return w83627hf_gpio24_raise(0x2d, name);
+}
+
 /**
+ * Winbond W83627THF: GPIO 4, bit 4
+ *
+ * Suited for:
+ *  - MSI K8N-NEO3
+ */
+static int w83627thf_gpio4_4_raise(uint16_t index, const char *name)
+{
+ w836xx_ext_enter(index);
+ /* Is this the w83627thf? */
+ if (wbsio_read(index, 0x20) != 0x82) { /* Super I/O device ID register */
+ fprintf(stderr, "\nERROR: %s: W83627THF: Wrong ID: 0x%02X.\n",
+ name, wbsio_read(index, 0x20));
+ w836xx_ext_leave(index);
+ return -1;
+ }
+
+ /* PINxxxxS: GPIO4/bit 4 multiplex -> GPIOXXX */
+
+ wbsio_write(index, 0x07, 0x09); /* Select logical device 9: GPIO port 4 */
+
+ wbsio_mask(index, 0x30, 0x02, 0x02); /* Activate logical device. */
+
+ wbsio_mask(index, 0xF4, 0x00, 0x10); /* GPIO4 bit 4 -> output */
+
+ wbsio_mask(index, 0xF6, 0x00, 0x10); /* Clear GPIO4 bit 4 inversion */
+
+ wbsio_mask(index, 0xF5, 0x10, 0x10); /* Raise GPIO4 bit 4 */
+
+ w836xx_ext_leave(index);
+
+ return 0;
+}
+
+static int w83627thf_gpio4_4_raise_4e(const char *name)
+{
+ return w83627thf_gpio4_4_raise(0x4E, name);
+}
+/**
  * Suited for VIAs EPIA M and MII, and maybe other CLE266 based EPIAs.
  *
  * We don't need to do this when using LinuxBIOS, GPIO15 is never lowered there.
@@ -335,12 +375,12 @@
  pci_write_byte(dev, 0x59, val);

  /* Raise ROM MEMW# line on Winbond w83697 SuperIO */
- w836xx_ext_enter();
+ w836xx_ext_enter(0x2E);

- if (!(wbsio_read(0x24) & 0x02)) /* flash rom enabled? */
- wbsio_mask(0x24, 0x08, 0x08); /* enable MEMW# */
+ if (!(wbsio_read(0x2E, 0x24) & 0x02)) /* flash rom enabled? */
+ wbsio_mask(0x2E, 0x24, 0x08, 0x08); /* enable MEMW# */

- w836xx_ext_leave();
+ w836xx_ext_leave(0x2E);

  return 0;
 }
@@ -487,9 +527,11 @@
  {0x10de, 0x0360, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
   "gigabyte", "m57sli", "GIGABYTE GA-M57SLI", it87xx_probe_serial_flash},
  {0x1022, 0x7468, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  "iwill", "dk8_htx", "IWILL DK8-HTX", w83627hf_gpio24_raise},
+  "iwill", "dk8_htx", "IWILL DK8-HTX", w83627hf_gpio24_raise_2e},
+ {0x10de, 0x005e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+  "msi", "k8n-neo3", "MSI K8N Neo3", w83627thf_gpio4_4_raise_4e},
  {0x1022, 0x746B, 0x1022, 0x36C0, 0x0000, 0x0000, 0x0000, 0x0000,
-  "AGAMI", "ARUMA", "agami Aruma", w83627hf_gpio24_raise},
+  "AGAMI", "ARUMA", "agami Aruma", w83627hf_gpio24_raise_2e},
  {0x1106, 0x3177, 0x1106, 0xAA01, 0x1106, 0x3123, 0x1106, 0xAA01,
   NULL, NULL, "VIA EPIA M/MII/...", board_via_epia_m},
  {0x1106, 0x3177, 0x1043, 0x80A1, 0x1106, 0x3205, 0x1043, 0x8118,
@@ -509,8 +551,8 @@
  * Match boards on LinuxBIOS table gathered vendor and part name.
  * Require main PCI IDs to match too as extra safety.
  */
-static struct board_pciid_enable *board_match_linuxbios_name(char *vendor,
-      char *part)
+static struct board_pciid_enable *board_match_linuxbios_name(char *vendor,
+ char *part)
 {
  struct board_pciid_enable *board = board_pciid_enables;

@@ -525,10 +567,11 @@
  continue;

  if (board->second_vendor &&
-     !pci_dev_find(board->second_vendor, board->second_device))
+ !pci_dev_find(board->second_vendor, board->second_device))
  continue;
  return board;
  }
+ printf("NOT FOUND %s:%s\n", vendor, part);
  return NULL;
 }

@@ -545,20 +588,20 @@
  continue;

  if (!pci_card_find(board->first_vendor, board->first_device,
-    board->first_card_vendor,
-    board->first_card_device))
+ board->first_card_vendor,
+ board->first_card_device))
  continue;

  if (board->second_vendor) {
  if (board->second_card_vendor) {
  if (!pci_card_find(board->second_vendor,
-    board->second_device,
-    board->second_card_vendor,
-    board->second_card_device))
+ board->second_device,
+ board->second_card_vendor,
+ board->second_card_device))
  continue;
  } else {
  if (!pci_dev_find(board->second_vendor,
-   board->second_device))
+ board->second_device))
  continue;
  }
  }
@@ -582,7 +625,7 @@

  if (board) {
  printf("Found board \"%s\": Enabling flash write... ",
-        board->name);
+ board->name);

  ret = board->enable(board->name);
  if (ret)

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2850 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoSuperiotool manpage/documentation improvements (trivial).
Uwe Hermann [Thu, 11 Oct 2007 18:30:05 +0000 (18:30 +0000)]
Superiotool manpage/documentation improvements (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2849 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoSet the default video memory to 0 MB for all GX1 boards which don't yet
Uwe Hermann [Thu, 11 Oct 2007 10:25:35 +0000 (10:25 +0000)]
Set the default video memory to 0 MB for all GX1 boards which don't yet
use that feature in order to not waste RAM.

Also, add missing CONFIG_VIDEO_MB for the eaglelion/5bcm, which should
fix the build for that board.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2848 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoRevert my last cleanup patch.
Uwe Hermann [Wed, 10 Oct 2007 17:42:20 +0000 (17:42 +0000)]
Revert my last cleanup patch.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2847 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoCosmetic changes to make the flashrom output more consistent (trivial).
Uwe Hermann [Wed, 10 Oct 2007 16:31:30 +0000 (16:31 +0000)]
Cosmetic changes to make the flashrom output more consistent (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2846 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoThis patch adds the CONFIG_VIDEO_MB option to boards that
Corey Osgood [Wed, 10 Oct 2007 15:01:48 +0000 (15:01 +0000)]
This patch adds the CONFIG_VIDEO_MB option to boards that
currently don't have it but need it to compile with the new Geode GX1
VGA support. This sets the size at 4MB, which was the size previously
defined in the VGA code.

Signed-off-by: Corey Osgood <corey.osgod@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2845 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoMinor cosmetic changes (trivial).
Uwe Hermann [Tue, 9 Oct 2007 23:58:35 +0000 (23:58 +0000)]
Minor cosmetic changes (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2844 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd support for the BCOM WinNET100 (used in the IGEL-316 thin client).
Juergen Beisert [Tue, 9 Oct 2007 23:26:19 +0000 (23:26 +0000)]
Add support for the BCOM WinNET100 (used in the IGEL-316 thin client).

See http://www.linuxbios.org/BCOM_WINNET100_Build_Tutorial for hardware
description and build tutorials.

Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2843 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoFixup a register dump attached to the wrong Super I/O. Seems something
Uwe Hermann [Mon, 8 Oct 2007 01:59:46 +0000 (01:59 +0000)]
Fixup a register dump attached to the wrong Super I/O. Seems something
went wrong in one of the recent commits.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2842 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd detection support for lots more SMSC Super I/Os (trivial).
Uwe Hermann [Mon, 8 Oct 2007 01:11:11 +0000 (01:11 +0000)]
Add detection support for lots more SMSC Super I/Os (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2841 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoMake the reserved video memory on Geode GX1 based systems configurable.
Juergen Beisert [Sun, 7 Oct 2007 22:46:51 +0000 (22:46 +0000)]
Make the reserved video memory on Geode GX1 based systems configurable.
This makes sense on systems with small memories when the VGA feature is
not used (CONFIG_VIDEO_MB = 0 in this case).

On Geode GX1 based systems the following amount of memory should be reserved
when VGA support is enabled:
 - 1MiB for VGA and SVGA resolutions
 - 2MiB for XGA resolution
 - 4MiB for SXGA resolution

Signed-off-by: Juergen Beisert <juergen127@kreuzholzen.de>
Acked-by: Peter Stuge <peter@stuge.se>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2840 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd missing '\n' to a printk_debug() and some other small fixes
Uwe Hermann [Sun, 7 Oct 2007 22:25:49 +0000 (22:25 +0000)]
Add missing '\n' to a printk_debug() and some other small fixes
while I'm at it (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2839 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoSome more ITE chips and small fixes (trivial).
Uwe Hermann [Sun, 7 Oct 2007 21:50:29 +0000 (21:50 +0000)]
Some more ITE chips and small fixes (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2838 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDetection support for a bunch of NSC Super I/Os (trivial).
Uwe Hermann [Sun, 7 Oct 2007 21:48:26 +0000 (21:48 +0000)]
Detection support for a bunch of NSC Super I/Os (trivial).
Also, dump support for the NSC PC87351.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2837 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoFix some issues with spaces in the code and Doxygen style documentation.
Juergen Beisert [Sun, 7 Oct 2007 21:00:02 +0000 (21:00 +0000)]
Fix some issues with spaces in the code and Doxygen style documentation.
Painting the splash graphic is now ifdef'ed.

Signed-off-by: Juergen Beisert <juergen127@kreuzholzen.de>
Acked-by: Peter Stuge <peter@stuge.se>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2836 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoPrint a short message if no Super I/O chip could be detected (trivial).
Uwe Hermann [Sun, 7 Oct 2007 20:01:23 +0000 (20:01 +0000)]
Print a short message if no Super I/O chip could be detected (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2835 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd a list of contributors to the README (trivial). Also, a small hint
Uwe Hermann [Sun, 7 Oct 2007 19:10:24 +0000 (19:10 +0000)]
Add a list of contributors to the README (trivial). Also, a small hint
about where to send additional register dumps.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2834 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd dump support for the Winbond W83627THF/THG.
David Hendricks [Sun, 7 Oct 2007 19:04:26 +0000 (19:04 +0000)]
Add dump support for the Winbond W83627THF/THG.

Signed-off-by: David Hendricks <david.hendricks@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2833 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd a manpage for superiotool (trivial).
Uwe Hermann [Sun, 7 Oct 2007 15:26:40 +0000 (15:26 +0000)]
Add a manpage for superiotool (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2832 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDump support for the SMSC FDC37B72x.
Robinson P. Tryon [Sun, 7 Oct 2007 15:12:12 +0000 (15:12 +0000)]
Dump support for the SMSC FDC37B72x.

Signed-off-by: Robinson P. Tryon <bishop.robinson@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2831 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDump support for the SMSC FDC37B78x.
Robinson P. Tryon [Sun, 7 Oct 2007 15:04:17 +0000 (15:04 +0000)]
Dump support for the SMSC FDC37B78x.

Signed-off-by: Robinson P. Tryon <bishop.robinson@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2830 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoDump support for the SMSC FDC37M81x.
Robinson P. Tryon [Sun, 7 Oct 2007 14:33:13 +0000 (14:33 +0000)]
Dump support for the SMSC FDC37M81x.

Signed-off-by: Robinson P. Tryon <bishop.robinson@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2829 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd dump support for the Winbond W83627HF/F/HG/G.
Rasmus Wiman [Fri, 5 Oct 2007 21:58:03 +0000 (21:58 +0000)]
Add dump support for the Winbond W83627HF/F/HG/G.

Signed-off-by: Rasmus Wiman <rasmus@wiman.org>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2828 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoThis patch will add support for the Geode GX1/CS5530 VGA feature. It's able
Juergen Beisert [Fri, 5 Oct 2007 21:00:10 +0000 (21:00 +0000)]
This patch will add support for the Geode GX1/CS5530 VGA feature. It's able
to set up one of five screen resolutions (sorry no autodetection at runtime,
resolution is selected at buildtime) and displays a graphic in the right
bottom corner (splash screen).

Signed-off-by: Juergen Beisert <juergen127@kreuzholzen.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2827 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd dump support for the SMSC LPC47M10x (trivial).
Uwe Hermann [Fri, 5 Oct 2007 15:11:38 +0000 (15:11 +0000)]
Add dump support for the SMSC LPC47M10x (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2826 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd dump support for the ITE IT8661F. Note that this chip will not yet
Robinson P. Tryon [Fri, 5 Oct 2007 13:47:04 +0000 (13:47 +0000)]
Add dump support for the ITE IT8661F. Note that this chip will not yet
be detected, as it needs a non-standard init sequence.

Minor other fix: Drop incorrect 0x2b from LDN 5 of the ITE IT8705F.

Signed-off-by: Robinson P. Tryon <bishop.robinson@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2825 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd some more Winbond chips (trivial).
Uwe Hermann [Thu, 4 Oct 2007 18:34:36 +0000 (18:34 +0000)]
Add some more Winbond chips (trivial).

Add notes which IDs were taken from sensors-detect (as where we lack
datasheets, thus cannot verify them) and which we support but sensors-detect
does not (yet). I'll post patches on the lm-sensors list to sync up
the detected chips between superiotool and sensors-detect.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2824 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd detection support for the LPC47B387 (trivial).
Uwe Hermann [Thu, 4 Oct 2007 16:28:56 +0000 (16:28 +0000)]
Add detection support for the LPC47B387 (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2823 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 years agoAdd dump support for the ITE IT8705F/AF.
Robinson P. Tryon [Thu, 4 Oct 2007 15:44:19 +0000 (15:44 +0000)]
Add dump support for the ITE IT8705F/AF.

Signed-off-by: Robinson P. Tryon <bishop.robinson@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2822 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1