diff options
author | Radoslaw Biernacki <radoslaw.biernacki@linaro.org> | 2018-05-17 22:19:11 +0200 |
---|---|---|
committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2019-09-18 15:57:17 +0200 |
commit | 301d27d998892c054dec925264f81b11dcd64822 (patch) | |
tree | ba08727d1b3977a95da34a41b2fe89d12b578ff0 /plat/qemu | |
parent | ed01e0c407a1794faf8ff8173183a50419bbd2ae (diff) |
qemu: introducing sub-platforms to qemu platform
This commit change the plat/qemu directory structure into:
`-- plat
`-- qemu
|-- common (files shared with all qemu subplatforms)
|-- qemu (original qemu platform)
|-- qemu_sbsa (new sqemu_sbsa platform)
|-- subplat1
`-- subplat2
This opens the possibility of adding new qemu sub-platforms which reuse
existing common platform code. The first platform which will leverage new
structure will be SBSA platform.
Signed-off-by: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
Change-Id: Id0d8133e1fffc1b574b69aa2770ebc02bb837a9b
Diffstat (limited to 'plat/qemu')
-rw-r--r-- | plat/qemu/common/aarch32/plat_helpers.S (renamed from plat/qemu/aarch32/plat_helpers.S) | 0 | ||||
-rw-r--r-- | plat/qemu/common/aarch64/plat_helpers.S (renamed from plat/qemu/aarch64/plat_helpers.S) | 0 | ||||
-rw-r--r-- | plat/qemu/common/include/plat_macros.S (renamed from plat/qemu/include/plat_macros.S) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_bl1_setup.c (renamed from plat/qemu/qemu_bl1_setup.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_bl2_mem_params_desc.c (renamed from plat/qemu/qemu_bl2_mem_params_desc.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_bl2_setup.c (renamed from plat/qemu/qemu_bl2_setup.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_bl31_setup.c (renamed from plat/qemu/qemu_bl31_setup.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_common.c (renamed from plat/qemu/qemu_common.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_console.c (renamed from plat/qemu/qemu_console.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_gicv2.c (renamed from plat/qemu/qemu_gicv2.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_gicv3.c (renamed from plat/qemu/qemu_gicv3.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_image_load.c (renamed from plat/qemu/qemu_image_load.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_io_storage.c (renamed from plat/qemu/qemu_io_storage.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_pm.c (renamed from plat/qemu/qemu_pm.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_private.h (renamed from plat/qemu/qemu_private.h) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_rotpk.S (renamed from plat/qemu/qemu_rotpk.S) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_stack_protector.c (renamed from plat/qemu/qemu_stack_protector.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/qemu_trusted_boot.c (renamed from plat/qemu/qemu_trusted_boot.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/sp_min/sp_min-qemu.mk (renamed from plat/qemu/sp_min/sp_min-qemu.mk) | 0 | ||||
-rw-r--r-- | plat/qemu/common/sp_min/sp_min_setup.c (renamed from plat/qemu/sp_min/sp_min_setup.c) | 0 | ||||
-rw-r--r-- | plat/qemu/common/topology.c (renamed from plat/qemu/topology.c) | 0 | ||||
-rw-r--r-- | plat/qemu/qemu/include/platform_def.h (renamed from plat/qemu/include/platform_def.h) | 0 | ||||
-rw-r--r-- | plat/qemu/qemu/platform.mk (renamed from plat/qemu/platform.mk) | 56 |
23 files changed, 30 insertions, 26 deletions
diff --git a/plat/qemu/aarch32/plat_helpers.S b/plat/qemu/common/aarch32/plat_helpers.S index aebcfa78..aebcfa78 100644 --- a/plat/qemu/aarch32/plat_helpers.S +++ b/plat/qemu/common/aarch32/plat_helpers.S diff --git a/plat/qemu/aarch64/plat_helpers.S b/plat/qemu/common/aarch64/plat_helpers.S index 13a5ee46..13a5ee46 100644 --- a/plat/qemu/aarch64/plat_helpers.S +++ b/plat/qemu/common/aarch64/plat_helpers.S diff --git a/plat/qemu/include/plat_macros.S b/plat/qemu/common/include/plat_macros.S index b6cdb071..b6cdb071 100644 --- a/plat/qemu/include/plat_macros.S +++ b/plat/qemu/common/include/plat_macros.S diff --git a/plat/qemu/qemu_bl1_setup.c b/plat/qemu/common/qemu_bl1_setup.c index 67f33273..67f33273 100644 --- a/plat/qemu/qemu_bl1_setup.c +++ b/plat/qemu/common/qemu_bl1_setup.c diff --git a/plat/qemu/qemu_bl2_mem_params_desc.c b/plat/qemu/common/qemu_bl2_mem_params_desc.c index a01f2dc9..a01f2dc9 100644 --- a/plat/qemu/qemu_bl2_mem_params_desc.c +++ b/plat/qemu/common/qemu_bl2_mem_params_desc.c diff --git a/plat/qemu/qemu_bl2_setup.c b/plat/qemu/common/qemu_bl2_setup.c index 166d2454..166d2454 100644 --- a/plat/qemu/qemu_bl2_setup.c +++ b/plat/qemu/common/qemu_bl2_setup.c diff --git a/plat/qemu/qemu_bl31_setup.c b/plat/qemu/common/qemu_bl31_setup.c index 4d36b039..4d36b039 100644 --- a/plat/qemu/qemu_bl31_setup.c +++ b/plat/qemu/common/qemu_bl31_setup.c diff --git a/plat/qemu/qemu_common.c b/plat/qemu/common/qemu_common.c index 56bf9532..56bf9532 100644 --- a/plat/qemu/qemu_common.c +++ b/plat/qemu/common/qemu_common.c diff --git a/plat/qemu/qemu_console.c b/plat/qemu/common/qemu_console.c index fec18289..fec18289 100644 --- a/plat/qemu/qemu_console.c +++ b/plat/qemu/common/qemu_console.c diff --git a/plat/qemu/qemu_gicv2.c b/plat/qemu/common/qemu_gicv2.c index fb566227..fb566227 100644 --- a/plat/qemu/qemu_gicv2.c +++ b/plat/qemu/common/qemu_gicv2.c diff --git a/plat/qemu/qemu_gicv3.c b/plat/qemu/common/qemu_gicv3.c index 28572c5e..28572c5e 100644 --- a/plat/qemu/qemu_gicv3.c +++ b/plat/qemu/common/qemu_gicv3.c diff --git a/plat/qemu/qemu_image_load.c b/plat/qemu/common/qemu_image_load.c index 9970d1de..9970d1de 100644 --- a/plat/qemu/qemu_image_load.c +++ b/plat/qemu/common/qemu_image_load.c diff --git a/plat/qemu/qemu_io_storage.c b/plat/qemu/common/qemu_io_storage.c index 0e81cd19..0e81cd19 100644 --- a/plat/qemu/qemu_io_storage.c +++ b/plat/qemu/common/qemu_io_storage.c diff --git a/plat/qemu/qemu_pm.c b/plat/qemu/common/qemu_pm.c index a199688d..a199688d 100644 --- a/plat/qemu/qemu_pm.c +++ b/plat/qemu/common/qemu_pm.c diff --git a/plat/qemu/qemu_private.h b/plat/qemu/common/qemu_private.h index 71ea4de1..71ea4de1 100644 --- a/plat/qemu/qemu_private.h +++ b/plat/qemu/common/qemu_private.h diff --git a/plat/qemu/qemu_rotpk.S b/plat/qemu/common/qemu_rotpk.S index 5d1b83f4..5d1b83f4 100644 --- a/plat/qemu/qemu_rotpk.S +++ b/plat/qemu/common/qemu_rotpk.S diff --git a/plat/qemu/qemu_stack_protector.c b/plat/qemu/common/qemu_stack_protector.c index c226158a..c226158a 100644 --- a/plat/qemu/qemu_stack_protector.c +++ b/plat/qemu/common/qemu_stack_protector.c diff --git a/plat/qemu/qemu_trusted_boot.c b/plat/qemu/common/qemu_trusted_boot.c index 1ef7e431..1ef7e431 100644 --- a/plat/qemu/qemu_trusted_boot.c +++ b/plat/qemu/common/qemu_trusted_boot.c diff --git a/plat/qemu/sp_min/sp_min-qemu.mk b/plat/qemu/common/sp_min/sp_min-qemu.mk index e93a0c23..e93a0c23 100644 --- a/plat/qemu/sp_min/sp_min-qemu.mk +++ b/plat/qemu/common/sp_min/sp_min-qemu.mk diff --git a/plat/qemu/sp_min/sp_min_setup.c b/plat/qemu/common/sp_min/sp_min_setup.c index 7ec657b7..7ec657b7 100644 --- a/plat/qemu/sp_min/sp_min_setup.c +++ b/plat/qemu/common/sp_min/sp_min_setup.c diff --git a/plat/qemu/topology.c b/plat/qemu/common/topology.c index 6352706e..6352706e 100644 --- a/plat/qemu/topology.c +++ b/plat/qemu/common/topology.c diff --git a/plat/qemu/include/platform_def.h b/plat/qemu/qemu/include/platform_def.h index d7f77cc7..d7f77cc7 100644 --- a/plat/qemu/include/platform_def.h +++ b/plat/qemu/qemu/include/platform_def.h diff --git a/plat/qemu/platform.mk b/plat/qemu/qemu/platform.mk index bc4a21bc..5fda2cd4 100644 --- a/plat/qemu/platform.mk +++ b/plat/qemu/qemu/platform.mk @@ -32,16 +32,20 @@ ifeq ($(NEED_BL32),yes) $(eval $(call add_define,QEMU_LOAD_BL32)) endif -PLAT_PATH := plat/qemu/ -PLAT_INCLUDES := -Iplat/qemu/include +PLAT_QEMU_PATH := plat/qemu/qemu +PLAT_QEMU_COMMON_PATH := plat/qemu/common +PLAT_INCLUDES := -Iinclude/plat/arm/common/ \ + -I${PLAT_QEMU_COMMON_PATH}/include \ + -I${PLAT_QEMU_PATH}/include \ + -Iinclude/common/tbbr ifeq (${ARM_ARCH_MAJOR},8) PLAT_INCLUDES += -Iinclude/plat/arm/common/${ARCH} endif -PLAT_BL_COMMON_SOURCES := plat/qemu/qemu_common.c \ - plat/qemu/qemu_console.c \ - drivers/arm/pl011/${ARCH}/pl011_console.S \ +PLAT_BL_COMMON_SOURCES := ${PLAT_QEMU_COMMON_PATH}/qemu_common.c \ + ${PLAT_QEMU_COMMON_PATH}/qemu_console.c \ + drivers/arm/pl011/${ARCH}/pl011_console.S include lib/xlat_tables_v2/xlat_tables.mk PLAT_BL_COMMON_SOURCES += ${XLAT_TABLES_LIB_SRCS} @@ -59,13 +63,13 @@ ifneq (${TRUSTED_BOARD_BOOT},0) BL1_SOURCES += ${AUTH_SOURCES} \ bl1/tbbr/tbbr_img_desc.c \ plat/common/tbbr/plat_tbbr.c \ - plat/qemu/qemu_trusted_boot.c \ - $(PLAT_PATH)/qemu_rotpk.S + ${PLAT_QEMU_COMMON_PATH}/qemu_trusted_boot.c \ + $(PLAT_QEMU_COMMON_PATH)/qemu_rotpk.S BL2_SOURCES += ${AUTH_SOURCES} \ plat/common/tbbr/plat_tbbr.c \ - plat/qemu/qemu_trusted_boot.c \ - $(PLAT_PATH)/qemu_rotpk.S + ${PLAT_QEMU_COMMON_PATH}/qemu_trusted_boot.c \ + $(PLAT_QEMU_COMMON_PATH)/qemu_rotpk.S ROT_KEY = $(BUILD_PLAT)/rot_key.pem ROTPK_HASH = $(BUILD_PLAT)/rotpk_sha256.bin @@ -93,9 +97,9 @@ BL1_SOURCES += drivers/io/io_semihosting.c \ drivers/io/io_memmap.c \ lib/semihosting/semihosting.c \ lib/semihosting/${ARCH}/semihosting_call.S \ - plat/qemu/qemu_io_storage.c \ - plat/qemu/${ARCH}/plat_helpers.S \ - plat/qemu/qemu_bl1_setup.c + ${PLAT_QEMU_COMMON_PATH}/qemu_io_storage.c \ + ${PLAT_QEMU_COMMON_PATH}/${ARCH}/plat_helpers.S \ + ${PLAT_QEMU_COMMON_PATH}/qemu_bl1_setup.c ifeq (${ARM_ARCH_MAJOR},8) BL1_SOURCES += lib/cpus/aarch64/aem_generic.S \ @@ -110,13 +114,13 @@ BL2_SOURCES += drivers/io/io_semihosting.c \ drivers/io/io_fip.c \ drivers/io/io_memmap.c \ lib/semihosting/semihosting.c \ - lib/semihosting/${ARCH}/semihosting_call.S\ - plat/qemu/qemu_io_storage.c \ - plat/qemu/${ARCH}/plat_helpers.S \ - plat/qemu/qemu_bl2_setup.c \ - common/fdt_fixup.c \ - plat/qemu/qemu_bl2_mem_params_desc.c \ - plat/qemu/qemu_image_load.c \ + lib/semihosting/${ARCH}/semihosting_call.S \ + ${PLAT_QEMU_COMMON_PATH}/qemu_io_storage.c \ + ${PLAT_QEMU_COMMON_PATH}/${ARCH}/plat_helpers.S \ + ${PLAT_QEMU_COMMON_PATH}/qemu_bl2_setup.c \ + ${PLAT_QEMU_COMMON_PATH}/qemu_bl2_mem_params_desc.c \ + ${PLAT_QEMU_COMMON_PATH}/qemu_image_load.c \ + common/fdt_fixup.c \ common/desc_image_load.c ifeq ($(add-lib-optee),yes) @@ -127,13 +131,13 @@ QEMU_GICV2_SOURCES := drivers/arm/gic/v2/gicv2_helpers.c \ drivers/arm/gic/v2/gicv2_main.c \ drivers/arm/gic/common/gic_common.c \ plat/common/plat_gicv2.c \ - plat/qemu/qemu_gicv2.c + ${PLAT_QEMU_COMMON_PATH}/qemu_gicv2.c QEMU_GICV3_SOURCES := drivers/arm/gic/v3/gicv3_helpers.c \ drivers/arm/gic/v3/gicv3_main.c \ drivers/arm/gic/common/gic_common.c \ plat/common/plat_gicv3.c \ - plat/qemu/qemu_gicv3.c + ${PLAT_QEMU_COMMON_PATH}/qemu_gicv3.c ifeq (${QEMU_USE_GIC_DRIVER}, QEMU_GICV2) QEMU_GIC_SOURCES := ${QEMU_GICV2_SOURCES} @@ -148,10 +152,10 @@ BL31_SOURCES += lib/cpus/aarch64/aem_generic.S \ lib/cpus/aarch64/cortex_a53.S \ lib/cpus/aarch64/cortex_a57.S \ plat/common/plat_psci_common.c \ - plat/qemu/qemu_pm.c \ - plat/qemu/topology.c \ - plat/qemu/aarch64/plat_helpers.S \ - plat/qemu/qemu_bl31_setup.c \ + ${PLAT_QEMU_COMMON_PATH}/qemu_pm.c \ + ${PLAT_QEMU_COMMON_PATH}/topology.c \ + ${PLAT_QEMU_COMMON_PATH}/aarch64/plat_helpers.S \ + ${PLAT_QEMU_COMMON_PATH}/qemu_bl31_setup.c \ ${QEMU_GIC_SOURCES} endif @@ -167,7 +171,7 @@ endif SEPARATE_CODE_AND_RODATA := 1 ENABLE_STACK_PROTECTOR := 0 ifneq ($(ENABLE_STACK_PROTECTOR), 0) - PLAT_BL_COMMON_SOURCES += plat/qemu/qemu_stack_protector.c + PLAT_BL_COMMON_SOURCES += ${PLAT_QEMU_COMMON_PATH}/qemu_stack_protector.c endif BL32_RAM_LOCATION := tdram |