mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
Merge git://git.denx.de/u-boot-x86
This commit is contained in:
commit
5e2338079d
7 changed files with 64 additions and 7 deletions
|
@ -173,13 +173,13 @@ Device (PCI0)
|
|||
Name (RBUF, ResourceTemplate()
|
||||
{
|
||||
GpioIo(Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 91 }
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 110 }
|
||||
GpioIo(Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 92 }
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 111 }
|
||||
GpioIo(Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 93 }
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 112 }
|
||||
GpioIo(Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 94 }
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 113 }
|
||||
})
|
||||
|
||||
Method (_CRS, 0, NotSerialized)
|
||||
|
@ -245,7 +245,7 @@ Device (PCI0)
|
|||
{
|
||||
Connection (
|
||||
GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly,
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 56 }
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 96 }
|
||||
),
|
||||
WFD3, 1,
|
||||
}
|
||||
|
@ -260,6 +260,57 @@ Device (PCI0)
|
|||
Return (STA_VISIBLE)
|
||||
}
|
||||
}
|
||||
|
||||
Device (HSU0)
|
||||
{
|
||||
Name (_ADR, 0x00040001)
|
||||
|
||||
Method (_STA, 0, NotSerialized)
|
||||
{
|
||||
Return (STA_VISIBLE)
|
||||
}
|
||||
|
||||
Device (BTH0)
|
||||
{
|
||||
Name (_HID, "BCM2E95")
|
||||
Name (_DEP, Package ()
|
||||
{
|
||||
GPIO,
|
||||
HSU0
|
||||
})
|
||||
|
||||
Method (_STA, 0, NotSerialized)
|
||||
{
|
||||
Return (STA_VISIBLE)
|
||||
}
|
||||
|
||||
Method (_CRS, 0, NotSerialized)
|
||||
{
|
||||
Name (RBUF, ResourceTemplate ()
|
||||
{
|
||||
UartSerialBus (0x0001C200, DataBitsEight, StopBitsOne,
|
||||
0xFC, LittleEndian, ParityTypeNone, FlowControlHardware,
|
||||
0x20, 0x20, "\\_SB.PCI0.HSU0", 0, ResourceConsumer, , )
|
||||
GpioInt (Level, ActiveHigh, Exclusive, PullNone, 0,
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 185 }
|
||||
GpioIo (Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly,
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 184 }
|
||||
GpioIo (Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly,
|
||||
"\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 71 }
|
||||
})
|
||||
Return (RBUF)
|
||||
}
|
||||
|
||||
Name (_DSD, Package () {
|
||||
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
|
||||
Package () {
|
||||
Package () { "host-wakeup-gpios", Package () { ^BTH0, 0, 0, 0 } },
|
||||
Package () { "device-wakeup-gpios", Package () { ^BTH0, 1, 0, 0 } },
|
||||
Package () { "shutdown-gpios", Package () { ^BTH0, 2, 0, 0 } },
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Device (FLIS)
|
||||
|
|
|
@ -23,7 +23,6 @@ obj-y += interrupts.o
|
|||
obj-y += lpc-uclass.o
|
||||
obj-y += mpspec.o
|
||||
obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o
|
||||
obj-y += cmd_mtrr.o
|
||||
obj-y += northbridge-uclass.o
|
||||
obj-$(CONFIG_I8259_PIC) += i8259.o
|
||||
obj-$(CONFIG_I8254_TIMER) += i8254.o
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-y += cmd_fsp.o
|
||||
obj-y += fsp_car.o
|
||||
obj-y += fsp_common.o
|
||||
obj-y += fsp_dram.o
|
||||
|
|
|
@ -150,6 +150,8 @@ obj-$(CONFIG_CMD_PMIC) += pmic.o
|
|||
obj-$(CONFIG_CMD_REGULATOR) += regulator.o
|
||||
|
||||
obj-$(CONFIG_CMD_BLOB) += blob.o
|
||||
|
||||
obj-$(CONFIG_X86) += x86/
|
||||
endif # !CONFIG_SPL_BUILD
|
||||
|
||||
# core command
|
||||
|
|
6
cmd/x86/Makefile
Normal file
6
cmd/x86/Makefile
Normal file
|
@ -0,0 +1,6 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-y += mtrr.o
|
||||
obj-$(CONFIG_HAVE_FSP) += fsp.o
|
Loading…
Add table
Reference in a new issue