From 935db693285d6b22b781571e9dec748da274ffe1 Mon Sep 17 00:00:00 2001 From: Dan Handley Date: Tue, 12 Aug 2014 14:20:28 +0100 Subject: [PATCH] Move IO storage source to drivers directory Move the remaining IO storage source file (io_storage.c) from the lib to the drivers directory. This requires that platform ports explicitly add this file to the list of source files. Also move the IO header files to a new sub-directory, include/io. Change-Id: I862b1252a796b3bcac0d93e50b11e7fb2ded93d6 --- Makefile | 2 +- {lib => drivers/io}/io_storage.c | 0 include/drivers/{ => io}/io_driver.h | 0 include/drivers/{ => io}/io_fip.h | 0 include/drivers/{ => io}/io_memmap.h | 0 include/drivers/{ => io}/io_semihosting.h | 0 include/{lib => drivers/io}/io_storage.h | 0 plat/fvp/platform.mk | 1 + 8 files changed, 2 insertions(+), 1 deletion(-) rename {lib => drivers/io}/io_storage.c (100%) rename include/drivers/{ => io}/io_driver.h (100%) rename include/drivers/{ => io}/io_fip.h (100%) rename include/drivers/{ => io}/io_memmap.h (100%) rename include/drivers/{ => io}/io_semihosting.h (100%) rename include/{lib => drivers/io}/io_storage.h (100%) diff --git a/Makefile b/Makefile index fcbf773a0..89e882a6f 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,6 @@ BL_COMMON_SOURCES := common/bl_common.c \ lib/aarch64/misc_helpers.S \ lib/aarch64/xlat_helpers.c \ lib/stdlib/std.c \ - lib/io_storage.c \ plat/common/aarch64/platform_helpers.S BUILD_BASE := ./build @@ -180,6 +179,7 @@ INCLUDES += -Iinclude/bl31 \ -Iinclude/common \ -Iinclude/drivers \ -Iinclude/drivers/arm \ + -Iinclude/drivers/io \ -Iinclude/lib \ -Iinclude/lib/aarch64 \ -Iinclude/plat/common \ diff --git a/lib/io_storage.c b/drivers/io/io_storage.c similarity index 100% rename from lib/io_storage.c rename to drivers/io/io_storage.c diff --git a/include/drivers/io_driver.h b/include/drivers/io/io_driver.h similarity index 100% rename from include/drivers/io_driver.h rename to include/drivers/io/io_driver.h diff --git a/include/drivers/io_fip.h b/include/drivers/io/io_fip.h similarity index 100% rename from include/drivers/io_fip.h rename to include/drivers/io/io_fip.h diff --git a/include/drivers/io_memmap.h b/include/drivers/io/io_memmap.h similarity index 100% rename from include/drivers/io_memmap.h rename to include/drivers/io/io_memmap.h diff --git a/include/drivers/io_semihosting.h b/include/drivers/io/io_semihosting.h similarity index 100% rename from include/drivers/io_semihosting.h rename to include/drivers/io/io_semihosting.h diff --git a/include/lib/io_storage.h b/include/drivers/io/io_storage.h similarity index 100% rename from include/lib/io_storage.h rename to include/drivers/io/io_storage.h diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk index 8a33a608b..ffed7e4e9 100644 --- a/plat/fvp/platform.mk +++ b/plat/fvp/platform.mk @@ -66,6 +66,7 @@ PLAT_BL_COMMON_SOURCES := drivers/arm/pl011/pl011_console.S \ drivers/io/io_fip.c \ drivers/io/io_memmap.c \ drivers/io/io_semihosting.c \ + drivers/io/io_storage.c \ lib/aarch64/xlat_tables.c \ lib/semihosting/semihosting.c \ lib/semihosting/aarch64/semihosting_call.S \