From 5b71dc1b08091135c4b17e4233953e5dae7abeb9 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 5 Feb 2016 22:20:08 +0100 Subject: [PATCH] config: remove obsolete machine descriptions More and more machines and architectures are added without keeping the lists up-to-date. Replace the lists with a pointer to the reference directory. The same kind of pointer is used for the supported compilers and environments. Signed-off-by: Thomas Monjalon Acked-by: Konstantin Ananyev --- config/common_bsdapp | 19 ++++--------------- config/common_linuxapp | 19 ++++--------------- mk/target/generic/rte.vars.mk | 8 -------- 3 files changed, 8 insertions(+), 38 deletions(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index ed7c31c0bc..50b9829a57 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -32,38 +32,27 @@ # # define executive environment -# -# CONFIG_RTE_EXEC_ENV can be linuxapp, bsdapp +# RTE_EXEC_ENV values are the directories in mk/exec-env/ # CONFIG_RTE_EXEC_ENV="bsdapp" CONFIG_RTE_EXEC_ENV_BSDAPP=y ## ## machine can define specific variables or action for a specific board -## RTE_MACHINE can be: -## default nothing specific -## native current machine -## atm Intel® Atom™ microarchitecture -## nhm Intel® microarchitecture code name Nehalem -## wsm Intel® microarchitecture code name Westmere -## snb Intel® microarchitecture code name Sandy Bridge -## ivb Intel® microarchitecture code name Ivy Bridge -## -## Note: if your compiler does not support the relevant -march options, -## it will be compiled with whatever latest processor the compiler supports! +## RTE_MACHINE values are the directories in mk/machine/ ## #CONFIG_RTE_MACHINE="native" # ## ## define the architecture we compile for. -## CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 +## RTE_ARCH values are the directories in mk/arch/ ## #CONFIG_RTE_ARCH="x86_64" #CONFIG_RTE_ARCH_X86_64=y # ## ## The compiler we use. -## Can be gcc, icc or clang. +## RTE_TOOLCHAIN values are the directories in mk/toolchain/ ## #CONFIG_RTE_TOOLCHAIN="gcc" #CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/common_linuxapp b/config/common_linuxapp index 74bc51569e..4866b96cc7 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -32,38 +32,27 @@ # # define executive environment -# -# CONFIG_RTE_EXEC_ENV can be linuxapp, bsdapp +# RTE_EXEC_ENV values are the directories in mk/exec-env/ # CONFIG_RTE_EXEC_ENV="linuxapp" CONFIG_RTE_EXEC_ENV_LINUXAPP=y ## ## machine can define specific variables or action for a specific board -## RTE_MACHINE can be: -## default nothing specific -## native current machine -## atm Intel® Atom™ microarchitecture -## nhm Intel® microarchitecture code name Nehalem -## wsm Intel® microarchitecture code name Westmere -## snb Intel® microarchitecture code name Sandy Bridge -## ivb Intel® microarchitecture code name Ivy Bridge -## -## Note: if your compiler does not support the relevant -march options, -## it will be compiled with whatever latest processor the compiler supports! +## RTE_MACHINE values are the directories in mk/machine/ ## #CONFIG_RTE_MACHINE="native" # ## ## define the architecture we compile for. -## CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32 +## RTE_ARCH values are the directories in mk/arch/ ## #CONFIG_RTE_ARCH="x86_64" #CONFIG_RTE_ARCH_X86_64=y # ## ## The compiler we use. -## Can be gcc, icc or clang. +## RTE_TOOLCHAIN values are the directories in mk/toolchain/ ## #CONFIG_RTE_TOOLCHAIN="gcc" #CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk index 53650c3815..75a616abab 100644 --- a/mk/target/generic/rte.vars.mk +++ b/mk/target/generic/rte.vars.mk @@ -50,8 +50,6 @@ # - can define CPU_ASFLAGS variable (overriden by cmdline value) that # overrides the one defined in arch. # -# examples for RTE_MACHINE: default, pc, bensley, tylesburg, ... -# include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk # @@ -69,8 +67,6 @@ include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk # define in machine .mk) # - may override any previously defined variable # -# examples for RTE_ARCH: i686, x86_64 -# include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk # @@ -82,8 +78,6 @@ include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk # - define TOOLCHAIN_ASFLAGS variable (overriden by cmdline value) # - may override any previously defined variable # -# examples for RTE_TOOLCHAIN: gcc, icc -# include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk # @@ -94,8 +88,6 @@ include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk # - define EXECENV_ASFLAGS variable (overriden by cmdline) # - may override any previously defined variable # -# examples for RTE_EXEC_ENV: linuxapp, bsdapp -# include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk # Don't set CFLAGS/LDFLAGS flags for kernel module, all flags are -- 2.20.1