From: Tom Rini <trini@konsulko.com>
Date: Fri, 21 Dec 2018 18:38:09 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-marvell
X-Git-Tag: v2025.01-rc5-pxa1908~3205
X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/%7B%7B?a=commitdiff_plain;h=562a63e86bc7b308a328a7bbdf0db237855c39a8;p=u-boot.git

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

- Fix breakage in helios4: Change U-Boot offset on SPI Flash
- Enable CONFIG_BLK for db-88f6820-amc
---

562a63e86bc7b308a328a7bbdf0db237855c39a8