coreboot April 2011

coreboot@coreboot.org

66 participants
229 discussions

build service results for r6521
by repository service 19 Apr '11

19 Apr '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "stepan" checked in revision 6521 to the coreboot repository. This caused the following changes: Change Log: Drop baud rate init to an arbitrary baud rate from Super I/O code. See discussion at http://www.mail-archive.com/coreboot@coreboot.org/msg29394.html config->com1, devicetree.cb cleanup and init_uart8250() removal will follow once this patch is comitted Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Patrick Georgi <patrick(a)georgi-clan.de> Updated to drop com1, com2.... from config structure and devicetree.cb Build Log: Compilation of lenovo:x60 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6521&device=x60&vendor=len… Compilation of via:epia-cn has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6521&device=epia-cn&vendor… Compilation of via:epia-m has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6521&device=epia-m&vendor=… Compilation of via:vt8454c has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=6521&device=vt8454c&vendor… If something broke during this checkin please be a pain in stepan's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r6521 - in trunk/src: mainboard/digitallogic/adl855pc mainboard/digitallogic/msm586seg mainboard/eaglelion/5bcm mainboard/emulation/qemu-x86 mainboard/iei/juki-511p mainboard/iei/nova4899r...
by repository service 19 Apr '11

19 Apr '11

Author: stepan Date: Tue Apr 19 23:33:40 2011 New Revision: 6521 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6521 Log: Drop baud rate init to an arbitrary baud rate from Super I/O code. See discussion at http://www.mail-archive.com/coreboot@coreboot.org/msg29394.html config->com1, devicetree.cb cleanup and init_uart8250() removal will follow once this patch is comitted Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Acked-by: Patrick Georgi <patrick(a)georgi-clan.de> Updated to drop com1, com2.... from config structure and devicetree.cb Modified: trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb trunk/src/mainboard/digitallogic/msm586seg/devicetree.cb trunk/src/mainboard/eaglelion/5bcm/devicetree.cb trunk/src/mainboard/emulation/qemu-x86/devicetree.cb trunk/src/mainboard/iei/juki-511p/devicetree.cb trunk/src/mainboard/iei/nova4899r/devicetree.cb trunk/src/mainboard/iwill/dk8s2/devicetree.cb trunk/src/mainboard/lanner/em8510/devicetree.cb trunk/src/mainboard/technologic/ts5300/devicetree.cb trunk/src/mainboard/via/epia/devicetree.cb trunk/src/superio/fintek/f71805f/chip.h trunk/src/superio/fintek/f71805f/superio.c trunk/src/superio/fintek/f71859/chip.h trunk/src/superio/fintek/f71859/superio.c trunk/src/superio/fintek/f71863fg/chip.h trunk/src/superio/fintek/f71863fg/superio.c trunk/src/superio/fintek/f71872/chip.h trunk/src/superio/fintek/f71872/superio.c trunk/src/superio/fintek/f71889/chip.h trunk/src/superio/fintek/f71889/superio.c trunk/src/superio/fintek/f81865f/chip.h trunk/src/superio/fintek/f81865f/superio.c trunk/src/superio/intel/i3100/chip.h trunk/src/superio/intel/i3100/superio.c trunk/src/superio/ite/it8661f/chip.h trunk/src/superio/ite/it8661f/superio.c trunk/src/superio/ite/it8671f/chip.h trunk/src/superio/ite/it8671f/superio.c trunk/src/superio/ite/it8673f/chip.h trunk/src/superio/ite/it8673f/superio.c trunk/src/superio/ite/it8705f/chip.h trunk/src/superio/ite/it8705f/superio.c trunk/src/superio/ite/it8712f/chip.h trunk/src/superio/ite/it8712f/superio.c trunk/src/superio/ite/it8716f/chip.h trunk/src/superio/ite/it8716f/superio.c trunk/src/superio/ite/it8718f/chip.h trunk/src/superio/ite/it8718f/superio.c trunk/src/superio/nsc/pc8374/chip.h trunk/src/superio/nsc/pc8374/superio.c trunk/src/superio/nsc/pc87309/chip.h trunk/src/superio/nsc/pc87309/superio.c trunk/src/superio/nsc/pc87351/chip.h trunk/src/superio/nsc/pc87351/superio.c trunk/src/superio/nsc/pc87360/chip.h trunk/src/superio/nsc/pc87360/superio.c trunk/src/superio/nsc/pc87366/chip.h trunk/src/superio/nsc/pc87366/superio.c trunk/src/superio/nsc/pc87382/chip.h trunk/src/superio/nsc/pc87382/superio.c trunk/src/superio/nsc/pc87384/chip.h trunk/src/superio/nsc/pc87384/superio.c trunk/src/superio/nsc/pc87392/chip.h trunk/src/superio/nsc/pc87392/superio.c trunk/src/superio/nsc/pc87417/chip.h trunk/src/superio/nsc/pc87417/superio.c trunk/src/superio/nsc/pc87427/chip.h trunk/src/superio/nsc/pc87427/superio.c trunk/src/superio/nsc/pc97307/chip.h trunk/src/superio/nsc/pc97307/superio.c trunk/src/superio/nsc/pc97317/chip.h trunk/src/superio/nsc/pc97317/superio.c trunk/src/superio/nuvoton/wpcm450/chip.h trunk/src/superio/nuvoton/wpcm450/superio.c trunk/src/superio/smsc/fdc37m60x/chip.h trunk/src/superio/smsc/fdc37m60x/superio.c trunk/src/superio/smsc/fdc37n972/chip.h trunk/src/superio/smsc/kbc1100/chip.h trunk/src/superio/smsc/lpc47b272/chip.h trunk/src/superio/smsc/lpc47b272/superio.c trunk/src/superio/smsc/lpc47b397/chip.h trunk/src/superio/smsc/lpc47b397/superio.c trunk/src/superio/smsc/lpc47m10x/chip.h trunk/src/superio/smsc/lpc47m10x/superio.c trunk/src/superio/smsc/lpc47m15x/chip.h trunk/src/superio/smsc/lpc47m15x/superio.c trunk/src/superio/smsc/lpc47n217/chip.h trunk/src/superio/smsc/lpc47n217/superio.c trunk/src/superio/smsc/lpc47n227/chip.h trunk/src/superio/smsc/lpc47n227/superio.c trunk/src/superio/smsc/sio10n268/chip.h trunk/src/superio/smsc/smscsuperio/chip.h trunk/src/superio/smsc/smscsuperio/superio.c trunk/src/superio/via/vt1211/chip.h trunk/src/superio/winbond/w83627dhg/chip.h trunk/src/superio/winbond/w83627dhg/superio.c trunk/src/superio/winbond/w83627ehg/chip.h trunk/src/superio/winbond/w83627ehg/superio.c trunk/src/superio/winbond/w83627hf/chip.h trunk/src/superio/winbond/w83627hf/superio.c trunk/src/superio/winbond/w83627thg/chip.h trunk/src/superio/winbond/w83627thg/superio.c trunk/src/superio/winbond/w83627uhg/chip.h trunk/src/superio/winbond/w83627uhg/superio.c trunk/src/superio/winbond/w83697hf/chip.h trunk/src/superio/winbond/w83697hf/superio.c trunk/src/superio/winbond/w83977f/chip.h trunk/src/superio/winbond/w83977f/superio.c trunk/src/superio/winbond/w83977tf/chip.h trunk/src/superio/winbond/w83977tf/superio.c Modified: trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb ============================================================================== --- trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/digitallogic/adl855pc/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -45,9 +45,6 @@ device pnp 2e.b on # HW Monitor io 0x60 = 0x290 end - register "com1" = "{1}" - # register "com1" = "{1, 0, 0x3f8, 4}" - # register "lpt" = "{1}" end end end Modified: trunk/src/mainboard/digitallogic/msm586seg/devicetree.cb ============================================================================== --- trunk/src/mainboard/digitallogic/msm586seg/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/digitallogic/msm586seg/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -3,8 +3,5 @@ device pci 0.0 on end device pci 12.0 on end # enet device pci 14.0 on end # 69000 -# register "com1" = "{1}" -# register "com1" = "{1, 0, 0x3f8, 4}" end - end Modified: trunk/src/mainboard/eaglelion/5bcm/devicetree.cb ============================================================================== --- trunk/src/mainboard/eaglelion/5bcm/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/eaglelion/5bcm/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -36,8 +36,6 @@ device pnp 2e.8 on # Power Management io 0x60 = 0xe800 end - register "com1" = "{115200}" - register "com2" = "{38400}" end device pci 12.1 off end # SMI device pci 12.2 on end # IDE Modified: trunk/src/mainboard/emulation/qemu-x86/devicetree.cb ============================================================================== --- trunk/src/mainboard/emulation/qemu-x86/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/emulation/qemu-x86/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -9,7 +9,5 @@ register "ide1_enable" = "1" end -# register "com1" = "{1}" -# register "com1" = "{1, 0, 0x3f8, 4}" end end Modified: trunk/src/mainboard/iei/juki-511p/devicetree.cb ============================================================================== --- trunk/src/mainboard/iei/juki-511p/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/iei/juki-511p/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -16,12 +16,10 @@ io 0x60 = 0x3f8 irq 0x70 = 4 end - register "com1" = "{115200}" device pnp 3f0.3 on # COM2 io 0x60 = 0x2f8 irq 0x70 = 3 end - register "com2" = "{115200}" device pnp 3f0.4 on # RTC io 0x60 = 0x070 irq 0x70 = 8 Modified: trunk/src/mainboard/iei/nova4899r/devicetree.cb ============================================================================== --- trunk/src/mainboard/iei/nova4899r/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/iei/nova4899r/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -19,12 +19,10 @@ io 0x60 = 0x3f8 irq 0x70 = 4 end - register "com1" = "{115200}" device pnp 2e.3 on # COM2 io 0x60 = 0x2f8 irq 0x70 = 3 end - register "com2" = "{115200}" device pnp 2e.4 off # Reserved end device pnp 2e.5 on # Keyboard Modified: trunk/src/mainboard/iwill/dk8s2/devicetree.cb ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/iwill/dk8s2/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -56,9 +56,6 @@ device pnp 2e.b on # HW Monitor io 0x60 = 0x290 end - register "com1" = "{1}" - # register "com1" = "{1, 0, 0x3f8, 4}" - # register "lpt" = "{1}" end end device pci 1.1 on end Modified: trunk/src/mainboard/lanner/em8510/devicetree.cb ============================================================================== --- trunk/src/mainboard/lanner/em8510/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/lanner/em8510/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -44,9 +44,6 @@ device pnp 2e.b on # HW Monitor io 0x60 = 0x290 end - register "com1" = "{1}" - # register "com1" = "{1, 0, 0x3f8, 4}" - # register "lpt" = "{1}" end end end Modified: trunk/src/mainboard/technologic/ts5300/devicetree.cb ============================================================================== --- trunk/src/mainboard/technologic/ts5300/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/technologic/ts5300/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -1,9 +1,6 @@ chip cpu/amd/sc520 device pci_domain 0 on device pci 0.0 on end - -# register "com1" = "{1}" -# register "com1" = "{1, 0, 0x3f8, 4}" end end Modified: trunk/src/mainboard/via/epia/devicetree.cb ============================================================================== --- trunk/src/mainboard/via/epia/devicetree.cb Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/mainboard/via/epia/devicetree.cb Tue Apr 19 23:33:40 2011 (r6521) @@ -33,7 +33,6 @@ irq 0x70 = 1 irq 0x72 = 12 end - register "com1" = "{CONFIG_TTYS0_BAUD}" end device pnp 2e.6 off end # CIR device pnp 2e.7 off end # GAME_MIDI_GIPO1 Modified: trunk/src/superio/fintek/f71805f/chip.h ============================================================================== --- trunk/src/superio/fintek/f71805f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71805f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_fintek_f71805f_ops; struct superio_fintek_f71805f_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/fintek/f71805f/superio.c ============================================================================== --- trunk/src/superio/fintek/f71805f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71805f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,23 +40,10 @@ static void f71805f_init(device_t dev) { - struct superio_fintek_f71805f_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return; - switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71805F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F71805F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } } static void f71805f_pnp_set_resources(device_t dev) Modified: trunk/src/superio/fintek/f71859/chip.h ============================================================================== --- trunk/src/superio/fintek/f71859/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71859/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_fintek_f71859_ops; struct superio_fintek_f71859_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/fintek/f71859/superio.c ============================================================================== --- trunk/src/superio/fintek/f71859/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71859/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -41,19 +41,10 @@ static void f71859_init(device_t dev) { - struct superio_fintek_f71859_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return; - switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71859_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - } } static void f71859_pnp_set_resources(device_t dev) Modified: trunk/src/superio/fintek/f71863fg/chip.h ============================================================================== --- trunk/src/superio/fintek/f71863fg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71863fg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_fintek_f71863fg_ops; struct superio_fintek_f71863fg_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/fintek/f71863fg/superio.c ============================================================================== --- trunk/src/superio/fintek/f71863fg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71863fg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -48,14 +48,6 @@ switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71863FG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F71863FG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case F71863FG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); pc_keyboard_init(&conf->keyboard); Modified: trunk/src/superio/fintek/f71872/chip.h ============================================================================== --- trunk/src/superio/fintek/f71872/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71872/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_fintek_f71872_ops; struct superio_fintek_f71872_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/fintek/f71872/superio.c ============================================================================== --- trunk/src/superio/fintek/f71872/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71872/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,21 +40,12 @@ static void f71872_init(device_t dev) { struct superio_fintek_f71872_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71872_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F71872_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case F71872_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/fintek/f71889/chip.h ============================================================================== --- trunk/src/superio/fintek/f71889/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71889/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_fintek_f71889_ops; struct superio_fintek_f71889_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/fintek/f71889/superio.c ============================================================================== --- trunk/src/superio/fintek/f71889/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f71889/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -41,21 +41,12 @@ static void f71889_init(device_t dev) { struct superio_fintek_f71889_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch (dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F71889_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F71889_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case F71889_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/fintek/f81865f/chip.h ============================================================================== --- trunk/src/superio/fintek/f81865f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f81865f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_fintek_f81865f_ops; struct superio_fintek_f81865f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/fintek/f81865f/superio.c ============================================================================== --- trunk/src/superio/fintek/f81865f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/fintek/f81865f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,21 +40,12 @@ static void f81865f_init(device_t dev) { struct superio_fintek_f81865f_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch (dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ - case F81865F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case F81865F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case F81865F_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/intel/i3100/chip.h ============================================================================== --- trunk/src/superio/intel/i3100/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/intel/i3100/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,6 @@ extern struct chip_operations superio_intel_i3100_ops; struct superio_intel_i3100_config { - struct uart8250 com1, com2; }; #endif Modified: trunk/src/superio/intel/i3100/superio.c ============================================================================== --- trunk/src/superio/intel/i3100/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/intel/i3100/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,24 +40,8 @@ static void i3100_init(device_t dev) { - struct superio_intel_i3100_config *conf; - struct resource *res0; - if (!dev->enabled) return; - - conf = dev->chip_info; - - switch (dev->path.pnp.device) { - case I3100_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case I3100_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } } static void i3100_pnp_set_resources(device_t dev) Modified: trunk/src/superio/ite/it8661f/chip.h ============================================================================== --- trunk/src/superio/ite/it8661f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8661f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_ite_it8661f_ops; struct superio_ite_it8661f_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/ite/it8661f/superio.c ============================================================================== --- trunk/src/superio/ite/it8661f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8661f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,23 +29,12 @@ static void init(device_t dev) { - struct superio_ite_it8661f_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return; switch (dev->path.pnp.device) { case IT8661F_FDC: /* TODO. */ break; - case IT8661F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8661F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8661F_PP: /* TODO. */ break; case IT8661F_IR: /* TODO. */ Modified: trunk/src/superio/ite/it8671f/chip.h ============================================================================== --- trunk/src/superio/ite/it8671f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8671f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8671f_ops; struct superio_ite_it8671f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/ite/it8671f/superio.c ============================================================================== --- trunk/src/superio/ite/it8671f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8671f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,6 @@ static void init(device_t dev) { struct superio_ite_it8671f_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; @@ -37,14 +36,6 @@ switch (dev->path.pnp.device) { case IT8671F_FDC: /* TODO. */ break; - case IT8671F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8671F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8671F_PP: /* TODO. */ break; case IT8671F_KBCK: Modified: trunk/src/superio/ite/it8673f/chip.h ============================================================================== --- trunk/src/superio/ite/it8673f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8673f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8673f_ops; struct superio_ite_it8673f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/ite/it8673f/superio.c ============================================================================== --- trunk/src/superio/ite/it8673f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8673f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,6 @@ static void init(device_t dev) { struct superio_ite_it8673f_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; @@ -37,14 +36,6 @@ switch (dev->path.pnp.device) { case IT8673F_FDC: /* TODO. */ break; - case IT8673F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8673F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8673F_PP: /* TODO. */ break; case IT8673F_FAN: /* TODO. */ Modified: trunk/src/superio/ite/it8705f/chip.h ============================================================================== --- trunk/src/superio/ite/it8705f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8705f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_ite_it8705f_ops; struct superio_ite_it8705f_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/ite/it8705f/superio.c ============================================================================== --- trunk/src/superio/ite/it8705f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8705f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,6 @@ static void init(device_t dev) { struct superio_ite_it8705f_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; @@ -36,14 +35,6 @@ switch (dev->path.pnp.device) { case IT8705F_FDC: /* TODO. */ break; - case IT8705F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8705F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8705F_PP: /* TODO. */ break; case IT8705F_EC: /* TODO. */ Modified: trunk/src/superio/ite/it8712f/chip.h ============================================================================== --- trunk/src/superio/ite/it8712f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8712f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8712f_ops; struct superio_ite_it8712f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/ite/it8712f/superio.c ============================================================================== --- trunk/src/superio/ite/it8712f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8712f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -46,7 +46,6 @@ static void it8712f_init(device_t dev) { struct superio_ite_it8712f_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; @@ -54,14 +53,6 @@ switch (dev->path.pnp.device) { case IT8712F_FDC: /* TODO. */ break; - case IT8712F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8712F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8712F_PP: /* TODO. */ break; case IT8712F_EC: /* TODO. */ Modified: trunk/src/superio/ite/it8716f/chip.h ============================================================================== --- trunk/src/superio/ite/it8716f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8716f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8716f_ops; struct superio_ite_it8716f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/ite/it8716f/superio.c ============================================================================== --- trunk/src/superio/ite/it8716f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8716f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -85,14 +85,6 @@ /* TODO: FDC, PP, KBCM, MIDI, GAME, IR. */ switch (dev->path.pnp.device) { - case IT8716F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8716F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8716F_EC: res0 = find_resource(dev, PNP_IDX_IO0); #define EC_INDEX_PORT 5 Modified: trunk/src/superio/ite/it8718f/chip.h ============================================================================== --- trunk/src/superio/ite/it8718f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8718f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_ite_it8718f_ops; struct superio_ite_it8718f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/ite/it8718f/superio.c ============================================================================== --- trunk/src/superio/ite/it8718f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/ite/it8718f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,6 @@ static void init(device_t dev) { struct superio_ite_it8718f_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; @@ -37,14 +36,6 @@ switch (dev->path.pnp.device) { case IT8718F_FDC: /* TODO. */ break; - case IT8718F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case IT8718F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case IT8718F_PP: /* TODO. */ break; case IT8718F_EC: /* TODO. */ Modified: trunk/src/superio/nsc/pc8374/chip.h ============================================================================== --- trunk/src/superio/nsc/pc8374/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc8374/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ #include <uart8250.h> struct superio_nsc_pc8374_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/nsc/pc8374/superio.c ============================================================================== --- trunk/src/superio/nsc/pc8374/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc8374/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -34,20 +34,11 @@ static void init(device_t dev) { struct superio_nsc_pc8374_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC8374_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC8374_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC8374_KBCK: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/nsc/pc87309/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87309/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87309/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_nsc_pc87309_ops; struct superio_nsc_pc87309_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/nsc/pc87309/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87309/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87309/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -30,20 +30,11 @@ static void init(device_t dev) { struct superio_nsc_pc87309_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch (dev->path.pnp.device) { - case PC87309_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87309_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87309_KBCK: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/nsc/pc87351/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87351/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87351/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ #include <uart8250.h> struct superio_nsc_pc87351_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/nsc/pc87351/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87351/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87351/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -34,20 +34,11 @@ static void init(device_t dev) { struct superio_nsc_pc87351_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC87351_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87351_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87351_KBCK: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/nsc/pc87360/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87360/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87360/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ #include <uart8250.h> struct superio_nsc_pc87360_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/nsc/pc87360/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87360/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87360/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -34,20 +34,11 @@ static void init(device_t dev) { struct superio_nsc_pc87360_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC87360_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87360_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87360_KBCK: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/nsc/pc87366/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87366/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87366/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ #include <uart8250.h> struct superio_nsc_pc87366_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/nsc/pc87366/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87366/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87366/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -34,20 +34,11 @@ static void init(device_t dev) { struct superio_nsc_pc87366_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC87366_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87366_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87366_KBCK: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/nsc/pc87382/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87382/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87382/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -25,7 +25,7 @@ extern struct chip_operations superio_nsc_pc87382_ops; struct superio_nsc_pc87382_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/nsc/pc87382/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87382/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87382/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -33,21 +33,11 @@ static void init(device_t dev) { struct superio_nsc_pc87382_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC87382_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87382_IR: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - case PC87382_DOCK: break; Modified: trunk/src/superio/nsc/pc87384/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87384/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87384/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -25,7 +25,7 @@ extern struct chip_operations superio_nsc_pc87384_ops; struct superio_nsc_pc87384_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/nsc/pc87384/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87384/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87384/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -33,21 +33,11 @@ static void init(device_t dev) { struct superio_nsc_pc87384_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC87384_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87384_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - case PC87384_GPIO: break; } Modified: trunk/src/superio/nsc/pc87392/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87392/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87392/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -26,7 +26,7 @@ #include <uart8250.h> struct superio_nsc_pc87392_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/nsc/pc87392/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87392/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87392/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -31,23 +31,8 @@ static void init(device_t dev) { - struct superio_nsc_pc87392_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return; - - switch(dev->path.pnp.device) { - case PC87392_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - - case PC87392_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } } static struct device_operations ops = { Modified: trunk/src/superio/nsc/pc87417/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87417/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87417/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ #include <uart8250.h> struct superio_nsc_pc87417_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/nsc/pc87417/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87417/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87417/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -35,20 +35,11 @@ static void init(device_t dev) { struct superio_nsc_pc87417_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC87417_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87417_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87417_KBCK: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/nsc/pc87427/chip.h ============================================================================== --- trunk/src/superio/nsc/pc87427/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87427/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ #include <uart8250.h> struct superio_nsc_pc87427_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/nsc/pc87427/superio.c ============================================================================== --- trunk/src/superio/nsc/pc87427/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc87427/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -32,20 +32,11 @@ static void init(device_t dev) { struct superio_nsc_pc87427_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC87427_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC87427_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC87427_KBCK: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/nsc/pc97307/chip.h ============================================================================== --- trunk/src/superio/nsc/pc97307/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc97307/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -34,7 +34,7 @@ #include <uart8250.h> struct superio_nsc_pc97307_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; #endif Modified: trunk/src/superio/nsc/pc97307/superio.c ============================================================================== --- trunk/src/superio/nsc/pc97307/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc97307/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,21 +29,12 @@ static void init(device_t dev) { struct superio_nsc_pc97307_config *conf = dev->chip_info; - struct resource *res0; u8 reg8; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC97307_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC97307_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC97307_KBCK: pnp_set_logical_device(dev); pnp_set_enable(dev, 0); /* Disable keyboard */ Modified: trunk/src/superio/nsc/pc97317/chip.h ============================================================================== --- trunk/src/superio/nsc/pc97317/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc97317/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -34,7 +34,7 @@ #include <uart8250.h> struct superio_nsc_pc97317_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/nsc/pc97317/superio.c ============================================================================== --- trunk/src/superio/nsc/pc97317/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nsc/pc97317/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,20 +29,11 @@ static void init(device_t dev) { struct superio_nsc_pc97317_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case PC97317_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case PC97317_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case PC97317_KBCK: pnp_set_logical_device(dev); pnp_set_enable(dev, 0); /* Disable keyboard */ Modified: trunk/src/superio/nuvoton/wpcm450/chip.h ============================================================================== --- trunk/src/superio/nuvoton/wpcm450/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nuvoton/wpcm450/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ #include <uart8250.h> struct superio_nuvoton_wpcm450_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/nuvoton/wpcm450/superio.c ============================================================================== --- trunk/src/superio/nuvoton/wpcm450/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/nuvoton/wpcm450/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -33,20 +33,11 @@ static void init(device_t dev) { struct superio_nuvoton_wpcm450_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case WPCM450_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case WPCM450_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case WPCM450_KBCK: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/smsc/fdc37m60x/chip.h ============================================================================== --- trunk/src/superio/smsc/fdc37m60x/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/fdc37m60x/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_smsc_fdc37m60x_ops; struct superio_smsc_fdc37m60x_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/fdc37m60x/superio.c ============================================================================== --- trunk/src/superio/smsc/fdc37m60x/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/fdc37m60x/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,6 @@ static void init(device_t dev) { struct superio_smsc_fdc37m60x_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; @@ -39,14 +38,6 @@ break; case FDC37M60X_PP: /* TODO. */ break; - case FDC37M60X_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case FDC37M60X_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case FDC37M60X_KBCK: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/smsc/fdc37n972/chip.h ============================================================================== --- trunk/src/superio/smsc/fdc37n972/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/fdc37n972/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_fdc37n972_ops; struct superio_smsc_fdc37n972_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/kbc1100/chip.h ============================================================================== --- trunk/src/superio/smsc/kbc1100/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/kbc1100/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_kbc1100_ops; struct superio_smsc_kbc1100_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/lpc47b272/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47b272/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47b272/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ #include <uart8250.h> struct superio_smsc_lpc47b272_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/lpc47b272/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47b272/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47b272/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -120,20 +120,11 @@ static void lpc47b272_init(device_t dev) { struct superio_smsc_lpc47b272_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case LPC47B272_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47B272_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47B272_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/smsc/lpc47b397/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47b397/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47b397/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -30,7 +30,7 @@ #include <uart8250.h> struct superio_smsc_lpc47b397_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/lpc47b397/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47b397/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47b397/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -68,20 +68,11 @@ static void lpc47b397_init(device_t dev) { struct superio_smsc_lpc47b397_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case LPC47B397_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47B397_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47B397_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/smsc/lpc47m10x/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47m10x/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47m10x/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -32,7 +32,7 @@ #include <uart8250.h> struct superio_smsc_lpc47m10x_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/lpc47m10x/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47m10x/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47m10x/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -118,20 +118,11 @@ static void lpc47m10x_init(device_t dev) { struct superio_smsc_lpc47m10x_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case LPC47M10X2_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47M10X2_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47M10X2_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/smsc/lpc47m15x/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47m15x/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47m15x/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ #include <uart8250.h> struct superio_smsc_lpc47m15x_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/lpc47m15x/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47m15x/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47m15x/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -94,20 +94,11 @@ static void lpc47m15x_init(device_t dev) { struct superio_smsc_lpc47m15x_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case LPC47M15X_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47M15X_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47M15X_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/smsc/lpc47n217/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47n217/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47n217/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ #include <uart8250.h> struct superio_smsc_lpc47n217_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/smsc/lpc47n217/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47n217/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47n217/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -134,21 +134,9 @@ static void lpc47n217_init(device_t dev) { struct superio_smsc_lpc47n217_config* conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; - - switch(dev->path.pnp.device) { - case LPC47N217_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47N217_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } } static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource) Modified: trunk/src/superio/smsc/lpc47n227/chip.h ============================================================================== --- trunk/src/superio/smsc/lpc47n227/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47n227/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_lpc47n227_ops; struct superio_smsc_lpc47n227_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/lpc47n227/superio.c ============================================================================== --- trunk/src/superio/smsc/lpc47n227/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/lpc47n227/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -131,20 +131,11 @@ static void lpc47n227_init(device_t dev) { struct superio_smsc_lpc47n227_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch (dev->path.pnp.device) { - case LPC47N227_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case LPC47N227_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case LPC47N227_KBDC: printk(BIOS_DEBUG, "LPC47N227: Initializing keyboard.\n"); pc_keyboard_init(&conf->keyboard); Modified: trunk/src/superio/smsc/sio10n268/chip.h ============================================================================== --- trunk/src/superio/smsc/sio10n268/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/sio10n268/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_smsc_sio10n268_ops; struct superio_smsc_sio10n268_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/smscsuperio/chip.h ============================================================================== --- trunk/src/superio/smsc/smscsuperio/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/smscsuperio/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_smsc_smscsuperio_ops; struct superio_smsc_smscsuperio_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/smsc/smscsuperio/superio.c ============================================================================== --- trunk/src/superio/smsc/smscsuperio/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/smsc/smscsuperio/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -205,7 +205,6 @@ static void smsc_init(device_t dev) { struct superio_smsc_smscsuperio_config *conf = dev->chip_info; - struct resource *res0; int i, ld; /* Do not initialize disabled devices. */ @@ -223,13 +222,7 @@ /* A Super I/O was found, so initialize the respective device. */ ld = dev->path.pnp.device; - if (ld == logical_device_table[i].devs[LD_SP1]) { - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - } else if (ld == logical_device_table[i].devs[LD_SP2]) { - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - } else if (ld == logical_device_table[i].devs[LD_KBC]) { + if (ld == logical_device_table[i].devs[LD_KBC]) { pc_keyboard_init(&conf->keyboard); } } Modified: trunk/src/superio/via/vt1211/chip.h ============================================================================== --- trunk/src/superio/via/vt1211/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/via/vt1211/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -26,7 +26,7 @@ extern struct chip_operations superio_via_vt1211_ops; struct superio_via_vt1211_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/winbond/w83627dhg/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627dhg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627dhg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_winbond_w83627dhg_ops; struct superio_winbond_w83627dhg_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/winbond/w83627dhg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627dhg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627dhg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -40,20 +40,11 @@ static void w83627dhg_init(device_t dev) { struct superio_winbond_w83627dhg_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case W83627DHG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83627DHG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83627DHG_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/winbond/w83627ehg/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627ehg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627ehg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -28,7 +28,7 @@ extern struct chip_operations superio_winbond_w83627ehg_ops; struct superio_winbond_w83627ehg_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/winbond/w83627ehg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627ehg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627ehg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -114,14 +114,6 @@ return; switch(dev->path.pnp.device) { - case W83627EHG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83627EHG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83627EHG_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/winbond/w83627hf/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627hf/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627hf/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_winbond_w83627hf_ops; struct superio_winbond_w83627hf_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/winbond/w83627hf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627hf/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627hf/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -135,14 +135,6 @@ return; switch(dev->path.pnp.device) { - case W83627HF_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83627HF_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83627HF_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/winbond/w83627thg/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627thg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627thg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_winbond_w83627thg_ops; struct superio_winbond_w83627thg_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/winbond/w83627thg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627thg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627thg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -45,20 +45,11 @@ static void w83627thg_init(device_t dev) { struct superio_winbond_w83627thg_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case W83627THG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83627THG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83627THG_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/winbond/w83627uhg/chip.h ============================================================================== --- trunk/src/superio/winbond/w83627uhg/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627uhg/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_winbond_w83627uhg_ops; struct superio_winbond_w83627uhg_config { - struct uart8250 com1, com2, com3, com4, com5, com6; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/winbond/w83627uhg/superio.c ============================================================================== --- trunk/src/superio/winbond/w83627uhg/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83627uhg/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -73,41 +73,28 @@ static void w83627uhg_init(device_t dev) { struct superio_winbond_w83627uhg_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { case W83627UHG_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com1); break; case W83627UHG_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com2); break; case W83627UHG_SP3: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com3); break; case W83627UHG_SP4: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com4); break; case W83627UHG_SP5: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com5); break; case W83627UHG_SP6: - res0 = find_resource(dev, PNP_IDX_IO0); /* set_uart_clock_source(dev, 0); */ - init_uart8250(res0->base, &conf->com6); break; case W83627UHG_KBC: pc_keyboard_init(&conf->keyboard); Modified: trunk/src/superio/winbond/w83697hf/chip.h ============================================================================== --- trunk/src/superio/winbond/w83697hf/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83697hf/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -26,7 +26,7 @@ extern struct chip_operations superio_winbond_w83697hf_ops; struct superio_winbond_w83697hf_config { - struct uart8250 com1, com2; + }; #endif Modified: trunk/src/superio/winbond/w83697hf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83697hf/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83697hf/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -43,22 +43,8 @@ static void w83697hf_init(device_t dev) { - struct superio_winbond_w83697hf_config *conf = dev->chip_info; - struct resource *res0; - if (!dev->enabled) return; - - switch(dev->path.pnp.device) { - case W83697HF_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83697HF_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; - } } static void w83697hf_pnp_set_resources(device_t dev) Modified: trunk/src/superio/winbond/w83977f/chip.h ============================================================================== --- trunk/src/superio/winbond/w83977f/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83977f/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -27,7 +27,7 @@ extern struct chip_operations superio_winbond_w83977f_ops; struct superio_winbond_w83977f_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/winbond/w83977f/superio.c ============================================================================== --- trunk/src/superio/winbond/w83977f/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83977f/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -44,20 +44,11 @@ static void w83977f_init(device_t dev) { struct superio_winbond_w83977f_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case W83977F_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83977F_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83977F_KBC: pc_keyboard_init(&conf->keyboard); break; Modified: trunk/src/superio/winbond/w83977tf/chip.h ============================================================================== --- trunk/src/superio/winbond/w83977tf/chip.h Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83977tf/chip.h Tue Apr 19 23:33:40 2011 (r6521) @@ -29,7 +29,7 @@ extern struct chip_operations superio_winbond_w83977tf_ops; struct superio_winbond_w83977tf_config { - struct uart8250 com1, com2; + struct pc_keyboard keyboard; }; Modified: trunk/src/superio/winbond/w83977tf/superio.c ============================================================================== --- trunk/src/superio/winbond/w83977tf/superio.c Tue Apr 19 21:57:26 2011 (r6520) +++ trunk/src/superio/winbond/w83977tf/superio.c Tue Apr 19 23:33:40 2011 (r6521) @@ -46,20 +46,11 @@ static void w83977tf_init(device_t dev) { struct superio_winbond_w83977tf_config *conf = dev->chip_info; - struct resource *res0; if (!dev->enabled) return; switch(dev->path.pnp.device) { - case W83977TF_SP1: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com1); - break; - case W83977TF_SP2: - res0 = find_resource(dev, PNP_IDX_IO0); - init_uart8250(res0->base, &conf->com2); - break; case W83977TF_KBC: pc_keyboard_init(&conf->keyboard); break;

1 0

[commit] r6520 - trunk/src/ec/lenovo/pmh7
by repository service 19 Apr '11

19 Apr '11

Author: svens Date: Tue Apr 19 21:57:26 2011 New Revision: 6520 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6520 Log: Lenovo PMH7: add pmh7_touchpad_enable() Signed-off-by: Sven Schnelle <svens(a)stackframe.org> Acked-by: Sven Schnelle <svens(a)stackframe.org> Modified: trunk/src/ec/lenovo/pmh7/pmh7.c trunk/src/ec/lenovo/pmh7/pmh7.h Modified: trunk/src/ec/lenovo/pmh7/pmh7.c ============================================================================== --- trunk/src/ec/lenovo/pmh7/pmh7.c Tue Apr 19 21:34:25 2011 (r6519) +++ trunk/src/ec/lenovo/pmh7/pmh7.c Tue Apr 19 21:57:26 2011 (r6520) @@ -41,6 +41,14 @@ pmh7_register_clear_bit(0x60, 3); } + +void pmh7_touchpad_enable(int onoff) +{ + if (onoff) + pmh7_register_clear_bit(0x51, 2); + else + pmh7_register_set_bit(0x51, 2); +} void pmh7_register_set_bit(int reg, int bit) { char val; Modified: trunk/src/ec/lenovo/pmh7/pmh7.h ============================================================================== --- trunk/src/ec/lenovo/pmh7/pmh7.h Tue Apr 19 21:34:25 2011 (r6519) +++ trunk/src/ec/lenovo/pmh7/pmh7.h Tue Apr 19 21:57:26 2011 (r6520) @@ -33,4 +33,5 @@ void pmh7_backlight_enable(int onoff); void pmh7_dock_event_enable(int onoff); +void pmh7_touchpad_enable(int onoff); #endif

1 0

[PATCH] drop init_uart8250() calls from superio drivers
by Stefan Reinauer 19 Apr '11

19 Apr '11

See patch. With this in place I keep wondering if we couldn't get rid of all (non-early) code of most superio drivers

2 1

[commit] r6519 - in trunk/util/nvramtool: . cli
by repository service 19 Apr '11

19 Apr '11

Author: jakllsch Date: Tue Apr 19 21:34:25 2011 New Revision: 6519 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6519 Log: Cast arguments to ctype(3) functions through (int)(unsigned char). Signed-Off-By: Jonathan Kollasch <jakllsch(a)kollasch.net> Acked-By: Jonathan Kollasch <jakllsch(a)kollasch.net> Modified: trunk/util/nvramtool/cli/nvramtool.c trunk/util/nvramtool/cmos_ops.c Modified: trunk/util/nvramtool/cli/nvramtool.c ============================================================================== --- trunk/util/nvramtool/cli/nvramtool.c Tue Apr 19 21:21:27 2011 (r6518) +++ trunk/util/nvramtool/cli/nvramtool.c Tue Apr 19 21:34:25 2011 (r6519) @@ -800,7 +800,7 @@ case CMOS_ENTRY_STRING: w = (char *)(unsigned long)value; while (*w) { - if(!isprint(*w)) { + if(!isprint((int)(unsigned char)*w)) { if (show_name) printf("# Bad value -> %s\n", e->name); else @@ -846,7 +846,7 @@ uint16_t result; int negative; - for (p = value; isspace(*p); p++) ; + for (p = value; isspace((int)(unsigned char)*p); p++) ; negative = (*p == '-'); n = strtoul(value, (char **)&p, 0); Modified: trunk/util/nvramtool/cmos_ops.c ============================================================================== --- trunk/util/nvramtool/cmos_ops.c Tue Apr 19 21:21:27 2011 (r6518) +++ trunk/util/nvramtool/cmos_ops.c Tue Apr 19 21:34:25 2011 (r6519) @@ -125,7 +125,7 @@ /* See if the first character of 'value_str' (excluding * any initial whitespace) is a minus sign. */ - for (p = value_str; isspace(*p); p++) ; + for (p = value_str; isspace((int)(unsigned char)*p); p++) ; negative = (*p == '-'); out = strtoull(value_str, (char **)&p, 0);

1 0

[commit] r6518 - trunk/src/southbridge/intel/i82371eb
by repository service 19 Apr '11

19 Apr '11

Author: oxygene Date: Tue Apr 19 21:21:27 2011 New Revision: 6518 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6518 Log: Fix compilation of all i82371eb boards when ACPI tables aren't generated Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Modified: trunk/src/southbridge/intel/i82371eb/Makefile.inc Modified: trunk/src/southbridge/intel/i82371eb/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i82371eb/Makefile.inc Tue Apr 19 08:40:56 2011 (r6517) +++ trunk/src/southbridge/intel/i82371eb/Makefile.inc Tue Apr 19 21:21:27 2011 (r6518) @@ -24,8 +24,8 @@ driver-y += usb.c driver-y += smbus.c driver-y += reset.c -driver-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c -driver-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.c +driver-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c +driver-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.c romstage-y += early_pm.c romstage-y += early_smbus.c

1 0

SuperI/O Access (Kernelspace)
by Jeremy Moles 19 Apr '11

19 Apr '11

Hey guys, me again. :) So, my device is working great now that I can access the GPIO pins via userspace (using iotools w/ Tom Sylla's help) and can power on the device. However, I'd like to be able to toggle the power on via a kernel driver as well, but I'm having trouble accessing the same memory range from kernelspace. For example: iotools io_read8 0xA00 Will return the state of the first 5 GPIO pins. I see that iotools calls iopl() to be able to access this location from userspace. When I try to do the same thing in the kernel: unsigned short b; unsigned short* ptr = (unsigned short*)(0xA00); if(access_ok(VERIFY_READ, ptr, 8)) { get_user(b, ptr); ...I immediately get a segfault. From what I've read and seen in other example code, I believe I'm doing this right. However, I may be making some wrong assumptions. I was just curious if anyone would be able to shed some light on the subject--perhaps I'm missing some virtual memory offset functions or similar...

3 3

potentially wrong uses of ifdef/if defined
by Stefan Reinauer 19 Apr '11

19 Apr '11

Hi as you probably know, we are using a slightly modified Kconfig that emits #define CONFIG_FOO 0 for all unset bools in our Kconfig files in order to avoid nasty checks a la #if defined(CONFIG_FOO) && CONFIG_FOO However, this modification to Kconfig was incomplete, and so only some but not all config defines got set correctly. I fixed this bug in r6511 but unfortunately there is a whole lot of code that still uses the old method, sometimes assuming that a value has been set in Kconfig by checking #if defined(CONFIG_FOO) These cases will cause the preprocessor to make the wrong choice and compile the code in, even though the variable is not set in Kconfig. So I did a quick grep over the source code to determine our usage of ifdef, ifndef and if defined. All these occurences might need fixing, but certainly not all of them do. Can someone help with going through these and figuring out which ones need changing and which ones don't? Any help is highly appreciated. Example 1: #if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL can be written as #if CONFIG_PCI_OPTION_ROM_RUN_YABEL Example 2: #ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL needs to be written as #if CONFIG_PCI_OPTION_ROM_RUN_YABEL Example 3: #ifndef CONFIG_TTYS0_BASE is not a bool value, and hence does not have to be changed. Here's the list: ./src/arch/x86/include/bootblock_common.h:#ifdef CONFIG_BOOTBLOCK_CPU_INIT ./src/arch/x86/include/bootblock_common.h:#ifdef CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT ./src/arch/x86/include/bootblock_common.h:#ifdef CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT ./src/devices/oprom/x86emu/debug.h:#ifdef CONFIG_DEFAULT_CONSOLE_LOGLEVEL ./src/devices/oprom/yabel/compat/functions.c:#ifdef CONFIG_YABEL_VIRTMEM_LOCATION ./src/devices/oprom/yabel/device.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/device.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/device.h:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/device.h:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/interrupt.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/interrupt.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/interrupt.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/interrupt.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/interrupt.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/interrupt.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/interrupt.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/io.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/io.c:#ifdef CONFIG_ARCH_X86 ./src/devices/oprom/yabel/io.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/io.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/mem.c:#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/pciexp_device.c:#ifdef CONFIG_PCIE_TUNING ./src/devices/pciexp_device.c:#ifdef CONFIG_PCIE_TUNING ./src/drivers/ati/ragexl/atyfb.h:#ifdef CONFIG_PMAC_PBOOK ./src/lib/jpeg.c:#ifdef CONFIG_PPC ./src/northbridge/via/cn700/raminit.c:#ifdef CONFIG_DEBUG_RAM_SETUP ./src/northbridge/via/vx800/early_smbus.c:#ifdef CONFIG_DEBUG_SMBUS ./src/pc80/i8254.c:#ifdef CONFIG_UDELAY_TIMER2 ./src/southbridge/amd/sb700/early_setup.c:#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 ./src/southbridge/amd/sb700/early_setup.c:#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 ./src/southbridge/amd/sb700/early_setup.c:#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 ./src/southbridge/amd/sb700/early_setup.c:#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 ./src/southbridge/amd/sb700/lpc.c:#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 ./src/southbridge/amd/sb700/sata.c:#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100 ./src/arch/x86/include/arch/pirq_routing.h:#ifndef CONFIG_IRQ_SLOT_COUNT ./src/boot/selfboot.c:#ifndef CONFIG_BIG_ENDIAN ./src/cpu/amd/model_gx2/syspreinit.c:#ifndef CONFIG_CACHE_AS_RAM ./src/cpu/amd/model_lx/syspreinit.c:#ifndef CONFIG_CACHE_AS_RAM ./src/cpu/x86/mtrr/mtrr.c:#ifndef CONFIG_VAR_MTRR_HOLE ./src/devices/oprom/yabel/device.c:#ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/device.c:#ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/device.c:#ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/devices/oprom/yabel/device.c:#ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/include/uart8250.h:#ifndef CONFIG_TTYS0_BASE ./src/include/uart8250.h:#ifndef CONFIG_TTYS0_BAUD ./src/include/uart8250.h:#ifndef CONFIG_TTYS0_DIV ./src/include/uart8250.h:#ifndef CONFIG_TTYS0_LCS ./src/lib/version.c:#ifndef CONFIG_MAINBOARD_VENDOR ./src/lib/version.c:#ifndef CONFIG_MAINBOARD_PART_NUMBER ./src/northbridge/amd/amdk8/coherent_ht.c:#ifndef CONFIG_K8_HT_FREQ_1G_SUPPORT ./src/northbridge/amd/amdk8/coherent_ht.c:#ifndef CONFIG_MAX_PHYSICAL_CPUS_4_BUT_MORE_INSTALLED ./src/northbridge/amd/amdk8/coherent_ht.c:#ifndef CONFIG_ENABLE_APIC_EXT_ID ./src/pc80/mc146818rtc_early.c:#ifndef CONFIG_MAX_REBOOT_CNT ./src/southbridge/amd/amd8111/acpi.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/amd/cimx_wrapper/sb800/bootblock.c:#ifndef CONFIG_TTYS0_DIV ./src/southbridge/amd/rs780/early_setup.c:#ifndef CONFIG_NORTHBRIDGE_AMD_AMDFAM10 ./src/southbridge/amd/sb600/sm.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/amd/sb700/sm.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/amd/sb800/sm.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/intel/esb6300/lpc.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/intel/i3100/lpc.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/intel/i82801cx/lpc.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/intel/i82801dx/i82801dx.h:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/intel/i82801ex/lpc.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/intel/i82801gx/i82801gx.h:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/nvidia/ck804/lpc.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/nvidia/mcp55/lpc.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/sis/sis966/lpc.c:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/southbridge/via/vt8237r/vt8237r.h:#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL ./src/arch/x86/boot/coreboot_table.c:#if defined(CONFIG_BOOTSPLASH) && CONFIG_BOOTSPLASH && CONFIG_COREBOOT_KEEP_FRAMEBUFFER ./src/arch/x86/include/arch/interrupt.h:#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE ./src/arch/x86/include/bootblock_common.h: (defined(CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT) || defined(CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT)) ./src/arch/x86/lib/exception.c:#if defined(CONFIG_GDB_STUB) && CONFIG_GDB_STUB == 1 ./src/arch/x86/lib/ioapic.c:#if defined(CONFIG_EPIA_VT8237R_INIT) && CONFIG_EPIA_VT8237R_INIT ./src/console/post.c:#if !defined(CONFIG_NO_POST) || CONFIG_NO_POST==0 ./src/cpu/amd/car/cache_as_ram.inc:#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE) ./src/cpu/amd/car/cache_as_ram.inc:#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK ./src/cpu/intel/car/cache_as_ram.inc:#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE) ./src/cpu/intel/car/cache_as_ram.inc:#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK ./src/cpu/intel/model_106cx/cache_as_ram.inc:#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE) ./src/cpu/intel/model_106cx/cache_as_ram.inc:#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK ./src/cpu/intel/model_106cx/cache_as_ram.inc:#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1) ./src/cpu/intel/model_6ex/cache_as_ram.inc:#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE) ./src/cpu/intel/model_6ex/cache_as_ram.inc:#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK ./src/cpu/intel/model_6ex/cache_as_ram.inc:#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1) ./src/cpu/intel/model_6fx/cache_as_ram.inc:#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE) ./src/cpu/intel/model_6fx/cache_as_ram.inc:#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK ./src/cpu/intel/model_6fx/cache_as_ram.inc:#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1) ./src/cpu/via/car/cache_as_ram.inc:#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK ./src/cpu/x86/lapic/lapic_cpu_init.c:#if !defined (CONFIG_CPU_AMD_MODEL_10XXX) && !defined (CONFIG_CPU_AMD_MODEL_14XXX) ./src/cpu/x86/lapic/lapic_cpu_init.c:#if !defined (CONFIG_CPU_AMD_MODEL_10XXX) && !defined (CONFIG_CPU_AMD_MODEL_14XXX) ./src/cpu/x86/mtrr/earlymtrr.c:#if !defined(CONFIG_CACHE_AS_RAM) || (CONFIG_CACHE_AS_RAM == 0) ./src/cpu/x86/mtrr/earlymtrr.c:#if defined(CONFIG_XIP_ROM_SIZE) ./src/devices/oprom/x86.c:#if defined(CONFIG_GEODE_VSA) && CONFIG_GEODE_VSA ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_JMP) && CONFIG_X86EMU_DEBUG_JMP ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_TRACE) && CONFIG_X86EMU_DEBUG_TRACE ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_PNP) && CONFIG_X86EMU_DEBUG_PNP ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_DISK) && CONFIG_X86EMU_DEBUG_DISK ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_PMM) && CONFIG_X86EMU_DEBUG_PMM ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_VBE) && CONFIG_X86EMU_DEBUG_VBE ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_INT10) && CONFIG_X86EMU_DEBUG_INT10 ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_INTERRUPTS) && CONFIG_X86EMU_DEBUG_INTERRUPTS ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_CHECK_VMEM_ACCESS) && CONFIG_X86EMU_DEBUG_CHECK_VMEM_ACCESS ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_MEM) && CONFIG_X86EMU_DEBUG_MEM ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG_IO) && CONFIG_X86EMU_DEBUG_IO ./src/devices/oprom/yabel/biosemu.c:#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG ./src/devices/oprom/yabel/compat/functions.c:#if !defined(CONFIG_YABEL_DIRECTHW) || (!CONFIG_YABEL_DIRECTHW) ./src/devices/oprom/yabel/debug.h:#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG ./src/devices/oprom/yabel/device.c:#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG ./src/devices/oprom/yabel/device.c:#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG ./src/devices/oprom/yabel/device.c:#if defined(CONFIG_X86EMU_DEBUG) && CONFIG_X86EMU_DEBUG ./src/devices/oprom/yabel/interrupt.c:#if defined(CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES) && CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES==1 ./src/devices/oprom/yabel/interrupt.c:#if defined(CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES) && CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES==1 ./src/devices/oprom/yabel/io.c:#if defined(CONFIG_YABEL_DIRECTHW) && (CONFIG_YABEL_DIRECTHW == 1) ./src/devices/oprom/yabel/io.c:#if defined(CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES) && CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES==1 ./src/devices/oprom/yabel/mem.c:#if !defined(CONFIG_YABEL_DIRECTHW) || (!CONFIG_YABEL_DIRECTHW) ./src/devices/pci_rom.c:#if defined(CONFIG_BOARD_EMULATION_QEMU_X86) && CONFIG_BOARD_EMULATION_QEMU_X86 ./src/include/assert.h:#if defined(__PRE_RAM__) && !CONFIG_CACHE_AS_RAM ./src/include/cpu/cpu.h:#if !defined(CONFIG_WAIT_BEFORE_CPUS_INIT) || CONFIG_WAIT_BEFORE_CPUS_INIT==0 ./src/include/cpu/x86/mtrr.h:#if defined(CONFIG_XIP_ROM_SIZE) && !defined(CONFIG_XIP_ROM_BASE) ./src/include/cpu/x86/mtrr.h:#if defined(CONFIG_XIP_ROM_BASE) && !defined(CONFIG_XIP_ROM_SIZE) ./src/include/cpu/x86/mtrr.h:#if !defined(CONFIG_RAMTOP) ./src/include/cpu/x86/mtrr.h:# error "CONFIG_RAMTOP not defined" ./src/include/cpu/x86/mtrr.h:#if defined(CONFIG_XIP_ROM_SIZE) && ((CONFIG_XIP_ROM_SIZE & (CONFIG_XIP_ROM_SIZE -1)) != 0) ./src/include/cpu/x86/mtrr.h:#if defined(CONFIG_XIP_ROM_SIZE) && ((CONFIG_XIP_ROM_BASE % CONFIG_XIP_ROM_SIZE) != 0) ./src/include/cpu/x86/mtrr.h:#if defined(CONFIG_XIP_ROM_SIZE) ./src/include/cpu/x86/mtrr.h:# if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK ./src/include/lib.h:#if defined(CONFIG_CPU_AMD_LX) && CONFIG_CPU_AMD_LX ./src/lib/fallback_boot.c:#if defined(CONFIG_BOOTSPLASH) && CONFIG_BOOTSPLASH && !CONFIG_COREBOOT_KEEP_FRAMEBUFFER ./src/lib/uart8250.c:#if CONFIG_USE_OPTION_TABLE && !defined(__SMM__) ./src/lib/version.c:#error CONFIG_MAINBOARD_VENDOR not defined ./src/lib/version.c:#error CONFIG_MAINBOARD_PART_NUMBER not defined ./src/mainboard/kontron/986lcd-m/mainboard.c:#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/mainboard/kontron/986lcd-m/mainboard.c:#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/mainboard/kontron/986lcd-m/mainboard.c:#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/northbridge/amd/amdk8/f.h:#if ((CONFIG_MEM_TRAIN_SEQ != 1) && defined(__PRE_RAM__)) || \ ./src/northbridge/amd/amdk8/f.h: ((CONFIG_MEM_TRAIN_SEQ == 1) && !defined(__PRE_RAM__)) ./src/northbridge/amd/amdk8/raminit.h:#if defined(__PRE_RAM__) && CONFIG_RAMINIT_SYSINFO ./src/northbridge/amd/amdk8/raminit_f.c:#if !defined(CONFIG_INTERLEAVE_CHIP_SELECTS) || (CONFIG_INTERLEAVE_CHIP_SELECTS == 0) ./src/northbridge/amd/amdk8/raminit_f.c:#if defined(CONFIG_MAX_MEM_CLOCK) ./src/northbridge/amd/amdk8/raminit_f.c:#if defined(CONFIG_ECC_MEMORY) && (CONFIG_ECC_MEMORY == 0) ./src/northbridge/intel/i82830/smihandler.c:#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL && !CONFIG_YABEL_DIRECTHW ./src/northbridge/intel/i82830/vga.c:#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/northbridge/intel/i82830/vga.c:#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL ./src/northbridge/intel/i945/raminit.c:#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) ./src/northbridge/intel/i945/raminit.c:#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) ./src/northbridge/intel/i945/raminit.c:#elif defined(CONFIG_NORTHBRIDGE_INTEL_I945GC) ./src/northbridge/intel/i945/raminit.c:#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) ./src/northbridge/intel/i945/raminit.c:#elif defined(CONFIG_NORTHBRIDGE_INTEL_I945GC) ./src/northbridge/intel/i945/raminit.c:#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) ./src/northbridge/intel/i945/raminit.c:#elif defined(CONFIG_NORTHBRIDGE_INTEL_I945GC) ./src/northbridge/intel/i945/raminit.c:#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM) ./src/northbridge/intel/i945/raminit.c:#elif defined(CONFIG_NORTHBRIDGE_INTEL_I945GC) ./src/southbridge/ti/pci1x2x/pci1x2x.c:#if (!defined(CONFIG_TI_PCMCIA_CARDBUS_CMDR) || \ ./src/southbridge/ti/pci1x2x/pci1x2x.c: !defined(CONFIG_TI_PCMCIA_CARDBUS_CLSR) || \ ./src/southbridge/ti/pci1x2x/pci1x2x.c: !defined(CONFIG_TI_PCMCIA_CARDBUS_CLTR) || \ ./src/southbridge/ti/pci1x2x/pci1x2x.c: !defined(CONFIG_TI_PCMCIA_CARDBUS_BCR) || \ ./src/southbridge/ti/pci1x2x/pci1x2x.c: !defined(CONFIG_TI_PCMCIA_CARDBUS_SCR) || \ ./src/southbridge/ti/pci1x2x/pci1x2x.c: !defined(CONFIG_TI_PCMCIA_CARDBUS_MRR)) ./src/southbridge/via/k8t890/early_car.c:#if defined(CONFIG_SOUTHBRIDGE_VIA_K8M800) ./src/southbridge/via/k8t890/early_car.c:#elif defined(CONFIG_SOUTHBRIDGE_VIA_K8T800) ./src/southbridge/via/k8t890/early_car.c:#elif defined(CONFIG_SOUTHBRIDGE_VIA_K8T800PRO) ./src/southbridge/via/k8t890/early_car.c:#elif defined(CONFIG_SOUTHBRIDGE_VIA_K8M890) ./src/southbridge/via/k8t890/early_car.c:#elif defined(CONFIG_SOUTHBRIDGE_VIA_K8T890) ./src/southbridge/via/vt8237r/lpc.c: #if defined(CONFIG_SOUTHBRIDGE_VIA_K8T800) ./src/superio/ite/it8716f/it8716f.h:#if defined(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) && CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL ./src/superio/ite/it8716f/superio.c:#if !defined(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) || !CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL

2 1

[commit] r6517 - trunk/src/northbridge/amd/amdht
by repository service 18 Apr '11

18 Apr '11

Author: zbao Date: Tue Apr 19 08:40:56 2011 New Revision: 6517 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6517 Log: The "temp" will be used later. So it has to be calculated correctly. Comment by Peter, The variable name "temp" unfortunately does not explain what the value is. The commit message also does not have hints. Hopefully in the future it's possible to also use a brief moment to improve the clarity of the code, while it is already being fixed for some other reason. Ie. fixing up variable names, writing particularly informative commit messages, or of course both at the same time! :) Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Acked-by: Marc Jones <marcj303(a)gmail.com> Modified: trunk/src/northbridge/amd/amdht/h3ncmn.c Modified: trunk/src/northbridge/amd/amdht/h3ncmn.c ============================================================================== --- trunk/src/northbridge/amd/amdht/h3ncmn.c Tue Apr 19 03:36:24 2011 (r6516) +++ trunk/src/northbridge/amd/amdht/h3ncmn.c Tue Apr 19 08:40:56 2011 (r6517) @@ -565,7 +565,8 @@ /* bits[15,13,12] specify the cores */ /* Support Downcoring */ - cores = ((temp & 8) >> 1) + (temp & 3) + 1; + temp = ((temp & 8) >> 1) + (temp & 3); + cores = temp + 1; AmdPCIReadBits (MAKE_SBDFO(makePCISegmentFromNode(node), makePCIBusFromNode(node), makePCIDeviceFromNode(node),

1 0

build service results for r6516
by repository service 18 Apr '11

18 Apr '11

Dear coreboot readers! This is the automatic build system of coreboot. The developer "stepan" checked in revision 6516 to the coreboot repository. This caused the following changes: Change Log: Recently the 3 projects using the new AMD reference code have been failing the check for globals (or statics) in romstage. This causes ASRock E350M1, AMD Inagua, and AMD Persimmon builds to fail with the message "Do not use global variables in romstage". The message is working as intended. It is detecting data declared as 'static' when 'static const' was intended. The code executes correctly because it never tries to modify the data. To make reference code updates easy, it is probably best to avoid modifying the AMD provided code if possible. The following change bypasses the "Do not use global variables in romstage" check for the AMD reference code only. Signed-off-by: Scott Duplichan <scott(a)notabs.org> Acked-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Build Log: Compilation of amd:inagua has been fixed Compilation of amd:persimmon has been fixed Compilation of asrock:e350m1 has been fixed If something broke during this checkin please be a pain in stepan's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot April 2011