July 2010 - openfirmware - mail.coreboot.org

[commit] r1878 - cpu/x86/pc/olpc/via
by repository service July 15, 2010

July 15, 2010

Author: wmb Date: Thu Jul 15 19:59:50 2010 New Revision: 1878 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1878 Log: OLPC XO-1.5 - When resuming to Windows, restore the SDHCI PCI config register that says the device is in D3 power state. Modified: cpu/x86/pc/olpc/via/startpcirestore.fth Modified: cpu/x86/pc/olpc/via/startpcirestore.fth ============================================================================== --- cpu/x86/pc/olpc/via/startpcirestore.fth Thu Jul 15 19:58:21 2010 (r1877) +++ cpu/x86/pc/olpc/via/startpcirestore.fth Thu Jul 15 19:59:50 2010 (r1878) @@ -32,7 +32,8 @@ \ al 8000.1029 #) mov \ al 8000.2029 #) mov - f9 6099 config-wb \ Two SD slots (correct for XP, wrong for Linux) + f9 6099 config-wb \ Two SD slots (correct for XP, wrong for Linux) + 03 6084 config-wb \ D3 power state \ \ Enable System Management Mode, assuming that the in-memory data structures are already set up \ 21 383 config-wb \ Enable A/Bxxxx range as memory instead of frame buffer (with fxxxx region R/O)

1 0

[commit] r1877 - cpu/x86/pc/olpc/via
by repository service July 15, 2010

July 15, 2010

Author: wmb Date: Thu Jul 15 19:58:21 2010 New Revision: 1877 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1877 Log: OLPC XO-1.5 ACPI DSDT - Deleted the SDIO node from the ACPI DSDT tree because it was causing Windows resume failures. Also deleted several node that refer to hardware that is not present on the XO machine. Modified: cpu/x86/pc/olpc/via/dsdt.dsl Modified: cpu/x86/pc/olpc/via/dsdt.dsl ============================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl Thu Jul 15 19:56:09 2010 (r1876) +++ cpu/x86/pc/olpc/via/dsdt.dsl Thu Jul 15 19:58:21 2010 (r1877) @@ -334,6 +334,7 @@ IF (LEqual(Arg0, 0x03)) //S3 { Store(0x2,\_SB.PCI0.MEMC.FSEG) //Set F Segment to Read only + // Notify(\_SB.PCI0, 0x00) } Or (Arg0, 0xB0, Local0) @@ -621,359 +622,359 @@ } }//Device(USBD) - // SDIO Controller - Device (SDIO) - { - Name(_ADR, 0x000C0000) - - OperationRegion(RSDC,PCI_Config,0x00,0x100) - Field(RSDC,ByteAcc,NoLock,Preserve){ - Offset(0x00), - VID, 16, - Offset(0x04), - CMDR, 3, - } - - Method(_STA, 0) - { - If(LNotEqual(\_SB.PCI0.SDIO.VID, 0x1106)) { - Return(0x00) - } Else { - If(LEqual(\_SB.PCI0.SDIO.CMDR, 0x00)) { - Return(0x0D) - } Else { - Return(0x0F) // present, enabled, functioning - } - } - } - }//Device(SDIO) - - // SD $ MS Controller - Device (SDMS) - { - Name(_ADR, 0x000D0000) - - OperationRegion(RSDM,PCI_Config,0x00,0x100) - Field(RSDM,ByteAcc,NoLock,Preserve){ - Offset(0x00), - VID, 16, - Offset(0x04), - CMDR, 3, - } - - Method(_STA, 0) - { - If(LNotEqual(\_SB.PCI0.SDMS.VID, 0x1106)) { - Return(0x00) - } Else { - If(LEqual(\_SB.PCI0.SDMS.CMDR, 0x00)) { - Return(0x0D) - } Else { - Return(0x0F) // present, enabled, functioning - } - } - } - }//Device(SDMS) - - // CE-ATA $ NF Controller(Card Boot) - Device(CENF) - { - Name(_ADR, 0x000E0000) - - OperationRegion(RENF,PCI_Config,0x00,0x100) - Field(RENF,ByteAcc,NoLock,Preserve){ - Offset(0x00), - VID, 16, - Offset(0x04), - CMDR, 3, - } - - Method(_STA, 0) - { - If(LNotEqual(\_SB.PCI0.CENF.VID, 0x1106)) { - Return(0x00) - } Else { - If(LEqual(\_SB.PCI0.CENF.CMDR, 0x00)) { - Return(0x0D) - } Else { - Return(0x0F) // present, enabled, functioning - } - } - } - } - - Device(IDEC) - { - - Name(_ADR, 0x000F0000) //D15F0: a Pata device - - Method(_STA,0,NotSerialized) //Status of the Pata Device - { - If(LNot(LEqual(\_SB.PCI0.IDEC.VID,0x1106))) - { - Return(0x00) //device not exists - } - Else - { - If(LEqual(\_SB.PCI0.IDEC.CMDR,0x00)) - { - Return(0x0D) //device exists & disable - } - Else - { - Return(0x0F) //device exists & enable - } - } - } - OperationRegion(SAPR,PCI_Config,0x00,0xC2) - Field(SAPR,ByteAcc,NoLock,Preserve) - { - VID,16, - Offset(0x04), - CMDR,3, - Offset(0x40), - , 1, - EPCH, 1, // Enable Primary channel. - Offset(0x4A), - PSPT, 8, // IDE Timings, Primary Slave - PMPT, 8, // IDE Timings, Primary Master - Offset(0x52), - PSUT, 4, // Primary Slave UDMA Timing - PSCT, 1, // Primary Drive Slave Cabal Type - PSUE, 3, // Primary Slave UDMA Enable - PMUT, 4, // Primary Master UDMA Timing - PMCT, 1, // Primary Drive Master Cabal Type - PMUE, 3, // Primary Master UDMA Enable - } - - Name(REGF,0x01) //accessible OpRegion default - Method(_REG,2,NotSerialized) // is PCI Config space accessible as OpRegion? - { - If(LEqual(Arg0,0x02)) - { - Store(Arg1,REGF) - } - } - /* - Name(TIM0,Package(0x04){ - Package(){0x78,0xB4,0xF0,0x017F,0x0258}, - Package(){0x20,0x22,0x33,0x47,0x5D}, - Package(){0x78,0x50,0x3C,0x2D,0x1E,0x14,0x0F}, - Package(){0x06,0x05,0x04,0x04,0x03,0x03,0x02,0x02,0x01,0x01,0x01,0x01,0x01,0x01,0x00} - }) - */ - Name(TIM0, Package() - { // Primary / Secondary channels timings - Package(){120, 180, 240, 383, 600}, // Timings in ns - Mode 4,3,2,1,0 defined from ATA spec. - Package(){0x20, 0x22, 0x33, 0x47, 0x5D }, // PIO Timing - Mode 4,3,2,1,0 - Package(){4, 3, 2, 1, 0}, // PIO mode (TIM0,0) - Package(){2, 1, 0, 0}, // Multi-word DMA mode - Package(){120, 80, 60, 45, 30, 20, 15}, // Min UDMA Timings in ns - Package(){6,5,4,4,3,3,2,2,1,1,1,1,1,1,0}, // UDMA mode - Package(){0x0E, 8, 6, 4, 2, 1, 0}, // UDMA timing - }) - - Name(TMD0,Buffer(0x14){}) - CreateDwordField(TMD0,0x00,PIO0) - CreateDwordField(TMD0,0x04,DMA0) - CreateDwordField(TMD0,0x08,PIO1) - CreateDwordField(TMD0,0x0C,DMA1) - CreateDwordField(TMD0,0x10,CHNF) - - Name(GMPT, 0) // Master PIO Timings - Name(GMUE, 0) // Master UDMA enable - Name(GMUT, 0) // Master UDMA Timings - Name(GSPT, 0) // Slave PIO Timings - Name(GSUE, 0) // Slave UDMA enable - Name(GSUT, 0) // Slave UDMA Timings - - Device(CHN0) //Primary Channel: Pata device - { - Name(_ADR,0x00) - - Method(_STA,0,NotSerialized) - { - If(LNotEqual(\_SB.PCI0.IDEC.EPCH, 0x1)) - { - Return(0x00) //channel disable - } - Else - { - Return(0x0F) //channel enable - } - } - Method(_GTM,0,NotSerialized) //Get Timing Mode - { - Return(GTM(PMPT,PMUE,PMUT,PSPT,PSUE,PSUT)) - } - Method(_STM, 3) // Set Timing PIO/DMA Mode - { - Store(Arg0, TMD0) // Copy Arg0 into TMD0 buffer - Store(PMPT, GMPT) // Master PIO Timings - Store(PMUE, GMUE) // Master UDMA enable - Store(PMUT, GMUT) // Master UDMA Timings - Store(PSPT, GSPT) // Slave PIO Timings - Store(PSUE, GSUE) // Slave UDMA enable - Store(PSUT, GSUT) // Slave UDMA Timings - STM() - Store(GMPT, PMPT) // Master PIO Timings - Store(GMUE, PMUE) // Master UDMA enable - Store(GMUT, PMUT) // Master UDMA Timings - Store(GSPT, PSPT) // Slave PIO Timings - Store(GSUE, PSUE) // Slave UDMA enable - Store(GSUT, PSUT) // Slave UDMA Timings - } // end Method _STM - - Device(DRV0) //Master Device - { - Name(_ADR,0x00) //0 indicates master drive - Method(_GTF,0,NotSerialized) //Get Task File: return a buffer of ATA command used to re-initialize the device - { - Return(GTF(0,PMUE,PMUT,PMPT)) - } - } - Device(DRV1) //Slave Device - { - Name(_ADR,0x01) //1 indicates slave drive - Method(_GTF,0,NotSerialized) //Get Task File: return a buffer of ATA command used to re-initialize the device - { - Return(GTF(0,PSUE,PSUT,PSPT)) - } - } - } - - Method(GTM,6,Serialized) - { - Store(Ones,PIO0) //default value: all bits set to 1 - Store(Ones,PIO1) //default value: all bits set to 1 - Store(Ones,DMA0) //default value: all bits set to 1 - Store(Ones,DMA1) //default value: all bits set to 1 - Store(0x10,CHNF) //default value: 0x10 - If(REGF) - { - } - Else - { - Return(TMD0) //unable to setup PCI config space as opRegion;return default value - } - Store(Match(DeRefOf(Index(TIM0,0x01)),MEQ,Arg0,MTR,0x00,0x00),Local6) - If(LLess(Local6,Ones)) - { - Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x00)),Local6)),Local7) - Store(Local7,DMA0) - Store(Local7,PIO0) - } - Store(Match(DeRefOf(Index(TIM0,0x01)),MEQ,Arg3,MTR,0x00,0x00),Local6) - If(LLess(Local6,Ones)) - { - Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x00)),Local6)),Local7) - Store(Local7,DMA1) - Store(Local7,PIO1) - } - If(Arg1) - { - Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x05)),Arg2)),Local5) - Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x04)),Local5)),DMA0) - Or(CHNF,0x01,CHNF) - } - If(Arg4) - { - Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x05)),Arg5)),Local5) - Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x04)),Local5)),DMA1) - Or(CHNF,0x04,CHNF) - } - Return(TMD0) //return timing mode - } - - Method(STM, 0, Serialized) - { - - If(REGF){} // PCI space not accessible - Else { Return(TMD0) } - - Store(0x00, GMUE) // Master UDMA Disable - Store(0x00, GSUE) // Slave UDMA Disable - Store(0x07, GMUT) // Master UDMA Mode 0 - Store(0x07, GSUT) // Slave UDMA Mode 0 - - If(And(CHNF, 0x1)) - { - Store(Match(DeRefOf(Index(TIM0, 4)), MLE, DMA0, MTR,0,0), Local0) // Get DMA mode - Store(DeRefOf(Index(DeReFof(Index(TIM0, 6)), Local0)), GMUT) // Timing bit mask 66Mhz - Or(GMUE, 0x07, GMUE) // Enable UltraDMA for Device 0 - } - Else // non - UDMA mode. Possible Multi word DMA - { - If(Or(LEqual(PIO0,Ones), LEqual(PIO0,0))) - { - If(And(LLess(DMA0,Ones), LGreater(DMA0,0))) - { - Store(DMA0, PIO0) // Make PIO0=DMA0 - } - } - } - - If(And(CHNF, 0x4)) - { - Store(Match(DeRefOf(Index(TIM0, 4)), MLE, DMA1, MTR,0,0), Local0) - Store(DeRefOf(Index(DeReFof(Index(TIM0, 6)), Local0)), GSUT) // Timing bit mask 66Mhz - Or(GSUE, 0x07, GSUE) // Enable UltraDMA for Device 0 - } - Else // non - UDMA mode. Possible Multi word DMA - { - If(Or(LEqual(PIO1, Ones), LEqual(PIO1,0))) - { - If(And(LLess(DMA1, Ones), LGreater(DMA1,0))) - { - Store(DMA1, PIO1) // Make PIO1 = DMA1 - } - } - } - - And(Match(DeRefOf(Index(TIM0, 0)), MGE, PIO0, MTR,0,0), 0x3, Local0) - Store(DeRefOf(Index(DeReFof(Index(TIM0, 1)), Local0)), Local1) - Store(Local1, GMPT) - - And(Match(DeRefOf(Index(TIM0, 0)), MGE, PIO1, MTR,0,0), 0x3, Local0) - Store(DeRefOf(Index(DeReFof(Index(TIM0, 1)), Local0)), Local1) - Store(Local1, GSPT) - Return(TMD0) - } // end Method STM - - Method(GTF , 4 , Serialized) - { - Store(Buffer(7){0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF}, Local1) - Store(Buffer(7){0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF}, Local2) - CreateByteField(Local1, 1, Mode) // PIO mode - CreateByteField(Local2, 1, UMOD) // Ultra mode - CreateByteField(Local1, 5, PCHA) // master or slave - CreateByteField(Local2, 5, UCHA) // master or slave - And(Arg0,0x03,Local3) - - If(Lequal(And(Local3,0x01),0x01)) - { - Store(0xB0,PCHA) // drive 1 - Store(0xB0,UCHA) // drive 1 - } - - If(Arg1) - { - Store(DeRefOf(Index(DeReFof(Index(TIM0, 5)), Arg2)), UMOD) //Programming DMA Mode - Or( UMOD, 0x40, UMOD) - } - Else - { // non-UltraDMA - Store(Match(DeRefOf(Index(TIM0, 1)), MEQ, Arg3, MTR,0,0), Local0) - Or(0x20, DeRefOf(Index(DeReFof(Index(TIM0, 3)), Local0)), UMOD) - } - - Store(Match(DeRefOf(Index(TIM0, 1)), MEQ, Arg3, MTR,0,0), Local0) - Or(0x08, DeRefOf(Index(DeReFof(Index(TIM0, 2)), Local0)), Mode) - Concatenate(Local1, Local2, Local6) - Return(Local6) - - } // end of GTF - } +// // SDIO Controller +// Device (SDIO) +// { +// Name(_ADR, 0x000C0000) +// +// OperationRegion(RSDC,PCI_Config,0x00,0x100) +// Field(RSDC,ByteAcc,NoLock,Preserve){ +// Offset(0x00), +// VID, 16, +// Offset(0x04), +// CMDR, 3, +// } +// +// Method(_STA, 0) +// { +// If(LNotEqual(\_SB.PCI0.SDIO.VID, 0x1106)) { +// Return(0x00) +// } Else { +// If(LEqual(\_SB.PCI0.SDIO.CMDR, 0x00)) { +// Return(0x0D) +// } Else { +// Return(0x0F) // present, enabled, functioning +// } +// } +// } +// }//Device(SDIO) + +// // SD $ MS Controller +// Device (SDMS) +// { +// Name(_ADR, 0x000D0000) +// +// OperationRegion(RSDM,PCI_Config,0x00,0x100) +// Field(RSDM,ByteAcc,NoLock,Preserve){ +// Offset(0x00), +// VID, 16, +// Offset(0x04), +// CMDR, 3, +// } +// +// Method(_STA, 0) +// { +// If(LNotEqual(\_SB.PCI0.SDMS.VID, 0x1106)) { +// Return(0x00) +// } Else { +// If(LEqual(\_SB.PCI0.SDMS.CMDR, 0x00)) { +// Return(0x0D) +// } Else { +// Return(0x0F) // present, enabled, functioning +// } +// } +// } +// }//Device(SDMS) +// +// // CE-ATA $ NF Controller(Card Boot) +// Device(CENF) +// { +// Name(_ADR, 0x000E0000) +// +// OperationRegion(RENF,PCI_Config,0x00,0x100) +// Field(RENF,ByteAcc,NoLock,Preserve){ +// Offset(0x00), +// VID, 16, +// Offset(0x04), +// CMDR, 3, +// } +// +// Method(_STA, 0) +// { +// If(LNotEqual(\_SB.PCI0.CENF.VID, 0x1106)) { +// Return(0x00) +// } Else { +// If(LEqual(\_SB.PCI0.CENF.CMDR, 0x00)) { +// Return(0x0D) +// } Else { +// Return(0x0F) // present, enabled, functioning +// } +// } +// } +// } +// +// Device(IDEC) +// { +// +// Name(_ADR, 0x000F0000) //D15F0: a Pata device +// +// Method(_STA,0,NotSerialized) //Status of the Pata Device +// { +// If(LNot(LEqual(\_SB.PCI0.IDEC.VID,0x1106))) +// { +// Return(0x00) //device not exists +// } +// Else +// { +// If(LEqual(\_SB.PCI0.IDEC.CMDR,0x00)) +// { +// Return(0x0D) //device exists & disable +// } +// Else +// { +// Return(0x0F) //device exists & enable +// } +// } +// } +// OperationRegion(SAPR,PCI_Config,0x00,0xC2) +// Field(SAPR,ByteAcc,NoLock,Preserve) +// { +// VID,16, +// Offset(0x04), +// CMDR,3, +// Offset(0x40), +// , 1, +// EPCH, 1, // Enable Primary channel. +// Offset(0x4A), +// PSPT, 8, // IDE Timings, Primary Slave +// PMPT, 8, // IDE Timings, Primary Master +// Offset(0x52), +// PSUT, 4, // Primary Slave UDMA Timing +// PSCT, 1, // Primary Drive Slave Cabal Type +// PSUE, 3, // Primary Slave UDMA Enable +// PMUT, 4, // Primary Master UDMA Timing +// PMCT, 1, // Primary Drive Master Cabal Type +// PMUE, 3, // Primary Master UDMA Enable +// } +// +// Name(REGF,0x01) //accessible OpRegion default +// Method(_REG,2,NotSerialized) // is PCI Config space accessible as OpRegion? +// { +// If(LEqual(Arg0,0x02)) +// { +// Store(Arg1,REGF) +// } +// } +// /* +// Name(TIM0,Package(0x04){ +// Package(){0x78,0xB4,0xF0,0x017F,0x0258}, +// Package(){0x20,0x22,0x33,0x47,0x5D}, +// Package(){0x78,0x50,0x3C,0x2D,0x1E,0x14,0x0F}, +// Package(){0x06,0x05,0x04,0x04,0x03,0x03,0x02,0x02,0x01,0x01,0x01,0x01,0x01,0x01,0x00} +// }) +// */ +// Name(TIM0, Package() +// { // Primary / Secondary channels timings +// Package(){120, 180, 240, 383, 600}, // Timings in ns - Mode 4,3,2,1,0 defined from ATA spec. +// Package(){0x20, 0x22, 0x33, 0x47, 0x5D }, // PIO Timing - Mode 4,3,2,1,0 +// Package(){4, 3, 2, 1, 0}, // PIO mode (TIM0,0) +// Package(){2, 1, 0, 0}, // Multi-word DMA mode +// Package(){120, 80, 60, 45, 30, 20, 15}, // Min UDMA Timings in ns +// Package(){6,5,4,4,3,3,2,2,1,1,1,1,1,1,0}, // UDMA mode +// Package(){0x0E, 8, 6, 4, 2, 1, 0}, // UDMA timing +// }) +// +// Name(TMD0,Buffer(0x14){}) +// CreateDwordField(TMD0,0x00,PIO0) +// CreateDwordField(TMD0,0x04,DMA0) +// CreateDwordField(TMD0,0x08,PIO1) +// CreateDwordField(TMD0,0x0C,DMA1) +// CreateDwordField(TMD0,0x10,CHNF) +// +// Name(GMPT, 0) // Master PIO Timings +// Name(GMUE, 0) // Master UDMA enable +// Name(GMUT, 0) // Master UDMA Timings +// Name(GSPT, 0) // Slave PIO Timings +// Name(GSUE, 0) // Slave UDMA enable +// Name(GSUT, 0) // Slave UDMA Timings +// +// Device(CHN0) //Primary Channel: Pata device +// { +// Name(_ADR,0x00) +// +// Method(_STA,0,NotSerialized) +// { +// If(LNotEqual(\_SB.PCI0.IDEC.EPCH, 0x1)) +// { +// Return(0x00) //channel disable +// } +// Else +// { +// Return(0x0F) //channel enable +// } +// } +// Method(_GTM,0,NotSerialized) //Get Timing Mode +// { +// Return(GTM(PMPT,PMUE,PMUT,PSPT,PSUE,PSUT)) +// } +// Method(_STM, 3) // Set Timing PIO/DMA Mode +// { +// Store(Arg0, TMD0) // Copy Arg0 into TMD0 buffer +// Store(PMPT, GMPT) // Master PIO Timings +// Store(PMUE, GMUE) // Master UDMA enable +// Store(PMUT, GMUT) // Master UDMA Timings +// Store(PSPT, GSPT) // Slave PIO Timings +// Store(PSUE, GSUE) // Slave UDMA enable +// Store(PSUT, GSUT) // Slave UDMA Timings +// STM() +// Store(GMPT, PMPT) // Master PIO Timings +// Store(GMUE, PMUE) // Master UDMA enable +// Store(GMUT, PMUT) // Master UDMA Timings +// Store(GSPT, PSPT) // Slave PIO Timings +// Store(GSUE, PSUE) // Slave UDMA enable +// Store(GSUT, PSUT) // Slave UDMA Timings +// } // end Method _STM +// +// Device(DRV0) //Master Device +// { +// Name(_ADR,0x00) //0 indicates master drive +// Method(_GTF,0,NotSerialized) //Get Task File: return a buffer of ATA command used to re-initialize //////the device +// { +// Return(GTF(0,PMUE,PMUT,PMPT)) +// } +// } +// Device(DRV1) //Slave Device +// { +// Name(_ADR,0x01) //1 indicates slave drive +// Method(_GTF,0,NotSerialized) //Get Task File: return a buffer of ATA command used to re-initialize //the device +// { +// Return(GTF(0,PSUE,PSUT,PSPT)) +// } +// } +// } +// +// Method(GTM,6,Serialized) +// { +// Store(Ones,PIO0) //default value: all bits set to 1 +// Store(Ones,PIO1) //default value: all bits set to 1 +// Store(Ones,DMA0) //default value: all bits set to 1 +// Store(Ones,DMA1) //default value: all bits set to 1 +// Store(0x10,CHNF) //default value: 0x10 +// If(REGF) +// { +// } +// Else +// { +// Return(TMD0) //unable to setup PCI config space as opRegion;return default value +// } +// Store(Match(DeRefOf(Index(TIM0,0x01)),MEQ,Arg0,MTR,0x00,0x00),Local6) +// If(LLess(Local6,Ones)) +// { +// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x00)),Local6)),Local7) +// Store(Local7,DMA0) +// Store(Local7,PIO0) +// } +// Store(Match(DeRefOf(Index(TIM0,0x01)),MEQ,Arg3,MTR,0x00,0x00),Local6) +// If(LLess(Local6,Ones)) +// { +// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x00)),Local6)),Local7) +// Store(Local7,DMA1) +// Store(Local7,PIO1) +// } +// If(Arg1) +// { +// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x05)),Arg2)),Local5) +// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x04)),Local5)),DMA0) +// Or(CHNF,0x01,CHNF) +// } +// If(Arg4) +// { +// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x05)),Arg5)),Local5) +// Store(DeRefOf(Index(DeRefOf(Index(TIM0,0x04)),Local5)),DMA1) +// Or(CHNF,0x04,CHNF) +// } +// Return(TMD0) //return timing mode +// } +// +// Method(STM, 0, Serialized) +// { +// +// If(REGF){} // PCI space not accessible +// Else { Return(TMD0) } +// +// Store(0x00, GMUE) // Master UDMA Disable +// Store(0x00, GSUE) // Slave UDMA Disable +// Store(0x07, GMUT) // Master UDMA Mode 0 +// Store(0x07, GSUT) // Slave UDMA Mode 0 +// +// If(And(CHNF, 0x1)) +// { +// Store(Match(DeRefOf(Index(TIM0, 4)), MLE, DMA0, MTR,0,0), Local0) // Get DMA mode +// Store(DeRefOf(Index(DeReFof(Index(TIM0, 6)), Local0)), GMUT) // Timing bit mask 66Mhz +// Or(GMUE, 0x07, GMUE) // Enable UltraDMA for Device 0 +// } +// Else // non - UDMA mode. Possible Multi word DMA +// { +// If(Or(LEqual(PIO0,Ones), LEqual(PIO0,0))) +// { +// If(And(LLess(DMA0,Ones), LGreater(DMA0,0))) +// { +// Store(DMA0, PIO0) // Make PIO0=DMA0 +// } +// } +// } +// +// If(And(CHNF, 0x4)) +// { +// Store(Match(DeRefOf(Index(TIM0, 4)), MLE, DMA1, MTR,0,0), Local0) +// Store(DeRefOf(Index(DeReFof(Index(TIM0, 6)), Local0)), GSUT) // Timing bit mask 66Mhz +// Or(GSUE, 0x07, GSUE) // Enable UltraDMA for Device 0 +// } +// Else // non - UDMA mode. Possible Multi word DMA +// { +// If(Or(LEqual(PIO1, Ones), LEqual(PIO1,0))) +// { +// If(And(LLess(DMA1, Ones), LGreater(DMA1,0))) +// { +// Store(DMA1, PIO1) // Make PIO1 = DMA1 +// } +// } +// } +// +// And(Match(DeRefOf(Index(TIM0, 0)), MGE, PIO0, MTR,0,0), 0x3, Local0) +// Store(DeRefOf(Index(DeReFof(Index(TIM0, 1)), Local0)), Local1) +// Store(Local1, GMPT) +// +// And(Match(DeRefOf(Index(TIM0, 0)), MGE, PIO1, MTR,0,0), 0x3, Local0) +// Store(DeRefOf(Index(DeReFof(Index(TIM0, 1)), Local0)), Local1) +// Store(Local1, GSPT) +// Return(TMD0) +// } // end Method STM +// +// Method(GTF , 4 , Serialized) +// { +// Store(Buffer(7){0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF}, Local1) +// Store(Buffer(7){0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF}, Local2) +// CreateByteField(Local1, 1, Mode) // PIO mode +// CreateByteField(Local2, 1, UMOD) // Ultra mode +// CreateByteField(Local1, 5, PCHA) // master or slave +// CreateByteField(Local2, 5, UCHA) // master or slave +// And(Arg0,0x03,Local3) +// +// If(Lequal(And(Local3,0x01),0x01)) +// { +// Store(0xB0,PCHA) // drive 1 +// Store(0xB0,UCHA) // drive 1 +// } +// +// If(Arg1) +// { +// Store(DeRefOf(Index(DeReFof(Index(TIM0, 5)), Arg2)), UMOD) //Programming DMA Mode +// Or( UMOD, 0x40, UMOD) +// } +// Else +// { // non-UltraDMA +// Store(Match(DeRefOf(Index(TIM0, 1)), MEQ, Arg3, MTR,0,0), Local0) +// Or(0x20, DeRefOf(Index(DeReFof(Index(TIM0, 3)), Local0)), UMOD) +// } +// +// Store(Match(DeRefOf(Index(TIM0, 1)), MEQ, Arg3, MTR,0,0), Local0) +// Or(0x08, DeRefOf(Index(DeReFof(Index(TIM0, 2)), Local0)), Mode) +// Concatenate(Local1, Local2, Local6) +// Return(Local6) +// +// } // end of GTF +// } Device(USB1) { Name(_ADR,0x00100000) //Address+function.

1 0

[commit] r1876 - cpu/x86/pc
by repository service July 15, 2010

July 15, 2010

Author: wmb Date: Thu Jul 15 19:56:09 2010 New Revision: 1876 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1876 Log: OLPC - Moved the code that disables the XO-1.5 internal SD slot for Windows to an XO-1.5 specific file. Modified: cpu/x86/pc/biosints.fth Modified: cpu/x86/pc/biosints.fth ============================================================================== --- cpu/x86/pc/biosints.fth Thu Jul 15 19:54:33 2010 (r1875) +++ cpu/x86/pc/biosints.fth Thu Jul 15 19:56:09 2010 (r1876) @@ -1209,8 +1209,6 @@ " ext:1" ntfs? if " ext:0" set-hd-boot " sound-end" evaluate - \ Disable the internal SD to prevent Windows from making it C: - h# f9 h# 6099 config-b! true exit then false

1 0

[commit] r1875 - cpu/x86/pc/olpc dev/mmc/sdhci
by repository service July 15, 2010

July 15, 2010

Author: wmb Date: Thu Jul 15 19:54:33 2010 New Revision: 1875 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1875 Log: OLPC - Commentary improvements - no substantive change. Modified: cpu/x86/pc/olpc/countdwn.fth dev/mmc/sdhci/sdhci.fth Modified: cpu/x86/pc/olpc/countdwn.fth ============================================================================== --- cpu/x86/pc/olpc/countdwn.fth Thu Jul 15 19:53:02 2010 (r1874) +++ cpu/x86/pc/olpc/countdwn.fth Thu Jul 15 19:54:33 2010 (r1875) @@ -2,10 +2,11 @@ purpose: Check for auto-boot interruption \ This is similar to the ofw/core/countdwn.fth, except that you -\ have to use a specific key from the main keyboard, because -\ children tend to pound on the keyboard randomly. If you have -\ a serial console, you can still use any key, since only developers -\ have serial consoles. +\ have to use a specific key (escape) from the main keyboard, because +\ children tend to pound on the keyboard randomly. The serial +\ console also requires the escape key, because the Windows kernel +\ debugger might be connected to the serial port. It sends (non-escape) +\ characters periodically, and we don't want those to break into OFW. headerless : show-countdown ( #seconds -- interrupted? ) @@ -16,7 +17,7 @@ stdin @ if console-key? if - console-key h# 1b = if + console-key h# 1b = if \ 1b is ESC \ consume extra escapes in case the user typed several begin console-key? while console-key drop repeat true unloop unloop exit @@ -26,7 +27,7 @@ [ifdef] ukey ukey? if \ ukey drop - ukey h# 1b = if + ukey h# 1b = if \ 1b is ESC true unloop unloop exit then then Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Thu Jul 15 19:53:02 2010 (r1874) +++ dev/mmc/sdhci/sdhci.fth Thu Jul 15 19:54:33 2010 (r1875) @@ -391,10 +391,9 @@ : deselect-card ( -- ) 0 h# 0700 0 cmd ; \ CMD7 - with null RCA : select-card ( -- ) \ CMD7 R1b rca h# 071b 0 cmd - \ In principle this shouldn't be necessary, but the Via VX855's SD - \ host controller incorrectly sets the "data transfer complete" bit - \ during CMD7 with nonzero RCA, and if you don't clear it, subsequent - \ commands sometimes fail with either Command Timeout or CRC error. + \ Unlike Version 1.00, version 2.00 of the SD Host Controller + \ Specification says that Transfer Complete is set after R1b + \ commands, so we must clear that bit if it is set. isr@ isr! ; @@ -408,7 +407,7 @@ : stop-transmission ( -- ) rca h# 0c1b 0 cmd ; \ CMD12 R1b UNTESTED -: get-status ( -- status ) rca h# 0d1a 0 cmd response ; \ CMD13 R1 UNTESTED +: get-status ( -- status ) rca h# 0d1a 0 cmd response ; \ CMD13 R1 : go-inactive ( -- ) rca h# 0f00 0 cmd ; \ CMD15 - UNTESTED @@ -620,16 +619,16 @@ else 2 set-bus-width \ acmd6 - bus width 4 4-bit - /block set-blocklen \ Cmd 16 + /block set-blocklen \ cmd16 \ High speed didn't exist until SD spec version 1.10 \ The low nibble of the first byte of SCR data is 0 for v1.0 and v1.01, \ 1 for v1.10, and 2 for v2. - get-scr c@ h# f and 0= if exit then + get-scr c@ h# f and 0= if exit then \ acmd51 \ Ask if high-speed is supported - h# 00ff.fff1 switch-function d# 13 + c@ 2 and if - h# 80ff.fff1 switch-function drop \ Perform the switch + h# 00ff.fff1 switch-function d# 13 + c@ 2 and if \ cmd6 + h# 80ff.fff1 switch-function drop \ Perform the switch cmd6 \ Bump the host controller clock host-high-speed \ Changes the clock edge card-clock-50

1 0

[commit] r1874 - cpu/x86/pc/olpc/via
by repository service July 15, 2010

July 15, 2010

Author: wmb Date: Thu Jul 15 19:53:02 2010 New Revision: 1874 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1874 Log: OLPC XO-1.5 - When resuming from S3, restore the SDHCI state differently for Linux and Windows. Modified: cpu/x86/pc/olpc/via/acpi.fth cpu/x86/pc/olpc/via/addrs.fth cpu/x86/pc/olpc/via/romreset.bth Modified: cpu/x86/pc/olpc/via/acpi.fth ============================================================================== --- cpu/x86/pc/olpc/via/acpi.fth Thu Jul 15 19:41:34 2010 (r1873) +++ cpu/x86/pc/olpc/via/acpi.fth Thu Jul 15 19:53:02 2010 (r1874) @@ -290,6 +290,8 @@ do-acpi-wake wake-adr /do-acpi-wake move + false windows-mode-adr ! + [ifdef] notdef \ Copy in the SSDT \ I suppose we could point to it in FLASH - if so don't compress it, @@ -315,16 +317,10 @@ defer more-platform-fixup ' noop to more-platform-fixup : rm-platform-fixup ( -- ) -[ifdef] Later -Geode xp-smbus-base h# f001 h# 5140.000b 3dup msr! find-msr-entry 2! -Geode xp-smbus-base 1+ h# 10 isa-hdr >hdr-value l! - - begin sci-queue@ 0= until \ Clean out the SCI queue - h# 20 acpi-w@ h# 20 acpi-w! \ Ack outstanding events -Geode h# 4e sci-mask! \ Include in the mask only events we care about + \ Disable the internal SD to prevent Windows from making it C: + h# f9 h# 6099 config-b! + true windows-mode-adr ! \ Tell the resume code to do it too -Geode 0 h# 40 pm! \ Restore long delay for power-off button -[then] more-platform-fixup ; Modified: cpu/x86/pc/olpc/via/addrs.fth ============================================================================== --- cpu/x86/pc/olpc/via/addrs.fth Thu Jul 15 19:41:34 2010 (r1873) +++ cpu/x86/pc/olpc/via/addrs.fth Thu Jul 15 19:53:02 2010 (r1874) @@ -87,8 +87,9 @@ h# ffc00 constant smbios-adr h# fff00 constant wake-adr \ Needs to be at least h# 32 bytes - used in acpi.fth h# fff40 constant rm-buf \ 8-byte buffer used by BIOS INT 15 AH=C0 for returning config info -h# fff48 constant video-mode-adr \ Saves display mode for resume code -\ h# fff4c constant next-adr +h# fff48 constant video-mode-adr \ Saves display mode for resume code +h# fff4c constant windows-mode-adr \ Flag to control Windows-specific resume fixups +\ h# fff50 Next address available for resume variables h# fff80 constant 'int10-dispatch Modified: cpu/x86/pc/olpc/via/romreset.bth ============================================================================== --- cpu/x86/pc/olpc/via/romreset.bth Thu Jul 15 19:41:34 2010 (r1873) +++ cpu/x86/pc/olpc/via/romreset.bth Thu Jul 15 19:53:02 2010 (r1874) @@ -248,9 +248,10 @@ ax jmp \ Jump in 32-bit protected mode then - \ This only works if prep-rm has already been executed; - \ otherwise it will hang trying to re-enable SMM - fload ${BP}/cpu/x86/pc/olpc/via/startpcirestore.fth \ SD host controller PCI BARs + \ These fixups are only needed by Windows, and some of them are bad for Linux + windows-mode-adr #) ax mov ax ax or 0<> if + fload ${BP}/cpu/x86/pc/olpc/via/startpcirestore.fth \ SD host controller PCI BARs + then facs-adr h# c + #) ax mov ax ax or 0<> if \ Resume in real mode for ACPI operating systems

1 0

[commit] r1873 - cpu/x86/pc/olpc/via
by repository service July 15, 2010

July 15, 2010

Author: wmb Date: Thu Jul 15 19:41:34 2010 New Revision: 1873 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1873 Log: OLPC XO-1.5 fs-update - commented out some dead code that was trying to implement a possible optimization. The code was never executed due to a programming error, and probably was not a good idea anyway. Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Wed Jul 14 23:01:11 2010 (r1872) +++ cpu/x86/pc/olpc/via/fsupdate.fth Thu Jul 15 19:41:34 2010 (r1873) @@ -185,10 +185,10 @@ ?get-crc ( eblock# hashname$ hash$ r: comprlen ) - 2over " fa43239bcee7b97ca62f007cc68487560a39e19f74f3dde7486db3f98df8e471" $= if ( eblock# hashname$ hash$ r: comprlen) - r> skip-zdata ( eblock# hashname$ hash$ ) - 2drop 2drop ( eblock# ) - else ( eblock# hashname$ hash$ ) +\ 2dup " fa43239bcee7b97ca62f007cc68487560a39e19f74f3dde7486db3f98df8e471" $= if ( eblock# hashname$ hash$ r: comprlen) +\ r> skip-zdata ( eblock# hashname$ hash$ ) +\ 2drop 2drop ( eblock# ) +\ else ( eblock# hashname$ hash$ ) r> get-zdata ( eblock# hashname$ hash$ ) ?check-crc ( eblock# hashname$ hash$ ) @@ -204,7 +204,7 @@ \ data-buffer over nand-pages/block * nand-pages/block " write-blocks" $call-nand ( eblock# #written ) \ nand-pages/block <> " Write error" ?nand-abort ( eblock# ) swap-buffers ( eblock# ) - then +\ then dup to last-eblock# ( eblock# ) show-written ( )

1 0

[commit] r1872 - in cpu/x86/pc/olpc: build via via/build
by repository service July 14, 2010

July 14, 2010

Author: wmb Date: Wed Jul 14 23:01:11 2010 New Revision: 1872 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1872 Log: OLPC XO-1.5 - Fixed build problems related to the use of the new thin firmware Modified: cpu/x86/pc/olpc/build/Makefile cpu/x86/pc/olpc/via/build/Makefile cpu/x86/pc/olpc/via/sd8686.bth cpu/x86/pc/olpc/via/wlan-version.fth Modified: cpu/x86/pc/olpc/build/Makefile ============================================================================== --- cpu/x86/pc/olpc/build/Makefile Wed Jul 14 22:34:18 2010 (r1871) +++ cpu/x86/pc/olpc/build/Makefile Wed Jul 14 23:01:11 2010 (r1872) @@ -36,7 +36,7 @@ @ln -sf ../../../${OS}/forth build clean: - rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom ec.version olpc.version + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version *.bin *.tag tags clean-all: clean @make -C ../../../build clean Modified: cpu/x86/pc/olpc/via/build/Makefile ============================================================================== --- cpu/x86/pc/olpc/via/build/Makefile Wed Jul 14 22:34:18 2010 (r1871) +++ cpu/x86/pc/olpc/via/build/Makefile Wed Jul 14 23:01:11 2010 (r1872) @@ -37,7 +37,7 @@ @ln -sf ${CPUDIR}/${OS}/forth build clean: - rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom ec.version olpc.version + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version *.bin *.tag tags clean-all: clean @make -C ${CPUDIR}/build clean Modified: cpu/x86/pc/olpc/via/sd8686.bth ============================================================================== --- cpu/x86/pc/olpc/via/sd8686.bth Wed Jul 14 22:34:18 2010 (r1871) +++ cpu/x86/pc/olpc/via/sd8686.bth Wed Jul 14 23:01:11 2010 (r1872) @@ -5,22 +5,24 @@ fload ${BP}/cpu/x86/pc/olpc/via/wlan-version.fth +" macro: WLAN_FILE lbtf_sdio-${WLAN_VERSION}" expand$ eval + " ${GET_WLAN}" expand$ nip [if] " ${GET_WLAN}" expand$ $sh [else] " rm -f sd8686.bin sd8686_helper.bin" expand$ $sh -" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686-${WLAN_VERSION}.bin" expand$ $sh -" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686-${WLAN_VERSION}.bin.md5" expand$ $sh -" md5sum -b sd8686-${WLAN_VERSION}.bin | cmp - sd8686-${WLAN_VERSION}.bin.md5" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin.md5" expand$ $sh +" md5sum ${WLAN_FILE}.bin | cmp - ${WLAN_FILE}.bin.md5" expand$ $sh -" mv sd8686-${WLAN_VERSION}.bin sd8686.bin" expand$ $sh +" mv ${WLAN_FILE}.bin sd8686.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh " md5sum -b sd8686_helper.bin | cmp - sd8686_helper.bin.md5" expand$ $sh -" rm sd8686-${WLAN_VERSION}.bin.md5 sd8686_helper.bin.md5" expand$ $sh +" rm ${WLAN_FILE}.bin.md5 sd8686_helper.bin.md5" expand$ $sh [then] \ This forces the creation of a .log file, so we don't re-fetch Modified: cpu/x86/pc/olpc/via/wlan-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/wlan-version.fth Wed Jul 14 22:34:18 2010 (r1871) +++ cpu/x86/pc/olpc/via/wlan-version.fth Wed Jul 14 23:01:11 2010 (r1872) @@ -1,7 +1,7 @@ \ The wireless LAN module firmware -\ macro: WLAN_VERSION 9.70.7.p0 +macro: WLAN_VERSION 9.0.7.p2 \ Alternate command for getting WLAN firmware, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary \ macro: GET_WLAN cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686-9.70.7.p0.bin" sd8686.bin; cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686_helper.bin" sd8686_helper.bin -macro: GET_WLAN wget http://dev.laptop.org/pub/firmware/libertas/thinfirm/lbtf_sdio-9.0.7.p2.bin -O sd8686.bin +\ macro: GET_WLAN wget http://dev.laptop.org/pub/firmware/libertas/thinfirm/lbtf_sdio-9.0.7.p2.bin -O sd8686.bin

1 0

[commit] r1871 - cpu/x86/pc/olpc/via
by repository service July 14, 2010

July 14, 2010

Author: rsmith Date: Wed Jul 14 22:34:18 2010 New Revision: 1871 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1871 Log: OLPC: XO-1.5 Version q3a42 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Wed Jul 14 22:34:15 2010 (r1870) +++ cpu/x86/pc/olpc/via/fw-version.fth Wed Jul 14 22:34:18 2010 (r1871) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 41i +macro: FW_MINOR 42

1 0

[commit] r1870 - cpu/x86/pc/olpc/via
by repository service July 14, 2010

July 14, 2010

Author: rsmith Date: Wed Jul 14 22:34:15 2010 New Revision: 1870 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1870 Log: Bump EC firmware to 1.9.30 Modified: cpu/x86/pc/olpc/via/ec-version.fth Modified: cpu/x86/pc/olpc/via/ec-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/ec-version.fth Wed Jul 14 22:34:13 2010 (r1869) +++ cpu/x86/pc/olpc/via/ec-version.fth Wed Jul 14 22:34:15 2010 (r1870) @@ -1,7 +1,7 @@ \ The EC microcode -macro: EC_VERSION 1_9_29 +macro: EC_VERSION 1_9_30 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img +\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img \ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img

1 0

[commit] r1869 - cpu/x86/pc/olpc/via dev
by repository service July 14, 2010

July 14, 2010

Author: rsmith Date: Wed Jul 14 22:34:13 2010 New Revision: 1869 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1869 Log: OLPC XO 1.5: ALPS keyboard support; Trust the EC. The ALPS keyboard need 500ms to startup before you can successfully talk to it. The previous keyboard routines would try to probe at the same time that the EC is trying to detect what keyboard controller is installed. When OFW dosen't get a response it assumes there is no keyboard. Now OFW assumes that the EC is properly detecting the keboard controller (Which is does as of Ver 1.9.30) and the only command it sends is the scan enable. Modified: cpu/x86/pc/olpc/via/devices.fth cpu/x86/pc/olpc/via/ec-version.fth dev/pckbd.fth Modified: cpu/x86/pc/olpc/via/devices.fth ============================================================================== --- cpu/x86/pc/olpc/via/devices.fth Wed Jul 14 22:08:26 2010 (r1868) +++ cpu/x86/pc/olpc/via/devices.fth Wed Jul 14 22:34:13 2010 (r1869) @@ -121,6 +121,8 @@ [then] : serial-enabled? ( -- flag ) h# 8846 config-b@ h# 40 and 0<> ; +create trust-ec-keyboard + fload ${BP}/dev/pci/isaall.fth \ We don't need a serial selftest because the serial port is internal only \ and the selftest turns off the diag device Modified: cpu/x86/pc/olpc/via/ec-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/ec-version.fth Wed Jul 14 22:08:26 2010 (r1868) +++ cpu/x86/pc/olpc/via/ec-version.fth Wed Jul 14 22:34:13 2010 (r1869) @@ -3,5 +3,5 @@ \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img +macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img \ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img Modified: dev/pckbd.fth ============================================================================== --- dev/pckbd.fth Wed Jul 14 22:08:26 2010 (r1868) +++ dev/pckbd.fth Wed Jul 14 22:34:13 2010 (r1869) @@ -257,17 +257,10 @@ [ifdef] olpc [ifndef] demo-board -: ?olpc-keyboard ( -- ) - " enable-intf" $call-parent - begin d# 50 timed-read 0= while - drop - true to keyboard-present? - exit - repeat - keyboard-present? if exit then - kbd-reset 0= to keyboard-present? -; +[ifdef] trust-ec-keyboard +: ?olpc-keyboard ( -- ) true to keyboard-present? ; +[else] \ For the ENE keyboard controller we have to tell the EC to use \ a different internal mapping table. OLPC switched from an \ ALPS to an ENE controller in late 2007. @@ -284,7 +277,23 @@ \ This looks like an ENE controller, so flip the mapping table h# f7 cmd +; + +: ?olpc-keyboard ( -- ) + " enable-intf" $call-parent + begin d# 50 timed-read 0= while + drop + true to keyboard-present? + exit + repeat + keyboard-present? if exit then + kbd-reset 0= to keyboard-present? + + \ Try resetting the keyboard + kbd-reset 0= to keyboard-present? + keyboard-present? if olpc-set-ec-keymap then ; +[then] fload ${BP}/cpu/x86/pc/olpc/keymap.fth [then] @@ -423,7 +432,6 @@ clear-state [ifdef] ?olpc-keyboard ?olpc-keyboard - keyboard-present? if olpc-set-ec-keymap exit then [else] get-initial-state

1 0