diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-19 20:35:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-19 20:35:05 -0400 |
| commit | 333279af23ac08ebc8d8056c677c98964dd013b6 (patch) | |
| tree | 0bf60843317e6cf18fb99371cd9f6416c8b1e8fe /include/configs/nas220.h | |
| parent | 4e710ebb4463c8e031eb269c012fbadb2479608b (diff) | |
| parent | e32ac37119394f2d3c579b2cdd549bed59fb583f (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Multiples updates to the turris boards / platform
- Changes / enhancements to the Marvell PHY drivers, mainly
to support the turris platform
- Many fixes and enhancements to the pxa3xx NAND driver
- Fixes for the UART boot mode in kwboot
- Misc minor changes to other 32bit and 64bit boards
Diffstat (limited to 'include/configs/nas220.h')
| -rw-r--r-- | include/configs/nas220.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/nas220.h b/include/configs/nas220.h index ca5cb2a838..bdfa42fd30 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -69,7 +69,6 @@ "0x500000@0xc0000(uimage),"\ "0x1a40000@0x5c0000(rootfs)\0" \ "mtdids=nand0=orion_nand\0"\ - "bootdelay=-1\0"\ "autostart=no\0"\ "autoload=no\0" |