From 6364f98c74f7ec4e3b169b7fa4b7abde80116e76 Mon Sep 17 00:00:00 2001
From: Olivier Martin <olivier@labapart.com>
Date: Thu, 17 Dec 2015 11:00:35 +0000
Subject: [PATCH 1/2] docs/user-guide.md: Renamed legacy `FVP_TSP_RAM_LOCATION`

`FVP_TSP_RAM_LOCATION` has been renamed into `ARM_TSP_RAM_LOCATION`.
---
 docs/user-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/user-guide.md b/docs/user-guide.md
index fa39c4bdb9..047eaee587 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -973,7 +973,7 @@ sections.
     `-C cluster<X>.cpu<X>.RVBAR=@<base-address-of-bl31>`, to the new value of
     `BL31_BASE`.
 
-9.  Changing the default value of `FVP_TSP_RAM_LOCATION` will also require
+9.  Changing the default value of `ARM_TSP_RAM_LOCATION` will also require
     changing the value of
     `--data="<path-to><bl32-binary>"@<base-address-of-bl32>` to the new value of
     `BL32_BASE`.

From 594ad3ce06bf1e040c92ca4e4ed156a9f1236ed3 Mon Sep 17 00:00:00 2001
From: Olivier Martin <olivier@labapart.com>
Date: Thu, 17 Dec 2015 11:09:34 +0000
Subject: [PATCH 2/2] docs/user-guide.md: Remove deprecated
 `FVP_SHARED_DATA_LOCATION`

---
 docs/user-guide.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/docs/user-guide.md b/docs/user-guide.md
index 047eaee587..32bf73dcc9 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -967,13 +967,7 @@ sections.
     X and Y are the cluster and CPU numbers respectively, is used to set the
     reset vector for each core.
 
-8.  Changing the default value of `FVP_SHARED_DATA_LOCATION` will also require
-    changing the value of
-    `--data="<path-to><bl31-binary>"@<base-address-of-bl31>` and
-    `-C cluster<X>.cpu<X>.RVBAR=@<base-address-of-bl31>`, to the new value of
-    `BL31_BASE`.
-
-9.  Changing the default value of `ARM_TSP_RAM_LOCATION` will also require
+8.  Changing the default value of `ARM_TSP_RAM_LOCATION` will also require
     changing the value of
     `--data="<path-to><bl32-binary>"@<base-address-of-bl32>` to the new value of
     `BL32_BASE`.