diff --git a/bl2/bl2_el3.ld.S b/bl2/bl2_el3.ld.S
index 7ec4646..57709e3 100644
--- a/bl2/bl2_el3.ld.S
+++ b/bl2/bl2_el3.ld.S
@@ -25,7 +25,10 @@
 #if SEPARATE_CODE_AND_RODATA
     .text . : {
         __TEXT_START__ = .;
-        *bl2_el3_entrypoint.o(.text*)
+	__TEXT_RESIDENT_START__ = .;
+	*bl2_el3_entrypoint.o(.text*)
+	*(.text.asm.*)
+	__TEXT_RESIDENT_END__ = .;
         *(.text*)
         *(.vectors)
         . = NEXT(PAGE_SIZE);
@@ -54,10 +57,16 @@
         . = NEXT(PAGE_SIZE);
         __RODATA_END__ = .;
     } >RAM
+
+    ASSERT(__TEXT_RESIDENT_END__ - __TEXT_RESIDENT_START__ <= PAGE_SIZE,
+          "Resident part of BL2 has exceeded its limit.")
 #else
     ro . : {
         __RO_START__ = .;
-        *bl2_el3_entrypoint.o(.text*)
+	__TEXT_RESIDENT_START__ = .;
+	*bl2_el3_entrypoint.o(.text*)
+	*(.text.asm.*)
+	__TEXT_RESIDENT_END__ = .;
         *(.text*)
         *(.rodata*)