diff --git a/docs/change-log.md b/docs/change-log.md
index 8be7a51..5a9bdb3 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -56,6 +56,9 @@
     is powered on, if a non zero context id parameter was passed in the PSCI
     CPU_ON and CPU_SUSPEND api calls has been corrected.
 
+*   A restriction in the FVP code which did not allow the non-secure entrypoint
+    to lie outside the DRAM has been removed.
+
 ARM Trusted Firmware - version 0.2
 ==================================
 
diff --git a/plat/fvp/fvp_pm.c b/plat/fvp/fvp_pm.c
index 658a285..d3abe1d 100644
--- a/plat/fvp/fvp_pm.c
+++ b/plat/fvp/fvp_pm.c
@@ -58,11 +58,6 @@
 	mailbox *fvp_mboxes;
 	unsigned int psysr;
 
-	if (ns_entrypoint < DRAM_BASE) {
-		rc = PSCI_E_INVALID_PARAMS;
-		goto exit;
-	}
-
 	/*
 	 * It's possible to turn on only affinity level 0 i.e. a cpu
 	 * on the FVP. Ignore any other affinity level.
@@ -193,12 +188,6 @@
 	unsigned long cpu_setup, cci_setup, linear_id;
 	mailbox *fvp_mboxes;
 
-	/* Cannot allow NS world to execute trusted firmware code */
-	if (ns_entrypoint < DRAM_BASE) {
-		rc = PSCI_E_INVALID_PARAMS;
-		goto exit;
-	}
-
 	switch (afflvl) {
 	case MPIDR_AFFLVL1:
 		if (state == PSCI_STATE_OFF) {
@@ -260,7 +249,6 @@
 		assert(0);
 	}
 
-exit:
 	return rc;
 }