diff options
| author | Jerome Forissier <jerome.forissier@linaro.org> | 2016-08-23 11:20:21 +0200 |
|---|---|---|
| committer | Jerome Forissier <jerome.forissier@linaro.org> | 2016-08-23 15:03:25 +0200 |
| commit | 9fc5317183006be2b7ee455ad142abc4149ded47 (patch) | |
| tree | fb5f70e0a7be68113f5b5ec8b83c7c930f5cd353 /core | |
| parent | 0251b77565ddfc8f857c82ea912243c9b6f5809f (diff) | |
Fix invalid default value of $(PLATFORM_FLAVOR)
Fixes the following error:
$ make -s PLATFORM=stm
core/arch/arm/plat-stm/system_config.mk:20:
*** PLATFORM_FLAVOR=qemu_virt is not supported. Stop.
(one would expect PLATFORM_FLAVOR to default to 'orly2').
This patch does the following:
- Do not set "PLATFORM_FLAVOR ?= qemu_virt" in the main Makefile. The
default value for PLATFORM_FLAVOR has to be defined by each platform in
plat-*/conf.mk.
- Consistent with the above, "PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y"
is moved to core/core.mk, after $(platform-dir)/conf.mk has been
included, i.e., where $(PLATFORM_FLAVOR) can be relied upon.
- All definitions of "PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y"
are removed from platform files, since it is already taken care of in
core/core.mk.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/arch/arm/plat-ls/conf.mk | 1 | ||||
| -rw-r--r-- | core/arch/arm/plat-mediatek/conf.mk | 1 | ||||
| -rw-r--r-- | core/arch/arm/plat-sprd/conf.mk | 1 | ||||
| -rw-r--r-- | core/arch/arm/plat-ti/conf.mk | 1 | ||||
| -rw-r--r-- | core/arch/arm/plat-vexpress/conf.mk | 3 | ||||
| -rw-r--r-- | core/arch/arm/plat-zynqmp/conf.mk | 1 | ||||
| -rw-r--r-- | core/core.mk | 3 |
7 files changed, 4 insertions, 7 deletions
diff --git a/core/arch/arm/plat-ls/conf.mk b/core/arch/arm/plat-ls/conf.mk index 8cacdce3..cf901095 100644 --- a/core/arch/arm/plat-ls/conf.mk +++ b/core/arch/arm/plat-ls/conf.mk @@ -1,5 +1,4 @@ PLATFORM_FLAVOR ?= ls1021atwr -PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y arm32-platform-cpuarch := cortex-a7 arm32-platform-cflags += -mcpu=$(arm32-platform-cpuarch) diff --git a/core/arch/arm/plat-mediatek/conf.mk b/core/arch/arm/plat-mediatek/conf.mk index fd688062..81642b62 100644 --- a/core/arch/arm/plat-mediatek/conf.mk +++ b/core/arch/arm/plat-mediatek/conf.mk @@ -1,5 +1,4 @@ PLATFORM_FLAVOR ?= mt8173 -PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y # 32-bit flags arm32-platform-cpuarch := cortex-a15 diff --git a/core/arch/arm/plat-sprd/conf.mk b/core/arch/arm/plat-sprd/conf.mk index edee43ec..438f678a 100644 --- a/core/arch/arm/plat-sprd/conf.mk +++ b/core/arch/arm/plat-sprd/conf.mk @@ -1,5 +1,4 @@ PLATFORM_FLAVOR ?= sc9860 -PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y # 32-bit flags arm32-platform-cpuarch := cortex-a15 diff --git a/core/arch/arm/plat-ti/conf.mk b/core/arch/arm/plat-ti/conf.mk index a767abd5..7ac154f5 100644 --- a/core/arch/arm/plat-ti/conf.mk +++ b/core/arch/arm/plat-ti/conf.mk @@ -1,5 +1,4 @@ PLATFORM_FLAVOR ?= dra7xx -PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y # 32-bit flags arm32-platform-cpuarch := cortex-a15 diff --git a/core/arch/arm/plat-vexpress/conf.mk b/core/arch/arm/plat-vexpress/conf.mk index a4d9a141..816553dc 100644 --- a/core/arch/arm/plat-vexpress/conf.mk +++ b/core/arch/arm/plat-vexpress/conf.mk @@ -1,5 +1,4 @@ -PLATFORM_FLAVOR ?= fvp -PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y +PLATFORM_FLAVOR ?= qemu_virt # 32-bit flags arm32-platform-cpuarch := cortex-a15 diff --git a/core/arch/arm/plat-zynqmp/conf.mk b/core/arch/arm/plat-zynqmp/conf.mk index 87b35db4..67570bc9 100644 --- a/core/arch/arm/plat-zynqmp/conf.mk +++ b/core/arch/arm/plat-zynqmp/conf.mk @@ -1,5 +1,4 @@ PLATFORM_FLAVOR ?= zcu102 -PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y # 32-bit flags arm32-platform-cpuarch := cortex-a53 diff --git a/core/core.mk b/core/core.mk index fdfa6424..afce7eaf 100644 --- a/core/core.mk +++ b/core/core.mk @@ -11,6 +11,9 @@ include $(platform-dir)/conf.mk include mk/config.mk include core/arch/$(ARCH)/$(ARCH).mk +PLATFORM_$(PLATFORM) := y +PLATFORM_FLAVOR_$(PLATFORM_FLAVOR) := y + # Setup compiler for this sub module COMPILER_$(sm) ?= $(COMPILER) include mk/$(COMPILER_$(sm)).mk |