Merge pull request #322 from athoelke/at/fix-bl1-assertions
authordanh-arm <dan.handley@arm.com>
Fri, 19 Jun 2015 13:17:14 +0000 (14:17 +0100)
committerdanh-arm <dan.handley@arm.com>
Fri, 19 Jun 2015 13:17:14 +0000 (14:17 +0100)
Fix incorrect assertions in bl1_main()


Trivial merge