Merge "plat/arm: Move defines to platform specific header file"

3 files changed, 52 insertions, 24 deletions

diff --git a/include/common/fwu_nvm.h b/include/common/fwu_nvm.h
index 3865d4b5..d6557ae4 100644
--- a/include/common/fwu_nvm.h
+++ b/include/common/fwu_nvm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -11,32 +11,10 @@
 #include <platform_def.h>
 
 #define FIP_IMAGE_UPDATE_DONE_FLAG		(0xDEADBEEF)
-/*
- * This is the temporary ddr address for loading backup fip.bin
- * image from NVM which is used for replacing original fip.bin
- * This address is chosen such that the NS_BL2U can be expanded
- * in future and also considering the large size of fip.bin.
- */
-#define FIP_IMAGE_TMP_DDR_ADDRESS		(DRAM_BASE + 0x100000)
+
 #define FWU_TFTF_TESTCASE_BUFFER_OFFSET		\
 		(TFTF_NVM_OFFSET + TFTF_STATE_OFFSET(testcase_buffer))
 
-/*
- * This offset is used to corrupt data in fip.bin
- * The offset is from the base where fip.bin is
- * located in NVM. This particular value is chosen
- * to make sure the corruption is done beyond fip header.
- */
-#define FIP_CORRUPT_OFFSET		(0x400)
-
-/*
- * This is the base address for backup fip.bin image in NVM
- * which is used for replacing original fip.bin
- * This address is chosen such that it can stay with all
- * the other images in the NVM.
- */
-#define FIP_BKP_ADDRESS			(FLASH_BASE + 0x1000000)
-
 /* Writes the buffer to the flash at offset with length equal to
  * size
  * Returns: STATUS_FAIL, STATUS_SUCCESS, STATUS_OUT_OF_RESOURCES
diff --git a/plat/arm/fvp/include/platform_def.h b/plat/arm/fvp/include/platform_def.h
index d5dc8184..3abeb039 100644
--- a/plat/arm/fvp/include/platform_def.h
+++ b/plat/arm/fvp/include/platform_def.h
@@ -60,6 +60,31 @@
 #define PLAT_ARM_FWU_FIP_SIZE		(0x100000)
 
 /*******************************************************************************
+ * This is the temporary DDR address for loading backup fip.bin
+ * image from NVM which is used for replacing original fip.bin
+ * This address is chosen such that the NS_BL2U can be expanded
+ * in future and also considering the large size of fip.bin.
+ ******************************************************************************/
+#define FIP_IMAGE_TMP_DDR_ADDRESS	(DRAM_BASE + 0x100000)
+
+/*******************************************************************************
+ * This offset is used to corrupt data in fip.bin
+ * The offset is from the base where fip.bin is
+ * located in NVM. This particular value is chosen
+ * to make sure the corruption is done beyond fip header.
+ ******************************************************************************/
+#define FIP_CORRUPT_OFFSET		(0x400)
+
+/*******************************************************************************
+ * This offset is used to corrupt data in fip.bin
+ * This is the base address for backup fip.bin image in NVM
+ * which is used for replacing original fip.bin
+ * This address is chosen such that it can stay with all
+ * the other images in the NVM.
+ ******************************************************************************/
+#define FIP_BKP_ADDRESS			(FLASH_BASE + 0x1000000)
+
+/*******************************************************************************
  * Base address and size for non-trusted SRAM.
  ******************************************************************************/
 #define NSRAM_BASE				(0x2e000000)
diff --git a/plat/arm/juno/include/platform_def.h b/plat/arm/juno/include/platform_def.h
index 03a71246..0f9bb778 100644
--- a/plat/arm/juno/include/platform_def.h
+++ b/plat/arm/juno/include/platform_def.h
@@ -71,6 +71,31 @@
 #define PLAT_ARM_FWU_FIP_SIZE		(0x100000)
 
 /*******************************************************************************
+ * This is the temporary DDR address for loading backup fip.bin
+ * image from NVM which is used for replacing original fip.bin
+ * This address is chosen such that the NS_BL2U can be expanded
+ * in future and also considering the large size of fip.bin.
+ ******************************************************************************/
+#define FIP_IMAGE_TMP_DDR_ADDRESS	(DRAM_BASE + 0x100000)
+
+/*******************************************************************************
+ * This offset is used to corrupt data in fip.bin
+ * The offset is from the base where fip.bin is
+ * located in NVM. This particular value is chosen
+ * to make sure the corruption is done beyond fip header.
+ ******************************************************************************/
+#define FIP_CORRUPT_OFFSET		(0x400)
+
+/*******************************************************************************
+ * This offset is used to corrupt data in fip.bin
+ * This is the base address for backup fip.bin image in NVM
+ * which is used for replacing original fip.bin
+ * This address is chosen such that it can stay with all
+ * the other images in the NVM.
+ ******************************************************************************/
+#define FIP_BKP_ADDRESS			(FLASH_BASE + 0x1000000)
+
+/*******************************************************************************
  * Base address and size for non-trusted SRAM.
  ******************************************************************************/
 #define NSRAM_BASE				(0x2e000000)