From: Jan Viktorin Date: Tue, 16 Feb 2016 18:35:06 +0000 (+0100) Subject: mk: fix armv7 machine name X-Git-Tag: spdx-start~7583 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=a3af38a1db5a6f5b8e5090ec45a1c58a8af362c3;p=dpdk.git mk: fix armv7 machine name The CONFIG_RTE_MACHINE must not contain hyphens to work correctly. This was initially done only for the file name defconfig_arm-armv7a-linuxapp-gcc. This patch fixes install-sdk goal. Otherwise, it creates a wrong directory for this platform. Signed-off-by: Jan Viktorin --- diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc index cbebd6490b..1e71a8c6aa 100644 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ b/config/defconfig_arm-armv7a-linuxapp-gcc @@ -30,7 +30,7 @@ #include "common_linuxapp" -CONFIG_RTE_MACHINE="armv7-a" +CONFIG_RTE_MACHINE="armv7a" CONFIG_RTE_ARCH="arm" CONFIG_RTE_ARCH_ARM=y diff --git a/mk/machine/armv7-a/rte.vars.mk b/mk/machine/armv7-a/rte.vars.mk deleted file mode 100644 index 48d3979930..0000000000 --- a/mk/machine/armv7-a/rte.vars.mk +++ /dev/null @@ -1,67 +0,0 @@ -# BSD LICENSE -# -# Copyright (C) 2015 RehiveTech. 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 RehiveTech 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 -# OWNER 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. - -# -# machine: -# -# - can define ARCH variable (overridden by cmdline value) -# - can define CROSS variable (overridden by cmdline value) -# - define MACHINE_CFLAGS variable (overridden by cmdline value) -# - define MACHINE_LDFLAGS variable (overridden by cmdline value) -# - define MACHINE_ASFLAGS variable (overridden by cmdline value) -# - can define CPU_CFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_LDFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - can define CPU_ASFLAGS variable (overridden by cmdline value) that -# overrides the one defined in arch. -# - may override any previously defined variable -# - -# ARCH = -# CROSS = -# MACHINE_CFLAGS = -# MACHINE_LDFLAGS = -# MACHINE_ASFLAGS = -# CPU_CFLAGS = -# CPU_LDFLAGS = -# CPU_ASFLAGS = - -CPU_CFLAGS += -mfloat-abi=softfp - -MACHINE_CFLAGS += -march=armv7-a - -ifdef CONFIG_RTE_ARCH_ARM_TUNE -MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE) -endif - -ifeq ($(CONFIG_RTE_ARCH_ARM_NEON),y) -MACHINE_CFLAGS += -mfpu=neon -endif diff --git a/mk/machine/armv7a/rte.vars.mk b/mk/machine/armv7a/rte.vars.mk new file mode 100644 index 0000000000..48d3979930 --- /dev/null +++ b/mk/machine/armv7a/rte.vars.mk @@ -0,0 +1,67 @@ +# BSD LICENSE +# +# Copyright (C) 2015 RehiveTech. 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 RehiveTech 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 +# OWNER 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. + +# +# machine: +# +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that +# overrides the one defined in arch. +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that +# overrides the one defined in arch. +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that +# overrides the one defined in arch. +# - may override any previously defined variable +# + +# ARCH = +# CROSS = +# MACHINE_CFLAGS = +# MACHINE_LDFLAGS = +# MACHINE_ASFLAGS = +# CPU_CFLAGS = +# CPU_LDFLAGS = +# CPU_ASFLAGS = + +CPU_CFLAGS += -mfloat-abi=softfp + +MACHINE_CFLAGS += -march=armv7-a + +ifdef CONFIG_RTE_ARCH_ARM_TUNE +MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE) +endif + +ifeq ($(CONFIG_RTE_ARCH_ARM_NEON),y) +MACHINE_CFLAGS += -mfpu=neon +endif