diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-02 20:50:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-02 20:50:59 -0400 |
| commit | 41a85fe3b926385816e1958e2e4a521cae79921e (patch) | |
| tree | c05a2ad341c991c58fbaf1496487158255e66fe5 | |
| parent | e3f24d4f2c4ce48f666ef6098e166521dde6f688 (diff) | |
| parent | f04034cba4c2351da5b54ae36f5a30e3ccfce1cc (diff) | |
| download | u-boot-41a85fe3b926385816e1958e2e4a521cae79921e.tar.gz | |
Merge git://git.denx.de/u-boot-x86
| -rw-r--r-- | arch/x86/cpu/baytrail/acpi.c | 2 | ||||
| -rw-r--r-- | drivers/spi/ich.c | 5 | ||||
| -rw-r--r-- | include/configs/theadorable-x86-common.h | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index cbefdf871d..7aac634d66 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -73,7 +73,7 @@ void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, fadt->reset_reg.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS; fadt->reset_reg.addrl = IO_PORT_RESET; fadt->reset_reg.addrh = 0; - fadt->reset_value = SYS_RST | RST_CPU; + fadt->reset_value = SYS_RST | RST_CPU | FULL_RST; fadt->x_firmware_ctl_l = (u32)facs; fadt->x_firmware_ctl_h = 0; diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 373bc2683b..22fc83dd72 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -468,8 +468,6 @@ static int ich_spi_xfer(struct udevice *dev, unsigned int bitlen, } /* Preset control fields */ - control = ich_readw(ctlr, ctlr->control); - control &= ~SSFC_RESERVED; control = SPIC_SCGO | ((opcode_index & 0x07) << 4); /* Issue atomic preop cycle if needed */ @@ -565,7 +563,8 @@ static int ich_spi_xfer(struct udevice *dev, unsigned int bitlen, } /* Clear atomic preop now that xfer is done */ - ich_writew(ctlr, 0, ctlr->preop); + if (!lock) + ich_writew(ctlr, 0, ctlr->preop); return 0; } diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index 37b78c1b57..8de659a496 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -88,7 +88,7 @@ "/boot/initrd.img-${kernel-ver}-generic;" \ "run boot\0" \ "yocto_args=setenv bootargs root=/dev/sda${yocto_part} " \ - "ip=dhcp panic=1\0" \ + "panic=1\0" \ "yocto_args_fast=setenv bootargs root=/dev/sda${yocto_part} " \ "quiet panic=1\0" \ "yocto_boot=run yocto_args addmtd addmisc addtty_yocto;" \ @@ -110,7 +110,7 @@ "fi\0" \ "swupdate-initrd=/boot/swupdate-image-theadorable.ext4.gz\0" \ "swupdate-kernel=/boot/bzImage\0" \ - "swupdate_args=setenv bootargs root=/dev/ram rw ip=dhcp panic=1\0" \ + "swupdate_args=setenv bootargs root=/dev/ram rw panic=1\0" \ "swupdate_dev=0\0" \ "swupdate_factory=0\0" \ "swupdate_interface=usb\0" \ |