The Digi commits on the imx-atf repository are now part of the same branch and apply on top of each other since they do not collide with each other. Signed-off-by: Hector Palacios <hector.palacios@digi.com>