Move FVP power driver to FVP platform
Move the FVP power driver to a directory under the FVP platform
port as this is not a generically usable driver.
Change-Id: Ibc78bd88752eb3e3964336741488349ac345f4f0
diff --git a/plat/fvp/aarch64/bl1_plat_helpers.S b/plat/fvp/aarch64/bl1_plat_helpers.S
index 15e3a21..69fb14b 100644
--- a/plat/fvp/aarch64/bl1_plat_helpers.S
+++ b/plat/fvp/aarch64/bl1_plat_helpers.S
@@ -30,9 +30,9 @@
#include <arch.h>
#include <platform.h>
-#include <fvp_pwrc.h>
#include <gic.h>
#include <asm_macros.S>
+#include "../drivers/pwrc/fvp_pwrc.h"
.globl platform_get_entrypoint
.globl platform_cold_boot_init
diff --git a/plat/fvp/bl31_plat_setup.c b/plat/fvp/bl31_plat_setup.c
index 9bf83eb..bd167df 100644
--- a/plat/fvp/bl31_plat_setup.c
+++ b/plat/fvp/bl31_plat_setup.c
@@ -30,8 +30,8 @@
#include <platform.h>
#include <arch.h>
-#include <fvp_pwrc.h>
#include <console.h>
+#include "drivers/pwrc/fvp_pwrc.h"
/*******************************************************************************
* Declarations of linker defined symbols which will help us find the layout
diff --git a/drivers/power/fvp_pwrc.c b/plat/fvp/drivers/pwrc/fvp_pwrc.c
similarity index 98%
rename from drivers/power/fvp_pwrc.c
rename to plat/fvp/drivers/pwrc/fvp_pwrc.c
index 3916c04..164a734 100644
--- a/drivers/power/fvp_pwrc.c
+++ b/plat/fvp/drivers/pwrc/fvp_pwrc.c
@@ -34,8 +34,8 @@
#include <assert.h>
#include <arch_helpers.h>
#include <platform.h>
-#include <fvp_pwrc.h>
#include <bakery_lock.h>
+#include "fvp_pwrc.h"
/*
* TODO: Someday there will be a generic power controller api. At the moment
diff --git a/include/drivers/fvp_pwrc.h b/plat/fvp/drivers/pwrc/fvp_pwrc.h
similarity index 100%
rename from include/drivers/fvp_pwrc.h
rename to plat/fvp/drivers/pwrc/fvp_pwrc.h
diff --git a/plat/fvp/plat_pm.c b/plat/fvp/plat_pm.c
index 7b51476..2a414c9 100644
--- a/plat/fvp/plat_pm.c
+++ b/plat/fvp/plat_pm.c
@@ -39,9 +39,9 @@
#include <bakery_lock.h>
#include <cci400.h>
#include <gic.h>
-#include <fvp_pwrc.h>
/* Only included for error codes */
#include <psci.h>
+#include "drivers/pwrc/fvp_pwrc.h"
/*******************************************************************************
* FVP handler called when an affinity instance is about to enter standby.
diff --git a/plat/fvp/plat_topology.c b/plat/fvp/plat_topology.c
index 0c8c525..765077e 100644
--- a/plat/fvp/plat_topology.c
+++ b/plat/fvp/plat_topology.c
@@ -31,9 +31,9 @@
#include <string.h>
#include <assert.h>
#include <platform.h>
-#include <fvp_pwrc.h>
/* TODO: Reusing psci error codes & state information. Get our own! */
#include <psci.h>
+#include "drivers/pwrc/fvp_pwrc.h"
/* We treat '255' as an invalid affinity instance */
#define AFFINST_INVAL 0xff
diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk
index 2b904ee..f55000d 100644
--- a/plat/fvp/platform.mk
+++ b/plat/fvp/platform.mk
@@ -57,8 +57,8 @@
lib/${ARCH} \
lib/semihosting \
lib/stdlib \
- drivers/power \
- drivers/io
+ drivers/io \
+ plat/fvp/drivers/pwrc
PLAT_BL31_S_VPATH := lib/semihosting/${ARCH}