dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-x86

Browse Source
This commit is contained in:
Tom Rini
2017-09-02 20:50:59 -04:00
parent e3f24d4f2c f04034cba4
commit 41a85fe3b9
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/cpu/baytrail/acpi.c
View File

@@ -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.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
fadt->reset_reg.addrl = IO_PORT_RESET; fadt->reset_reg.addrl = IO_PORT_RESET;
fadt->reset_reg.addrh = 0; 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_l = (u32)facs;
fadt->x_firmware_ctl_h = 0; fadt->x_firmware_ctl_h = 0;

5
drivers/spi/ich.c
View File

@@ -468,8 +468,6 @@ static int ich_spi_xfer(struct udevice *dev, unsigned int bitlen,
} }
/* Preset control fields */ /* Preset control fields */
control = ich_readw(ctlr, ctlr->control);
control &= ~SSFC_RESERVED;
control = SPIC_SCGO | ((opcode_index & 0x07) << 4); control = SPIC_SCGO | ((opcode_index & 0x07) << 4);
/* Issue atomic preop cycle if needed */ /* 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 */ /* Clear atomic preop now that xfer is done */
ich_writew(ctlr, 0, ctlr->preop); if (!lock)
ich_writew(ctlr, 0, ctlr->preop);
return 0; return 0;
} }

4
include/configs/theadorable-x86-common.h
View File

@@ -88,7 +88,7 @@
"/boot/initrd.img-${kernel-ver}-generic;" \ "/boot/initrd.img-${kernel-ver}-generic;" \
"run boot\0" \ "run boot\0" \
"yocto_args=setenv bootargs root=/dev/sda${yocto_part} " \ "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} " \ "yocto_args_fast=setenv bootargs root=/dev/sda${yocto_part} " \
"quiet panic=1\0" \ "quiet panic=1\0" \
"yocto_boot=run yocto_args addmtd addmisc addtty_yocto;" \ "yocto_boot=run yocto_args addmtd addmisc addtty_yocto;" \
@@ -110,7 +110,7 @@
"fi\0" \ "fi\0" \
"swupdate-initrd=/boot/swupdate-image-theadorable.ext4.gz\0" \ "swupdate-initrd=/boot/swupdate-image-theadorable.ext4.gz\0" \
"swupdate-kernel=/boot/bzImage\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_dev=0\0" \
"swupdate_factory=0\0" \ "swupdate_factory=0\0" \
"swupdate_interface=usb\0" \ "swupdate_interface=usb\0" \