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 /include | |
| parent | e3f24d4f2c4ce48f666ef6098e166521dde6f688 (diff) | |
| parent | f04034cba4c2351da5b54ae36f5a30e3ccfce1cc (diff) | |
| download | u-boot-41a85fe3b926385816e1958e2e4a521cae79921e.zip u-boot-41a85fe3b926385816e1958e2e4a521cae79921e.tar.gz u-boot-41a85fe3b926385816e1958e2e4a521cae79921e.tar.bz2 | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/theadorable-x86-common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index 37b78c1..8de659a 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" \ |