From mboxrd@z Thu Jan 1 00:00:00 1970 From: Doug Goldstein Subject: [PATCHv2] 13/27] build: convert HAS_PDX use to Kconfig Date: Wed, 11 Nov 2015 10:50:03 -0600 Message-ID: <1447260617-10138-14-git-send-email-cardoe@cardoe.com> References: <1447260617-10138-1-git-send-email-cardoe@cardoe.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1447260617-10138-1-git-send-email-cardoe@cardoe.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Keir Fraser , Ian Campbell , Andrew Cooper , Doug Goldstein , Stefano Stabellini , Jan Beulich List-Id: xen-devel@lists.xenproject.org Use the Kconfig generated CONFIG_HAS_PDX defines in the code base. Signed-off-by: Doug Goldstein CC: Ian Campbell CC: Stefano Stabellini CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper Signed-off-by: Doug Goldstein --- xen/Rules.mk | 1 - xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/Kconfig | 4 ++++ xen/common/Makefile | 2 +- xen/include/xen/pdx.h | 4 ++-- 8 files changed, 9 insertions(+), 6 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 0ff1a5d..c2a3e15 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,7 +59,6 @@ CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING -CFLAGS-$(HAS_PDX) += -DHAS_PDX CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER ifneq ($(max_phys_cpus),) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 672015e..51477df 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -19,6 +19,7 @@ config ARM select HAS_DEVICE_TREE select HAS_VIDEO select HAS_PASSTHROUGH + select HAS_PDX config ARCH_DEFCONFIG string diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 90b1f24..52b1ad4 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -7,7 +7,6 @@ # HAS_ARM_HDLCD := y -HAS_PDX := y CFLAGS += -I$(BASEDIR)/include diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 17666ab..e00fd2e 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -12,6 +12,7 @@ config X86 select HAS_PCI select HAS_NS16550 select HAS_GDBSX + select HAS_PDX config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index aacb914..9900c44 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -3,7 +3,6 @@ HAS_EHCI := y HAS_KEXEC := y -HAS_PDX := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index f63284d..b429a64 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -5,6 +5,10 @@ menu "Common Features" config HAS_DEVICE_TREE bool +# Select HAS_PDX if PDX is supported +config HAS_PDX + bool + # Select HAS_GDBSX if GDBSX is supported config HAS_GDBSX bool diff --git a/xen/common/Makefile b/xen/common/Makefile index 5dc2bb2..0acd2b0 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -23,7 +23,7 @@ obj-y += memory.o obj-y += multicall.o obj-y += notifier.o obj-y += page_alloc.o -obj-$(HAS_PDX) += pdx.o +obj-$(CONFIG_HAS_PDX) += pdx.o obj-y += preempt.o obj-y += random.o obj-y += rangeset.o diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 18fe8e5..6f25f90 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -1,7 +1,7 @@ #ifndef __XEN_PDX_H__ #define __XEN_PDX_H__ -#ifdef HAS_PDX +#ifdef CONFIG_HAS_PDX extern unsigned long max_pdx; extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; @@ -37,7 +37,7 @@ static inline unsigned long pdx_to_pfn(unsigned long pdx) extern void pfn_pdx_hole_setup(unsigned long); -#endif /* HAS_PDX */ +#endif /* CONFIG_HAS_PDX */ #endif /* __XEN_PDX_H__ */ /* -- 2.4.10