Merge pull request #310 from sandrine-bailleux/sb/tf-issue-304-phase1

Enhance BL3-1 entrypoint handling to support non-TF boot firmware - Phase 1

diff --cc Makefile
Simple merge

diff --cc docs/user-guide.md
index 9a9334f2f6e241a315d2d4d454a86443a5fd8f6b,908665cbcf47d6b6eebec5eefcab5ca40ad6c13e..ef26f118bb33832345f9272aa425740961b8c65b
--- 1/docs/user-guide.md
--- 2/docs/user-guide.md
+++ b/docs/user-guide.md
@@@ -320,9 -320,13 +320,13 @@@ performed
  *   `BL33_KEY`: This option is used when `GENERATE_COT=1`. It specifies the
      file that contains the BL3-3 private key in PEM format.
  
+ *   `PROGRAMMABLE_RESET_ADDRESS`: This option indicates whether the reset
+     vector address can be programmed or is fixed on the platform. It can take
+     either 0 (fixed) or 1 (programmable). Default is 0.
+ 
  #### ARM development platform specific build options
  
 -*   `ARM_TSP_RAM_LOCATION_ID`: location of the TSP binary. Options:
 +*   `ARM_TSP_RAM_LOCATION`: location of the TSP binary. Options:
      -   `tsram` : Trusted SRAM (default option)
      -   `tdram` : Trusted DRAM (if available)
      -   `dram`  : Secure region in DRAM (configured by the TrustZone controller)