diff --git a/[refs] b/[refs] index a6ba3c6fe496..61c393431f4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98fb96aaad39f5ec1f111b591f55e5df0de28622 +refs/heads/master: d892a91730013b306cef3b55be6cc0b2755d6d24 diff --git a/trunk/arch/arm/include/debug/vexpress.S b/trunk/arch/arm/include/debug/vexpress.S index 0c6abbf4c82b..dc8e882a6257 100644 --- a/trunk/arch/arm/include/debug/vexpress.S +++ b/trunk/arch/arm/include/debug/vexpress.S @@ -21,6 +21,7 @@ #if defined(CONFIG_DEBUG_VEXPRESS_UART0_DETECT) .macro addruart,rp,rv,tmp + .arch armv7-a @ Make an educated guess regarding the memory map: @ - the original A9 core tile (based on ARM Cortex-A9 r0p1)