Merge "aboot: add support for dsda2"