aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Handley <dan.handley@arm.com>2014-04-09 12:48:25 +0100
committerDan Handley <dan.handley@arm.com>2014-05-06 12:35:02 +0100
commit4ecca33988b90de43ec4f4a929094a38a23fda31 (patch)
treead1fa01314b562bfbdac77a39451ef7967c0ff03
parentb495bdef190acf166c713e138b61c5bb25402fc0 (diff)
downloadarm-trusted-firmware-4ecca33988b90de43ec4f4a929094a38a23fda31.tar.gz
Move include and source files to logical locations
Move almost all system include files to a logical sub-directory under ./include. The only remaining system include directories not under ./include are specific to the platform. Move the corresponding source files to match the include directory structure. Also remove pm.h as it is no longer used. Change-Id: Ie5ea6368ec5fad459f3e8a802ad129135527f0b3
-rw-r--r--Makefile18
-rw-r--r--bl1/bl1.mk9
-rw-r--r--bl2/bl2.mk6
-rw-r--r--bl31/bl31.mk12
-rw-r--r--bl31/runtime_svc.c (renamed from common/runtime_svc.c)0
-rw-r--r--bl32/tsp/tsp.mk6
-rw-r--r--drivers/arm/cci400/cci400.c (renamed from drivers/arm/interconnect/cci-400/cci400.c)6
-rw-r--r--drivers/arm/gic/aarch64/gic_v3_sysregs.S (renamed from arch/system/gic/aarch64/gic_v3_sysregs.S)0
-rw-r--r--drivers/arm/gic/gic_v2.c (renamed from arch/system/gic/gic_v2.c)0
-rw-r--r--drivers/arm/gic/gic_v3.c (renamed from arch/system/gic/gic_v3.c)0
-rw-r--r--drivers/arm/pl011/pl011.c (renamed from drivers/arm/peripherals/pl011/pl011.c)0
-rw-r--r--drivers/arm/pl011/pl011_console.c (renamed from drivers/arm/peripherals/pl011/pl011_console.c)0
-rw-r--r--drivers/arm/tzc400/tzc400.c (renamed from drivers/arm/interconnect/tzc-400/tzc400.c)0
-rw-r--r--include/bl1/bl1.h (renamed from include/bl1.h)0
-rw-r--r--include/bl2/bl2.h (renamed from include/bl2.h)0
-rw-r--r--include/bl31/bl31.h (renamed from include/bl31.h)0
-rw-r--r--include/bl31/cm_macros.S (renamed from include/cm_macros.S)0
-rw-r--r--include/bl31/context.h (renamed from include/context.h)0
-rw-r--r--include/bl31/context_mgmt.h (renamed from include/context_mgmt.h)0
-rw-r--r--include/bl31/runtime_svc.h (renamed from include/runtime_svc.h)0
-rw-r--r--include/bl31/services/psci.h (renamed from include/psci.h)0
-rw-r--r--include/bl31/services/std_svc.h (renamed from include/std_svc.h)0
-rw-r--r--include/bl32/bl32.h (renamed from include/bl32.h)0
-rw-r--r--include/bl32/payloads/tsp.h (renamed from include/tsp.h)0
-rw-r--r--include/common/asm_macros.S (renamed from include/asm_macros.S)0
-rw-r--r--include/common/bl_common.h (renamed from include/bl_common.h)23
-rw-r--r--include/common/debug.h (renamed from include/debug.h)0
-rw-r--r--include/common/firmware_image_package.h (renamed from include/firmware_image_package.h)0
-rw-r--r--include/drivers/arm/cci400.h (renamed from drivers/arm/interconnect/cci-400/cci400.h)0
-rw-r--r--include/drivers/arm/gic.h (renamed from arch/system/gic/gic.h)0
-rw-r--r--include/drivers/arm/gic_v2.h (renamed from arch/system/gic/gic_v2.h)0
-rw-r--r--include/drivers/arm/gic_v3.h (renamed from arch/system/gic/gic_v3.h)0
-rw-r--r--include/drivers/arm/pl011.h (renamed from drivers/arm/peripherals/pl011/pl011.h)0
-rw-r--r--include/drivers/arm/tzc400.h (renamed from drivers/arm/interconnect/tzc-400/tzc400.h)0
-rw-r--r--include/drivers/console.h (renamed from drivers/console/console.h)0
-rw-r--r--include/drivers/fvp_pwrc.h (renamed from drivers/power/fvp_pwrc.h)0
-rw-r--r--include/drivers/io_driver.h (renamed from drivers/io/io_driver.h)0
-rw-r--r--include/drivers/io_fip.h (renamed from drivers/io/io_fip.h)0
-rw-r--r--include/drivers/io_memmap.h (renamed from drivers/io/io_memmap.h)0
-rw-r--r--include/drivers/io_semihosting.h (renamed from drivers/io/io_semihosting.h)0
-rw-r--r--include/lib/aarch64/arch.h (renamed from include/aarch64/arch.h)0
-rw-r--r--include/lib/aarch64/arch_helpers.h (renamed from include/aarch64/arch_helpers.h)0
-rw-r--r--include/lib/aarch64/xlat_tables.h (renamed from include/aarch64/xlat_tables.h)0
-rw-r--r--include/lib/bakery_lock.h (renamed from include/bakery_lock.h)8
-rw-r--r--include/lib/io_storage.h (renamed from include/io_storage.h)0
-rw-r--r--include/lib/mmio.h (renamed from include/mmio.h)0
-rw-r--r--include/lib/semihosting.h (renamed from include/semihosting.h)0
-rw-r--r--include/lib/spinlock.h (renamed from include/spinlock.h)0
-rw-r--r--include/pm.h66
-rw-r--r--lib/aarch64/cache_helpers.S (renamed from lib/arch/aarch64/cache_helpers.S)0
-rw-r--r--lib/aarch64/cpu_helpers.S (renamed from arch/aarch64/cpu/cpu_helpers.S)0
-rw-r--r--lib/aarch64/misc_helpers.S (renamed from lib/arch/aarch64/misc_helpers.S)0
-rw-r--r--lib/aarch64/sysreg_helpers.S (renamed from lib/arch/aarch64/sysreg_helpers.S)0
-rw-r--r--lib/aarch64/tlb_helpers.S (renamed from lib/arch/aarch64/tlb_helpers.S)0
-rw-r--r--lib/aarch64/xlat_helpers.c (renamed from lib/arch/aarch64/xlat_helpers.c)0
-rw-r--r--lib/aarch64/xlat_tables.c (renamed from lib/arch/aarch64/xlat_tables.c)0
-rw-r--r--lib/locks/bakery/bakery_lock.c (renamed from lib/sync/locks/bakery/bakery_lock.c)6
-rw-r--r--lib/locks/exclusive/spinlock.S (renamed from lib/sync/locks/exclusive/spinlock.S)0
-rw-r--r--plat/fvp/platform.mk29
-rw-r--r--services/spd/tspd/tspd.mk2
l---------tools/fip_create/firmware_image_package.h2
61 files changed, 64 insertions, 129 deletions
diff --git a/Makefile b/Makefile
index f4b74fe..aa9b0a1 100644
--- a/Makefile
+++ b/Makefile
@@ -132,14 +132,20 @@ endif
.SUFFIXES:
-INCLUDES += -Ilib/include/ \
- -Idrivers/io \
- -Iinclude/${ARCH}/ \
- -Iinclude/ \
- -Iarch/system/gic \
- -Iservices/std_svc/psci \
+INCLUDES += -Iinclude/bl1 \
+ -Iinclude/bl2 \
+ -Iinclude/bl31 \
+ -Iinclude/bl31/services \
+ -Iinclude/bl32 \
+ -Iinclude/bl32/payloads \
+ -Iinclude/common \
+ -Iinclude/drivers \
+ -Iinclude/drivers/arm \
+ -Iinclude/lib \
+ -Iinclude/lib/aarch64 \
-Iinclude/stdlib \
-Iinclude/stdlib/sys \
+ -Iservices/std_svc/psci \
-Iplat/${PLAT} \
${PLAT_INCLUDES} \
${SPD_INCLUDES}
diff --git a/bl1/bl1.mk b/bl1/bl1.mk
index c2101b0..60609ea 100644
--- a/bl1/bl1.mk
+++ b/bl1/bl1.mk
@@ -32,15 +32,12 @@ vpath %.c plat/${PLAT} \
plat/${PLAT}/${ARCH} \
common \
lib \
- arch/${ARCH} \
- lib/arch/${ARCH} \
+ lib/${ARCH} \
${PLAT_BL1_C_VPATH}
-vpath %.S arch/${ARCH}/cpu \
- plat/common/${ARCH} \
+vpath %.S plat/common/${ARCH} \
plat/${PLAT}/${ARCH} \
- include \
- lib/arch/${ARCH} \
+ lib/${ARCH} \
${PLAT_BL1_S_VPATH}
BL1_SOURCES += bl1_arch_setup.c \
diff --git a/bl2/bl2.mk b/bl2/bl2.mk
index d53c1aa..3ecaff9 100644
--- a/bl2/bl2.mk
+++ b/bl2/bl2.mk
@@ -32,12 +32,10 @@ vpath %.c common \
lib \
plat/${PLAT} \
plat/${PLAT}/${ARCH} \
- arch/${ARCH} \
${PLAT_BL2_C_VPATH}
-vpath %.S lib/arch/${ARCH} \
- include \
- lib/sync/locks/exclusive \
+vpath %.S lib/${ARCH} \
+ lib/locks/exclusive \
common/${ARCH} \
${PLAT_BL2_S_VPATH}
diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index 38765bc..420597c 100644
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -30,23 +30,21 @@
vpath %.c common \
lib \
- arch/system/gic \
+ drivers/arm/gic \
plat/${PLAT} \
- arch/${ARCH} \
services/std_svc \
services/std_svc/psci \
- lib/sync/locks/bakery \
+ lib/locks/bakery \
plat/${PLAT}/${ARCH} \
${PLAT_BL31_C_VPATH}
-vpath %.S lib/arch/${ARCH} \
+vpath %.S lib/${ARCH} \
services/std_svc \
services/std_svc/psci \
- include \
plat/${PLAT}/${ARCH} \
- lib/sync/locks/exclusive \
+ lib/locks/exclusive \
plat/common/${ARCH} \
- arch/system/gic/${ARCH} \
+ drivers/arm/gic/${ARCH} \
common/${ARCH} \
${PLAT_BL31_S_VPATH}
diff --git a/common/runtime_svc.c b/bl31/runtime_svc.c
index 1628e8d..1628e8d 100644
--- a/common/runtime_svc.c
+++ b/bl31/runtime_svc.c
diff --git a/bl32/tsp/tsp.mk b/bl32/tsp/tsp.mk
index 2aedf61..d07b18b 100644
--- a/bl32/tsp/tsp.mk
+++ b/bl32/tsp/tsp.mk
@@ -32,11 +32,9 @@ vpath %.c common \
lib \
plat/${PLAT} \
plat/${PLAT}/${ARCH} \
- arch/${ARCH}
-vpath %.S lib/arch/${ARCH} \
- include \
- lib/sync/locks/exclusive \
+vpath %.S lib/${ARCH} \
+ lib/locks/exclusive \
common/${ARCH}
BL32_SOURCES += tsp_entrypoint.S \
diff --git a/drivers/arm/interconnect/cci-400/cci400.c b/drivers/arm/cci400/cci400.c
index cd5446f..4ca55b1 100644
--- a/drivers/arm/interconnect/cci-400/cci400.c
+++ b/drivers/arm/cci400/cci400.c
@@ -44,7 +44,8 @@ void cci_enable_coherency(unsigned long mpidr)
DVM_EN_BIT | SNOOP_EN_BIT);
/* Wait for the dust to settle down */
- while (mmio_read_32(CCI400_BASE + STATUS_REG) & CHANGE_PENDING_BIT);
+ while (mmio_read_32(CCI400_BASE + STATUS_REG) & CHANGE_PENDING_BIT)
+ ;
}
void cci_disable_coherency(unsigned long mpidr)
@@ -54,6 +55,7 @@ void cci_disable_coherency(unsigned long mpidr)
~(DVM_EN_BIT | SNOOP_EN_BIT));
/* Wait for the dust to settle down */
- while (mmio_read_32(CCI400_BASE + STATUS_REG) & CHANGE_PENDING_BIT);
+ while (mmio_read_32(CCI400_BASE + STATUS_REG) & CHANGE_PENDING_BIT)
+ ;
}
diff --git a/arch/system/gic/aarch64/gic_v3_sysregs.S b/drivers/arm/gic/aarch64/gic_v3_sysregs.S
index 2a96da7..2a96da7 100644
--- a/arch/system/gic/aarch64/gic_v3_sysregs.S
+++ b/drivers/arm/gic/aarch64/gic_v3_sysregs.S
diff --git a/arch/system/gic/gic_v2.c b/drivers/arm/gic/gic_v2.c
index 6af0378..6af0378 100644
--- a/arch/system/gic/gic_v2.c
+++ b/drivers/arm/gic/gic_v2.c
diff --git a/arch/system/gic/gic_v3.c b/drivers/arm/gic/gic_v3.c
index b7db1f0..b7db1f0 100644
--- a/arch/system/gic/gic_v3.c
+++ b/drivers/arm/gic/gic_v3.c
diff --git a/drivers/arm/peripherals/pl011/pl011.c b/drivers/arm/pl011/pl011.c
index 8288cd8..8288cd8 100644
--- a/drivers/arm/peripherals/pl011/pl011.c
+++ b/drivers/arm/pl011/pl011.c
diff --git a/drivers/arm/peripherals/pl011/pl011_console.c b/drivers/arm/pl011/pl011_console.c
index 1a684ff..1a684ff 100644
--- a/drivers/arm/peripherals/pl011/pl011_console.c
+++ b/drivers/arm/pl011/pl011_console.c
diff --git a/drivers/arm/interconnect/tzc-400/tzc400.c b/drivers/arm/tzc400/tzc400.c
index b88e34a..b88e34a 100644
--- a/drivers/arm/interconnect/tzc-400/tzc400.c
+++ b/drivers/arm/tzc400/tzc400.c
diff --git a/include/bl1.h b/include/bl1/bl1.h
index e1d50c0..e1d50c0 100644
--- a/include/bl1.h
+++ b/include/bl1/bl1.h
diff --git a/include/bl2.h b/include/bl2/bl2.h
index d0ff69b..d0ff69b 100644
--- a/include/bl2.h
+++ b/include/bl2/bl2.h
diff --git a/include/bl31.h b/include/bl31/bl31.h
index b8c603a..b8c603a 100644
--- a/include/bl31.h
+++ b/include/bl31/bl31.h
diff --git a/include/cm_macros.S b/include/bl31/cm_macros.S
index 9eeec18..9eeec18 100644
--- a/include/cm_macros.S
+++ b/include/bl31/cm_macros.S
diff --git a/include/context.h b/include/bl31/context.h
index cb4cd8e..cb4cd8e 100644
--- a/include/context.h
+++ b/include/bl31/context.h
diff --git a/include/context_mgmt.h b/include/bl31/context_mgmt.h
index 35f7c8c..35f7c8c 100644
--- a/include/context_mgmt.h
+++ b/include/bl31/context_mgmt.h
diff --git a/include/runtime_svc.h b/include/bl31/runtime_svc.h
index 148c0bc..148c0bc 100644
--- a/include/runtime_svc.h
+++ b/include/bl31/runtime_svc.h
diff --git a/include/psci.h b/include/bl31/services/psci.h
index e290793..e290793 100644
--- a/include/psci.h
+++ b/include/bl31/services/psci.h
diff --git a/include/std_svc.h b/include/bl31/services/std_svc.h
index cbd5b62..cbd5b62 100644
--- a/include/std_svc.h
+++ b/include/bl31/services/std_svc.h
diff --git a/include/bl32.h b/include/bl32/bl32.h
index 88e18bd..88e18bd 100644
--- a/include/bl32.h
+++ b/include/bl32/bl32.h
diff --git a/include/tsp.h b/include/bl32/payloads/tsp.h
index 9d747d7..9d747d7 100644
--- a/include/tsp.h
+++ b/include/bl32/payloads/tsp.h
diff --git a/include/asm_macros.S b/include/common/asm_macros.S
index 8bcb7d2..8bcb7d2 100644
--- a/include/asm_macros.S
+++ b/include/common/asm_macros.S
diff --git a/include/bl_common.h b/include/common/bl_common.h
index ba6dc11..a751d78 100644
--- a/include/bl_common.h
+++ b/include/common/bl_common.h
@@ -127,19 +127,22 @@ extern void __dead2 raise_el(aapcs64_params *);
extern void __dead2 change_el(el_change_info *);
extern unsigned long make_spsr(unsigned long, unsigned long, unsigned long);
extern void init_bl2_mem_layout(meminfo *,
- meminfo *,
- unsigned int,
- unsigned long) __attribute__((weak));
+ meminfo *,
+ unsigned int,
+ unsigned long) __attribute__((weak));
extern void init_bl31_mem_layout(const meminfo *,
- meminfo *,
- unsigned int) __attribute__((weak));
+ meminfo *,
+ unsigned int) __attribute__((weak));
extern unsigned long image_size(const char *);
-extern unsigned long load_image(meminfo *, const char *, unsigned int, unsigned long);
+extern unsigned long load_image(meminfo *,
+ const char *,
+ unsigned int,
+ unsigned long);
extern void __dead2 run_image(unsigned long entrypoint,
- unsigned long spsr,
- unsigned long security_state,
- void *first_arg,
- void *second_arg);
+ unsigned long spsr,
+ unsigned long security_state,
+ void *first_arg,
+ void *second_arg);
extern unsigned long *get_el_change_mem_ptr(void);
extern const char build_message[];
diff --git a/include/debug.h b/include/common/debug.h
index f829477..f829477 100644
--- a/include/debug.h
+++ b/include/common/debug.h
diff --git a/include/firmware_image_package.h b/include/common/firmware_image_package.h
index ff5e971..ff5e971 100644
--- a/include/firmware_image_package.h
+++ b/include/common/firmware_image_package.h
diff --git a/drivers/arm/interconnect/cci-400/cci400.h b/include/drivers/arm/cci400.h
index 3921675..3921675 100644
--- a/drivers/arm/interconnect/cci-400/cci400.h
+++ b/include/drivers/arm/cci400.h
diff --git a/arch/system/gic/gic.h b/include/drivers/arm/gic.h
index 3266043..3266043 100644
--- a/arch/system/gic/gic.h
+++ b/include/drivers/arm/gic.h
diff --git a/arch/system/gic/gic_v2.h b/include/drivers/arm/gic_v2.h
index 30bd4fc..30bd4fc 100644
--- a/arch/system/gic/gic_v2.h
+++ b/include/drivers/arm/gic_v2.h
diff --git a/arch/system/gic/gic_v3.h b/include/drivers/arm/gic_v3.h
index df7e7fd..df7e7fd 100644
--- a/arch/system/gic/gic_v3.h
+++ b/include/drivers/arm/gic_v3.h
diff --git a/drivers/arm/peripherals/pl011/pl011.h b/include/drivers/arm/pl011.h
index 5ad2fc7..5ad2fc7 100644
--- a/drivers/arm/peripherals/pl011/pl011.h
+++ b/include/drivers/arm/pl011.h
diff --git a/drivers/arm/interconnect/tzc-400/tzc400.h b/include/drivers/arm/tzc400.h
index 7eaafd2..7eaafd2 100644
--- a/drivers/arm/interconnect/tzc-400/tzc400.h
+++ b/include/drivers/arm/tzc400.h
diff --git a/drivers/console/console.h b/include/drivers/console.h
index e285909..e285909 100644
--- a/drivers/console/console.h
+++ b/include/drivers/console.h
diff --git a/drivers/power/fvp_pwrc.h b/include/drivers/fvp_pwrc.h
index f600a24..f600a24 100644
--- a/drivers/power/fvp_pwrc.h
+++ b/include/drivers/fvp_pwrc.h
diff --git a/drivers/io/io_driver.h b/include/drivers/io_driver.h
index 82dbbf1..82dbbf1 100644
--- a/drivers/io/io_driver.h
+++ b/include/drivers/io_driver.h
diff --git a/drivers/io/io_fip.h b/include/drivers/io_fip.h
index 56dd1e0..56dd1e0 100644
--- a/drivers/io/io_fip.h
+++ b/include/drivers/io_fip.h
diff --git a/drivers/io/io_memmap.h b/include/drivers/io_memmap.h
index 5fa7bc9..5fa7bc9 100644
--- a/drivers/io/io_memmap.h
+++ b/include/drivers/io_memmap.h
diff --git a/drivers/io/io_semihosting.h b/include/drivers/io_semihosting.h
index 7dc632d..7dc632d 100644
--- a/drivers/io/io_semihosting.h
+++ b/include/drivers/io_semihosting.h
diff --git a/include/aarch64/arch.h b/include/lib/aarch64/arch.h
index a41e82b..a41e82b 100644
--- a/include/aarch64/arch.h
+++ b/include/lib/aarch64/arch.h
diff --git a/include/aarch64/arch_helpers.h b/include/lib/aarch64/arch_helpers.h
index f55c003..f55c003 100644
--- a/include/aarch64/arch_helpers.h
+++ b/include/lib/aarch64/arch_helpers.h
diff --git a/include/aarch64/xlat_tables.h b/include/lib/aarch64/xlat_tables.h
index 01b1afe..01b1afe 100644
--- a/include/aarch64/xlat_tables.h
+++ b/include/lib/aarch64/xlat_tables.h
diff --git a/include/bakery_lock.h b/include/lib/bakery_lock.h
index da5d9dd..6e6e966 100644
--- a/include/bakery_lock.h
+++ b/include/lib/bakery_lock.h
@@ -44,10 +44,10 @@ typedef struct {
#define NO_OWNER (-1)
-void bakery_lock_init(bakery_lock* bakery);
-void bakery_lock_get(unsigned long mpidr, bakery_lock* bakery);
-void bakery_lock_release(unsigned long mpidr, bakery_lock* bakery);
-int bakery_lock_try(unsigned long mpidr, bakery_lock* bakery);
+void bakery_lock_init(bakery_lock *bakery);
+void bakery_lock_get(unsigned long mpidr, bakery_lock *bakery);
+void bakery_lock_release(unsigned long mpidr, bakery_lock *bakery);
+int bakery_lock_try(unsigned long mpidr, bakery_lock *bakery);
#endif /*__ASSEMBLY__*/
#endif /* __BAKERY_LOCK_H__ */
diff --git a/include/io_storage.h b/include/lib/io_storage.h
index 04e63c3..04e63c3 100644
--- a/include/io_storage.h
+++ b/include/lib/io_storage.h
diff --git a/include/mmio.h b/include/lib/mmio.h
index c79c3f5..c79c3f5 100644
--- a/include/mmio.h
+++ b/include/lib/mmio.h
diff --git a/include/semihosting.h b/include/lib/semihosting.h
index e688618..e688618 100644
--- a/include/semihosting.h
+++ b/include/lib/semihosting.h
diff --git a/include/spinlock.h b/include/lib/spinlock.h
index 94aaa1a..94aaa1a 100644
--- a/include/spinlock.h
+++ b/include/lib/spinlock.h
diff --git a/include/pm.h b/include/pm.h
deleted file mode 100644
index bfdbf67..0000000
--- a/include/pm.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of ARM nor the names of its contributors may be used
- * to endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __PM_H__
-#define __PM_H__
-
-#ifndef __ASSEMBLY__
-
-/*******************************************************************************
- * Structure populated by platform specific code to export routines which
- * perform common low level pm functions
- ******************************************************************************/
-typedef struct {
- int (*cpu_on)(unsigned long);
- int (*cpu_off)(unsigned long);
- int (*cpu_suspend)(unsigned long);
- int (*affinity_info)(unsigned long, unsigned int);
-} pm_frontend_ops;
-
-/*******************************************************************************
- * Structure populated by a generic power management api implementation e.g.
- * psci to perform api specific bits after a cpu has been turned on.
- ******************************************************************************/
-typedef struct {
- unsigned long (*cpu_off_finisher)(unsigned long);
- unsigned long (*cpu_suspend_finisher)(unsigned long);
-} pm_backend_ops;
-
-/*******************************************************************************
- * Function & variable prototypes
- ******************************************************************************/
-extern pm_frontend_ops *get_pm_frontend_ops(void);
-extern pm_backend_ops *get_pm_backend_ops(void);
-extern void set_pm_frontend_ops(pm_frontend_ops *);
-extern void set_pm_backend_ops(pm_backend_ops *);
-
-#endif /*__ASSEMBLY__*/
-
-#endif /* __PM_H__ */
diff --git a/lib/arch/aarch64/cache_helpers.S b/lib/aarch64/cache_helpers.S
index 2696d90..2696d90 100644
--- a/lib/arch/aarch64/cache_helpers.S
+++ b/lib/aarch64/cache_helpers.S
diff --git a/arch/aarch64/cpu/cpu_helpers.S b/lib/aarch64/cpu_helpers.S
index 573d0b8..573d0b8 100644
--- a/arch/aarch64/cpu/cpu_helpers.S
+++ b/lib/aarch64/cpu_helpers.S
diff --git a/lib/arch/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S
index e3b4ab5..e3b4ab5 100644
--- a/lib/arch/aarch64/misc_helpers.S
+++ b/lib/aarch64/misc_helpers.S
diff --git a/lib/arch/aarch64/sysreg_helpers.S b/lib/aarch64/sysreg_helpers.S
index 8e816f0..8e816f0 100644
--- a/lib/arch/aarch64/sysreg_helpers.S
+++ b/lib/aarch64/sysreg_helpers.S
diff --git a/lib/arch/aarch64/tlb_helpers.S b/lib/aarch64/tlb_helpers.S
index 4244974..4244974 100644
--- a/lib/arch/aarch64/tlb_helpers.S
+++ b/lib/aarch64/tlb_helpers.S
diff --git a/lib/arch/aarch64/xlat_helpers.c b/lib/aarch64/xlat_helpers.c
index 87d24ec..87d24ec 100644
--- a/lib/arch/aarch64/xlat_helpers.c
+++ b/lib/aarch64/xlat_helpers.c
diff --git a/lib/arch/aarch64/xlat_tables.c b/lib/aarch64/xlat_tables.c
index 33a8b6d..33a8b6d 100644
--- a/lib/arch/aarch64/xlat_tables.c
+++ b/lib/aarch64/xlat_tables.c
diff --git a/lib/sync/locks/bakery/bakery_lock.c b/lib/locks/bakery/bakery_lock.c
index ec08135..03f1e74 100644
--- a/lib/sync/locks/bakery/bakery_lock.c
+++ b/lib/locks/bakery/bakery_lock.c
@@ -59,14 +59,14 @@
#define assert_bakery_entry_valid(entry, bakery) do { \
assert(bakery); \
assert(entry < BAKERY_LOCK_MAX_CPUS); \
-} while(0)
+} while (0)
/* Convert a ticket to priority */
#define PRIORITY(t, pos) (((t) << 8) | (pos))
/* Initialize Bakery Lock to reset ownership and all ticket values */
-void bakery_lock_init(bakery_lock * bakery)
+void bakery_lock_init(bakery_lock *bakery)
{
assert(bakery);
@@ -176,7 +176,7 @@ void bakery_lock_get(unsigned long mpidr, bakery_lock *bakery)
/* Release the lock and signal contenders */
-void bakery_lock_release(unsigned long mpidr, bakery_lock * bakery)
+void bakery_lock_release(unsigned long mpidr, bakery_lock *bakery)
{
unsigned int me = platform_get_core_pos(mpidr);
diff --git a/lib/sync/locks/exclusive/spinlock.S b/lib/locks/exclusive/spinlock.S
index 5eae2b0..5eae2b0 100644
--- a/lib/sync/locks/exclusive/spinlock.S
+++ b/lib/locks/exclusive/spinlock.S
diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk
index 0fc45de..2b904ee 100644
--- a/plat/fvp/platform.mk
+++ b/plat/fvp/platform.mk
@@ -28,34 +28,33 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-PLAT_INCLUDES := -Idrivers/arm/interconnect/cci-400 \
- -Idrivers/arm/interconnect/tzc-400 \
- -Idrivers/console \
- -Idrivers/arm/peripherals/pl011 \
- -Idrivers/power
+#
+# No additional platform system include directories required
+#
+# PLAT_INCLUDES :=
-PLAT_BL1_C_VPATH := drivers/arm/interconnect/cci-400 \
- drivers/arm/peripherals/pl011 \
- lib/arch/${ARCH} \
+PLAT_BL1_C_VPATH := drivers/arm/cci400 \
+ drivers/arm/pl011 \
+ lib/${ARCH} \
lib/semihosting \
lib/stdlib \
drivers/io
PLAT_BL1_S_VPATH := lib/semihosting/${ARCH}
-PLAT_BL2_C_VPATH := drivers/arm/interconnect/cci-400 \
- drivers/arm/interconnect/tzc-400 \
- drivers/arm/peripherals/pl011 \
- lib/arch/${ARCH} \
+PLAT_BL2_C_VPATH := drivers/arm/cci400 \
+ drivers/arm/pl011 \
+ drivers/arm/tzc400 \
+ lib/${ARCH} \
lib/stdlib \
lib/semihosting \
drivers/io
PLAT_BL2_S_VPATH := lib/semihosting/${ARCH}
-PLAT_BL31_C_VPATH := drivers/arm/interconnect/cci-400 \
- drivers/arm/peripherals/pl011 \
- lib/arch/${ARCH} \
+PLAT_BL31_C_VPATH := drivers/arm/cci-400 \
+ drivers/arm/pl011 \
+ lib/${ARCH} \
lib/semihosting \
lib/stdlib \
drivers/power \
diff --git a/services/spd/tspd/tspd.mk b/services/spd/tspd/tspd.mk
index bbf9f67..532e168 100644
--- a/services/spd/tspd/tspd.mk
+++ b/services/spd/tspd/tspd.mk
@@ -29,7 +29,7 @@
#
TSPD_DIR := services/spd/tspd
-SPD_INCLUDES := -Iinclude/spd/tspd \
+SPD_INCLUDES := -Iinclude/bl32/payloads \
-I${TSPD_DIR}
SPD_SOURCES := tspd_common.c \
diff --git a/tools/fip_create/firmware_image_package.h b/tools/fip_create/firmware_image_package.h
index 2c0d017..cc61903 120000
--- a/tools/fip_create/firmware_image_package.h
+++ b/tools/fip_create/firmware_image_package.h
@@ -1 +1 @@
-../../include/firmware_image_package.h \ No newline at end of file
+../../include/common/firmware_image_package.h \ No newline at end of file