coreboot August 2010

coreboot@coreboot.org

67 participants
267 discussions

[inteltool] added initial support of CPU extended information and non-Intel CPU's
by Антон Кочков 26 Aug '10

26 Aug '10

inteltool: added initial support of cpu_info extended information inteltool: added initial support for other cpu's inteltool: dumping MSR registers for Intel Celeron M 743 Signed-off-by: Anton Kochkov <anton.kochkov(a)gmail.com> ---

2 1

Re: [coreboot] Building coreboot BIOS on a Windows computer
by anders＠jenbo.dk 26 Aug '10

26 Aug '10

Theis is very nice and probably needed in the long run. Mvh Anders ----- Reply message ----- Fra: "Patrick Georgi" <patrick(a)georgi-clan.de> Dato: tor., aug. 26, 2010 08:17 Emne: [coreboot] Building coreboot BIOS on a Windows computer Til: <coreboot(a)coreboot.org> Am 26.08.2010 06:44, schrieb Scott: > Hello coreboot folks, > > I know the developers here use linux, but many other bios developers > are more comfortable with windows. Fortunately, it is easy to build > coreboot using a Windows machine. The example below demonstrates using > the current coreboot version, 5740. > > http://notabs.org/coreboot/corebootWindowsBuild.htm Thanks for the write-up. I can only propose to use Console2, with gives a little more space than 80x25. See http://sourceforge.net/projects/console/ There are some other tweaks I have, but I don't have a list of them around - eventually I'll build a coreboot SDK which packages msys, cross compiler toolchain and other bits in a single neat installer, but I guess that will take a while. Patrick -- coreboot mailing list: coreboot(a)coreboot.org http://www.coreboot.org/mailman/listinfo/coreboot

1 0

[commit] r5740 - in trunk/src: mainboard/getac/p470 mainboard/kontron/986lcd-m mainboard/roda/rk886ex northbridge/intel/i945
by repository service 25 Aug '10

25 Aug '10

Author: stepan Date: Wed Aug 25 20:35:42 2010 New Revision: 5740 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5740 Log: Fix i945 based boards - prevent GCC from inlining do_ram_command - it will break RAM initialization. - fix the PCIRST# mechanism in those boards that do it, it requires 200ms, not 200us - move PCIRST# as early as possible (before ich7_enable_lpc) Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Corey Osgood <corey.osgood(a)gmail.com> Modified: trunk/src/mainboard/getac/p470/romstage.c trunk/src/mainboard/kontron/986lcd-m/romstage.c trunk/src/mainboard/roda/rk886ex/romstage.c trunk/src/northbridge/intel/i945/raminit.c Modified: trunk/src/mainboard/getac/p470/romstage.c ============================================================================== --- trunk/src/mainboard/getac/p470/romstage.c Tue Aug 24 14:58:17 2010 (r5739) +++ trunk/src/mainboard/getac/p470/romstage.c Wed Aug 25 20:35:42 2010 (r5740) @@ -308,9 +308,8 @@ #if 0 /* Force PCIRST# */ pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, SBR); - udelay(200); + udelay(200 * 1000); pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, 0); - udelay(200); #endif ich7_enable_lpc(); Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/romstage.c Tue Aug 24 14:58:17 2010 (r5739) +++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Wed Aug 25 20:35:42 2010 (r5740) @@ -366,14 +366,12 @@ enable_lapic(); } - ich7_enable_lpc(); - /* Force PCIRST# */ pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, SBR); - udelay(200); + udelay(200 * 1000); pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, 0); - udelay(200); + ich7_enable_lpc(); early_superio_config_w83627thg(); /* Set up the console */ Modified: trunk/src/mainboard/roda/rk886ex/romstage.c ============================================================================== --- trunk/src/mainboard/roda/rk886ex/romstage.c Tue Aug 24 14:58:17 2010 (r5739) +++ trunk/src/mainboard/roda/rk886ex/romstage.c Wed Aug 25 20:35:42 2010 (r5740) @@ -279,11 +279,12 @@ enable_lapic(); } - ich7_enable_lpc(); - /* Force PCIRST# */ pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, SBR); + udelay(200 * 1000); + pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, 0); + ich7_enable_lpc(); early_superio_config(); /* Set up the console */ Modified: trunk/src/northbridge/intel/i945/raminit.c ============================================================================== --- trunk/src/northbridge/intel/i945/raminit.c Tue Aug 24 14:58:17 2010 (r5739) +++ trunk/src/northbridge/intel/i945/raminit.c Wed Aug 25 20:35:42 2010 (r5740) @@ -45,7 +45,7 @@ #define RAM_EMRS_2 (0x1 << 21) #define RAM_EMRS_3 (0x2 << 21) -static void do_ram_command(u32 command) +static __attribute__((noinline)) void do_ram_command(u32 command) { u32 reg32;

1 0

[PATCH] Fix i945 port
by Stefan Reinauer 25 Aug '10

25 Aug '10

See patch -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

2 1

[inteltool] added initial support of CPU extended information
by Антон Кочков 25 Aug '10

25 Aug '10

inteltool: added initial support of cpu_info extended information inteltool: dumping MSR registers for Intel Celeron M 743 Signed-off-by: Anton Kochkov <anton.kochkov(a)gmail.com> ---

1 1

[PATCH] hardcoded bdf numbers in sb700_early_init.c get serial output on ASUS M4A77TD-PRO
by xdrudis 24 Aug '10

24 Aug '10

Hello. I rewrote my earlier patch to romcc_io.h (where I banned some device ranges from pci_locate_device) because it was too aggressive. With this patch to sb700_early_setup.c I achieve the same on my board (serial output, and it hangs in the same place), but hopefully with less breakage for other boards. I first tried to hardcode PCI bus, device and function in sb700_lpc_init() only but it did hang elsewhere, so I finally thought it more coherent to hardcode all devices in the file than just some functions, and it works for me. I still have the doubt of why was there a pci_locate_device in the first place, since from my more than limited knowledge it does not look like the devices in sb700 may appear in other bus,device,function addresses. But the original even had an error message at one place for when the device was not found. Please review and/or test and commit if you think appropiate (I guess it's not urgent, since my board still does not boot). This patch applies to svn 5739 Signed-off-by: Xavi Drudis Ferran <xdrudis(a)tinet.cat> --- Thank you for commiting my previous patches. Now I plan to have a look at fidvid.c and AMD's Bios and Kernel Developer Guide. I'm not sure I'll be able to fix much, and it may take me a while. I guess it's better not to send patches or anything until I get something that works for me.

1 0

[PATCH] YABEL warnings
by Myles Watson 24 Aug '10

24 Aug '10

This patch fixes some compile-time warnings for some settings of CONFIG_EXPERT, CONFIG_YABEL_DIRECTHW, and CONFIG_X86EMU_DEBUG. Many of the changes are to white space, because a large macro was converted into an inline function. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Thanks, Myles

1 2

inteltool: added initial support of CPU extended information
by Антон Кочков 24 Aug '10

24 Aug '10

inteltool: added initial support of cpu_info extended information inteltool: dumping MSR registers for Intel Celeron M 743 Signed-off-by: Anton Kochkov <anton.kochkov(a)gmail.com> ---

1 0

[commit] r5739 - in trunk/src: mainboard/pcengines mainboard/pcengines/alix2d3 northbridge/amd/lx
by repository service 24 Aug '10

24 Aug '10

Author: oxygene Date: Tue Aug 24 14:58:17 2010 New Revision: 5739 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5739 Log: * Adds support for PC Engines Alix.2D(1)3 board to Coreboot. * DRAM initialization done message is now printed in debug-mode only, rather than everytime. Signed-off-by: Aurelien Guillaume <aurelien(a)iwi.me> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Added: trunk/src/mainboard/pcengines/alix2d3/ - copied from r5737, trunk/src/mainboard/pcengines/alix1c/ Modified: trunk/src/mainboard/pcengines/Kconfig trunk/src/mainboard/pcengines/alix2d3/Kconfig trunk/src/mainboard/pcengines/alix2d3/devicetree.cb trunk/src/mainboard/pcengines/alix2d3/irq_tables.c trunk/src/mainboard/pcengines/alix2d3/mainboard.c trunk/src/mainboard/pcengines/alix2d3/romstage.c trunk/src/northbridge/amd/lx/raminit.c Modified: trunk/src/mainboard/pcengines/Kconfig ============================================================================== --- trunk/src/mainboard/pcengines/Kconfig Mon Aug 23 20:43:27 2010 (r5738) +++ trunk/src/mainboard/pcengines/Kconfig Tue Aug 24 14:58:17 2010 (r5739) @@ -3,6 +3,7 @@ depends on VENDOR_PC_ENGINES source "src/mainboard/pcengines/alix1c/Kconfig" +source "src/mainboard/pcengines/alix2d3/Kconfig" endchoice Modified: trunk/src/mainboard/pcengines/alix2d3/Kconfig ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/Kconfig Sun Aug 22 22:02:27 2010 (r5737) +++ trunk/src/mainboard/pcengines/alix2d3/Kconfig Tue Aug 24 14:58:17 2010 (r5739) @@ -1,10 +1,9 @@ -config BOARD_PCENGINES_ALIX1C - bool "ALIX.1C" +config BOARD_PCENGINES_ALIX2D3 + bool "ALIX.2D3" select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX select SOUTHBRIDGE_AMD_CS5536 - select SUPERIO_WINBOND_W83627HF select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC @@ -13,20 +12,20 @@ config MAINBOARD_DIR string - default pcengines/alix1c - depends on BOARD_PCENGINES_ALIX1C + default pcengines/alix2d3 + depends on BOARD_PCENGINES_ALIX2D3 config MAINBOARD_PART_NUMBER string - default "ALIX.1C" - depends on BOARD_PCENGINES_ALIX1C + default "ALIX.2D3" + depends on BOARD_PCENGINES_ALIX2D3 config IRQ_SLOT_COUNT int - default 5 - depends on BOARD_PCENGINES_ALIX1C + default 6 + depends on BOARD_PCENGINES_ALIX2D3 config RAMBASE hex default 0x4000 - depends on BOARD_PCENGINES_ALIX1C + depends on BOARD_PCENGINES_ALIX2D3 Modified: trunk/src/mainboard/pcengines/alix2d3/devicetree.cb ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/devicetree.cb Sun Aug 22 22:02:27 2010 (r5737) +++ trunk/src/mainboard/pcengines/alix2d3/devicetree.cb Tue Aug 24 14:58:17 2010 (r5739) @@ -8,9 +8,9 @@ # Invert mask = IRQ 12 and 1 are active high. Keyboard and Mouse IRQs. OK # How to get these? Boot linux and do this: # rdmsr 0x51400025 - register "lpc_serirq_enable" = "0x0000105a" + register "lpc_serirq_enable" = "0x00001002" # rdmsr 0x5140004e -- polairy is high 16 bits of low 32 bits - register "lpc_serirq_polarity" = "0x0000EFA5" + register "lpc_serirq_polarity" = "0x0000EFFD" # mode is high 10 bits (determined from code) register "lpc_serirq_mode" = "1" # Don't yet know how to find this. @@ -18,59 +18,19 @@ register "enable_ide_nand_flash" = "0" # 0:ide mode, 1:flash register "enable_USBP4_device" = "0" #0: host, 1:device register "enable_USBP4_overcurrent" = "0" #0:off, xxxx:overcurrent setting CS5536 Data Book (pages 380-381) - register "com1_enable" = "0" + register "com1_enable" = "1" register "com1_address" = "0x3F8" register "com1_irq" = "4" - register "com2_enable" = "0" + register "com2_enable" = "1" # Wired on Alix.2D13 only register "com2_address" = "0x2F8" register "com2_irq" = "3" - register "unwanted_vpci[0]" = "0" # End of list has a zero - device pci f.0 on # ISA Bridge - chip superio/winbond/w83627hf - device pnp 2e.0 off # Floppy - io 0x60 = 0x3f0 - irq 0x70 = 6 - drq 0x74 = 2 - end - device pnp 2e.1 on # Parallel Port - io 0x60 = 0x378 - irq 0x70 = 7 - end - device pnp 2e.2 on # Com1 - io 0x60 = 0x3f8 - irq 0x70 = 4 - end - device pnp 2e.3 on # Com2 - io 0x60 = 0x2f8 - irq 0x70 = 3 - end - device pnp 2e.5 on # Keyboard - io 0x60 = 0x60 - io 0x62 = 0x64 - irq 0x70 = 1 - irq 0x72 = 12 - end - device pnp 2e.6 off # CIR - io 0x60 = 0x100 - end - device pnp 2e.7 off # GAME_MIDI_GIPO1 - io 0x60 = 0x220 - io 0x62 = 0x300 - irq 0x70 = 9 - end - device pnp 2e.8 on end # GPIO2 - device pnp 2e.9 on end # GPIO3 - device pnp 2e.a on end # ACPI - device pnp 2e.b on # HW Monitor - io 0x60 = 0x290 - irq 0x70 = 5 - end - end - end + register "unwanted_vpci[0]" = "0x80000900" # Disable VGA controller (not wired) + register "unwanted_vpci[1]" = "0x80007B00" # Disable AC97 controller (not wired) + register "unwanted_vpci[2]" = "0" # End of list has a zero + device pci f.0 on end # ISA Bridge device pci f.1 on end # Flash controller device pci f.2 on end # IDE controller - device pci f.3 on end # Audio - device pci f.4 on end # OHCI + device pci f.4 on end # OHCI device pci f.5 on end # EHCI end end Modified: trunk/src/mainboard/pcengines/alix2d3/irq_tables.c ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/irq_tables.c Sun Aug 22 22:02:27 2010 (r5737) +++ trunk/src/mainboard/pcengines/alix2d3/irq_tables.c Tue Aug 24 14:58:17 2010 (r5739) @@ -41,33 +41,34 @@ #define L_PIRQD 4 /* Means Slot INTx# Connects To Chipset INTD# */ /* - * ALIX1.C interrupt wiring. + * ALIX.2D3 interrupt wiring. * * Devices are: - * - * 00:01.0 Host bridge: Advanced Micro Devices [AMD] CS5536 [Geode companion] Host Bridge (rev 31) - * 00:01.2 Entertainment encryption device: Advanced Micro Devices [AMD] Geode LX AES Security Block - * 00:0d.0 Ethernet controller: VIA Technologies, Inc. VT6105M [Rhine-III] (rev 96) - * 00:0e.0 Network controller: Intersil Corporation Prism 2.5 Wavelan chipset (rev 01) - * 00:0f.0 ISA bridge: Advanced Micro Devices [AMD] CS5536 [Geode companion] ISA (rev 03) - * 00:0f.2 IDE interface: Advanced Micro Devices [AMD] CS5536 [Geode companion] IDE (rev 01) - * 00:0f.3 Multimedia audio controller: Advanced Micro Devices [AMD] CS5536 [Geode companion] Audio (rev 01) - * 00:0f.4 USB Controller: Advanced Micro Devices [AMD] CS5536 [Geode companion] OHC (rev 02) - * 00:0f.5 USB Controller: Advanced Micro Devices [AMD] CS5536 [Geode companion] EHC (rev 02) - * - * The only devices that interrupt are: + * 00:01.0 Host bridge [0600]: Advanced Micro Devices [AMD] CS5536 [Geode companion] Host Bridge [1022:2080] (rev 33) + * 00:01.2 Entertainment encryption device [1010]: Advanced Micro Devices [AMD] Geode LX AES Security Block [1022:2082] + * 00:09.0 Ethernet controller [0200]: VIA Technologies, Inc. VT6105M [Rhine-III] [1106:3053] (rev 96) + * 00:0a.0 Ethernet controller [0200]: VIA Technologies, Inc. VT6105M [Rhine-III] [1106:3053] (rev 96) + * 00:0b.0 Ethernet controller [0200]: VIA Technologies, Inc. VT6105M [Rhine-III] [1106:3053] (rev 96) + * 00:0f.0 ISA bridge [0601]: Advanced Micro Devices [AMD] CS5536 [Geode companion] ISA [1022:2090] (rev 03) + * 00:0f.2 IDE interface [0101]: Advanced Micro Devices [AMD] CS5536 [Geode companion] IDE [1022:209a] (rev 01) + * 00:0f.4 USB Controller [0c03]: Advanced Micro Devices [AMD] CS5536 [Geode companion] OHC [1022:2094] (rev 02) + * 00:0f.5 USB Controller [0c03]: Advanced Micro Devices [AMD] CS5536 [Geode companion] EHC [1022:2095] (rev 02) + + * The only devices that interrupt are: * * What Device IRQ PIN PIN WIRED TO * ------------------------------------------------- * AES 00:01.2 0a 01 A A - * 3VPCI 00:0c.0 0a 01 A A - * eth0 00:0d.0 0b 01 A B - * mpci 00:0e.0 0a 01 A A - * usb 00:0f.3 0b 02 B B + * eth0 00:09.0 0b 01 A B + * eth1 00:0a.0 0b 01 A C + * eth2 00:0b.0 0b 01 A D + * mpci 00:0c.0 0a 01 A A + * mpci 00:0c.0 0b 02 B B * usb 00:0f.4 0b 04 D D * usb 00:0f.5 0b 04 D D * - * The only swizzled interrupt is eth0, where INTA is wired to interrupt controller line B. + * The only swizzled interrupts are the ethernet controllers, where INTA is wired to + * interrupt controller lines B, C and D. */ const struct irq_routing_table intel_irq_routing_table = { @@ -90,14 +91,17 @@ /* CPU */ {0x00, (0x01 << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, - /* PCI (slot 1) */ - {0x00, (0x0C << 3) | 0x0, {{L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}, {L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}}, 0x4, 0x0}, + /* On-board ethernet (Left) */ + {0x00, (0x09 << 3) | 0x0, {{L_PIRQB, M_PIRQB}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, + + /* On-board ethernet (Middle) */ + {0x00, (0x0A << 3) | 0x0, {{L_PIRQC, M_PIRQC}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, - /* On-board ethernet */ - {0x00, (0x0D << 3) | 0x0, {{L_PIRQB, M_PIRQB}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, + /* On-board ethernet (Right) */ + {0x00, (0x0B << 3) | 0x0, {{L_PIRQD, M_PIRQD}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, - /* Mini PCI (slot 2) */ - {0x00, (0x0E << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}}, 0x1, 0x0}, + /* Mini PCI (slot 1) */ + {0x00, (0x0C << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, /* Chipset slots -- f.3 wires to B, and f.4 and f.5 wires to D. */ {0x00, (0x0F << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}}, 0x0, 0x0}, Modified: trunk/src/mainboard/pcengines/alix2d3/mainboard.c ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/mainboard.c Sun Aug 22 22:02:27 2010 (r5737) +++ trunk/src/mainboard/pcengines/alix2d3/mainboard.c Tue Aug 24 14:58:17 2010 (r5739) @@ -23,8 +23,8 @@ static void init(struct device *dev) { - printk(BIOS_DEBUG, "ALIX1.C ENTER %s\n", __func__); - printk(BIOS_DEBUG, "ALIX1.C EXIT %s\n", __func__); + printk(BIOS_DEBUG, "ALIX.2D3 ENTER %s\n", __func__); + printk(BIOS_DEBUG, "ALIX.2D3 EXIT %s\n", __func__); } static void enable_dev(struct device *dev) @@ -33,7 +33,7 @@ } struct chip_operations mainboard_ops = { - CHIP_NAME("PC Engines ALIX1.C Mainboard") + CHIP_NAME("PC Engines ALIX.2D3 Mainboard") .enable_dev = enable_dev, }; Modified: trunk/src/mainboard/pcengines/alix2d3/romstage.c ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/romstage.c Sun Aug 22 22:02:27 2010 (r5737) +++ trunk/src/mainboard/pcengines/alix2d3/romstage.c Tue Aug 24 14:58:17 2010 (r5739) @@ -35,13 +35,12 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) -/* The ALIX1.C has no SMBus; the setup is hard-wired. */ +/* The ALIX.2D3 has no SMBus; the setup is hard-wired. */ static void cs5536_enable_smbus(void) { } #include "southbridge/amd/cs5536/cs5536_early_setup.c" -#include "superio/winbond/w83627hf/w83627hf_early_serial.c" /* The part is a Hynix hy5du121622ctp-d43. * @@ -120,6 +119,34 @@ /** Early mainboard specific GPIO setup. */ static void mb_gpio_init(void) { + /* + * Disable power button, since it is hardwired to ground on this board, + * and the power would be cut off atfer a 4-second delay otherwise. + */ + outl(0x00020000, PMS_IO_BASE + 0x40); + + /* + * Enable LEDs GPIO outputs to light up the leds + * This is how the original tinyBIOS sets them after boot. + * Info: GPIO_IO_BASE, 0x6100, is only valid before PCI init, so it + * may be used here, but not after PCI Init. + * Note: Prior to a certain release, Linux used a hardwired 0x6100 in the + * leds-alix2.c driver. Coreboot dynamically assigns this space, + * so the driver does not work anymore. + * Good workaround: use the newer driver + * Ugly workaround: $ wrmsr 0x5140000C 0xf00100006100 + * This resets the GPIO I/O space to 0x6100. + * This may break other things, though. + */ + outl(1 << 6, GPIO_IO_BASE + GPIOL_OUTPUT_ENABLE); + outl(1 << 9, GPIO_IO_BASE + GPIOH_OUTPUT_ENABLE); + outl(1 << 11, GPIO_IO_BASE + GPIOH_OUTPUT_ENABLE); + + /* outl(1 << 6, GPIO_IO_BASE + GPIOL_OUTPUT_VALUE); */ /* Led 1 enabled */ + outl(1 << 9, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE); /* Led 2 disabled */ + outl(1 << 11, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE); /* Led 3 disabled */ + + } void main(unsigned long bist) @@ -138,8 +165,7 @@ /* NOTE: Must do this AFTER cs5536_early_setup()! * It is counting on some early MSR setup for the CS5536. */ - cs5536_disable_internal_uart(); - w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + cs5536_setup_onchipuart(1); mb_gpio_init(); uart_init(); console_init(); Modified: trunk/src/northbridge/amd/lx/raminit.c ============================================================================== --- trunk/src/northbridge/amd/lx/raminit.c Mon Aug 23 20:43:27 2010 (r5738) +++ trunk/src/northbridge/amd/lx/raminit.c Tue Aug 24 14:58:17 2010 (r5739) @@ -739,7 +739,7 @@ msr.lo |= (209 << 8); /* bits[15:8] = 209 */ wrmsr(msrnum, msr); - print_emerg("DRAM controller init done.\n"); + banner("DRAM controller init done.\n"); post_code(POST_MEM_SETUP_GOOD); //0x7E /* make sure there is nothing stale in the cache */

1 0

[FILO] r137 - in trunk/filo: . configs drivers drivers/newusb drivers/usb fs include main
by repository service 24 Aug '10

24 Aug '10

Author: oxygene Date: Tue Aug 24 13:36:51 2010 New Revision: 137 URL: http://tracker.coreboot.org/trac/filo/changeset/137 Log: Drop old USB driver, and remove the "new" moniker from the new USB driver. Also move usb driver out of its own directory - it's just one file. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Added: trunk/filo/drivers/usb.c - copied, changed from r136, trunk/filo/drivers/newusb/usb.c Deleted: trunk/filo/drivers/newusb/ trunk/filo/drivers/usb/ Modified: trunk/filo/Config.in trunk/filo/Makefile trunk/filo/configs/defconfig trunk/filo/drivers/Makefile.inc trunk/filo/fs/blockdev.c trunk/filo/include/fs.h trunk/filo/main/filo.c Modified: trunk/filo/Config.in ============================================================================== --- trunk/filo/Config.in Tue Aug 17 12:14:40 2010 (r136) +++ trunk/filo/Config.in Tue Aug 24 13:36:51 2010 (r137) @@ -129,19 +129,12 @@ help Jens Axboe's fine IDE driver -config USB_NEW_DISK +config USB_DISK bool "USB Stack" default y help Driver for USB Storage -config USB_DISK - bool "Old USB Stack (obsolete?)" - default n - depends on !USB_NEW_DISK - help - Driver for USB Storage - config FLASH_DISK bool "NAND Flash support" default n Modified: trunk/filo/Makefile ============================================================================== --- trunk/filo/Makefile Tue Aug 17 12:14:40 2010 (r136) +++ trunk/filo/Makefile Tue Aug 24 13:36:51 2010 (r137) @@ -72,7 +72,7 @@ BUILD-y := main/Makefile.inc main/grub/Makefile.inc fs/Makefile.inc BUILD-y += drivers/Makefile.inc -BUILD-y += drivers/usb/Makefile.inc drivers/newusb/Makefile.inc drivers/flash/Makefile.inc +BUILD-y += drivers/flash/Makefile.inc include $(PLATFORM-y) $(BUILD-y) @@ -151,7 +151,7 @@ prepare: $(Q)mkdir -p $(obj)/util/kconfig/lxdialog - $(Q)mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash $(obj)/drivers/usb $(obj)/drivers/newusb + $(Q)mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash $(Q)mkdir -p $(obj)/main/grub clean: Modified: trunk/filo/configs/defconfig ============================================================================== --- trunk/filo/configs/defconfig Tue Aug 17 12:14:40 2010 (r136) +++ trunk/filo/configs/defconfig Tue Aug 24 13:36:51 2010 (r137) @@ -20,7 +20,7 @@ # # CONFIG_IDE_DISK is not set CONFIG_IDE_NEW_DISK=y -CONFIG_USB_NEW_DISK=y +CONFIG_USB_DISK=y # CONFIG_FLASH_DISK is not set CONFIG_SUPPORT_PCI=y # CONFIG_PCI_BRUTE_SCAN is not set Modified: trunk/filo/drivers/Makefile.inc ============================================================================== --- trunk/filo/drivers/Makefile.inc Tue Aug 17 12:14:40 2010 (r136) +++ trunk/filo/drivers/Makefile.inc Tue Aug 24 13:36:51 2010 (r137) @@ -19,5 +19,6 @@ TARGETS-$(CONFIG_IDE_DISK) += drivers/ide.o TARGETS-$(CONFIG_IDE_NEW_DISK) += drivers/ide_new.o TARGETS-$(CONFIG_VIA_SOUND) += drivers/via-sound.o +TARGETS-$(CONFIG_USB_DISK) += drivers/usb.o TARGETS-y += drivers/intel.o Copied and modified: trunk/filo/drivers/usb.c (from r136, trunk/filo/drivers/newusb/usb.c) ============================================================================== --- trunk/filo/drivers/newusb/usb.c Tue Aug 17 12:14:40 2010 (r136, copy source) +++ trunk/filo/drivers/usb.c Tue Aug 24 13:36:51 2010 (r137) @@ -54,7 +54,7 @@ } } -int usb_new_probe(int drive) +int usb_probe(int drive) { /* FIXME: need a place to periodically poll usb_poll(). or at least at sensible times. @@ -66,7 +66,7 @@ return -1; } -int usb_new_read(const int drive, const sector_t sector, const int size, void *buffer) +int usb_read(const int drive, const sector_t sector, const int size, void *buffer) { if (count < drive) return -1; int result = -readwrite_blocks_512(devs[drive], sector, size, cbw_direction_data_in, buffer); Modified: trunk/filo/fs/blockdev.c ============================================================================== --- trunk/filo/fs/blockdev.c Tue Aug 17 12:14:40 2010 (r136) +++ trunk/filo/fs/blockdev.c Tue Aug 24 13:36:51 2010 (r137) @@ -166,7 +166,7 @@ *drive = *name - 'a'; name++; } else if (memcmp(name, "ud", 2) == 0) { - *type = DISK_NEW_USB; + *type = DISK_USB; name += 2; if (*name < 'a' || *name > 'z') { printf("Invalid drive\n"); @@ -256,16 +256,6 @@ disk_size = (uint32_t) - 1; /* FIXME */ break; #endif -#if defined(CONFIG_USB_NEW_DISK) && defined(CONFIG_USB) - case DISK_NEW_USB: - if (usb_new_probe(drive) != 0) { - debug("Failed to open USB.\n"); - return 0; - } - disk_size = (uint32_t) - 1; /* FIXME */ - break; -#endif - #ifdef CONFIG_USB_DISK case DISK_USB: if (usb_probe(drive) != 0) { @@ -406,11 +396,11 @@ break; } #endif -#if defined(CONFIG_USB_NEW_DISK) && defined(CONFIG_USB) - case DISK_NEW_USB: +#ifdef CONFIG_USB_DISK + case DISK_USB: { int count = (NUM_CACHE-hash>8)?8:(NUM_CACHE-hash); - if (usb_new_read(dev_drive, sector, count, buf) != 0) + if (usb_read(dev_drive, sector, count, buf) != 0) goto readerr; while (--count>0) { cache_sect[hash+count] = sector + count; @@ -418,12 +408,6 @@ break; } #endif -#ifdef CONFIG_USB_DISK - case DISK_USB: - if (usb_read(dev_drive, sector, buf) != 0) - goto readerr; - break; -#endif #ifdef CONFIG_FLASH_DISK case DISK_FLASH: Modified: trunk/filo/include/fs.h ============================================================================== --- trunk/filo/include/fs.h Tue Aug 17 12:14:40 2010 (r136) +++ trunk/filo/include/fs.h Tue Aug 24 13:36:51 2010 (r137) @@ -40,12 +40,7 @@ #ifdef CONFIG_USB_DISK int usb_probe(int drive); -int usb_read(int drive, sector_t sector, void *buffer); -#endif - -#ifdef CONFIG_USB_NEW_DISK -int usb_new_probe(int drive); -int usb_new_read(const int drive, const sector_t sector, const int size, void *buffer); +int usb_read(const int drive, const sector_t sector, const int size, void *buffer); #endif #ifdef CONFIG_FLASH_DISK @@ -58,7 +53,6 @@ #define DISK_MEM 2 #define DISK_USB 3 #define DISK_FLASH 4 -#define DISK_NEW_USB 5 int devopen(const char *name, int *reopen); void devclose(void); Modified: trunk/filo/main/filo.c ============================================================================== --- trunk/filo/main/filo.c Tue Aug 17 12:14:40 2010 (r136) +++ trunk/filo/main/filo.c Tue Aug 24 13:36:51 2010 (r137) @@ -73,9 +73,6 @@ relocate(); #if defined(CONFIG_USB_DISK) - usb_initialize(); -#endif -#if defined(CONFIG_USB_NEW_DISK) #if defined(CONFIG_USB) /* libpayload USB stack is there */ usb_initialize();

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
27
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 August 2010