From 2153665334a59798afa1fafcb6fd25b5b1f0be25 Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Mon, 20 Jun 2016 11:03:28 +0100 Subject: [PATCH] xen/arm: Convert DEBUG_DT to Kconfig Convert device-tree debugging to 'Kconfig' as CONFIG_DEVICE_TREE_DEBUG. The option is not enabled by default because the output is very verbose. Signed-off-by: Julien Grall Reviewed-by: Edgar E. Iglesias Reviewed-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- xen/Kconfig.debug | 8 ++++++++ xen/arch/arm/domain_build.c | 4 +--- xen/common/device_tree.c | 4 +--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index abef0ad9cf..1be63445e3 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -57,6 +57,14 @@ config VERBOSE_DEBUG Guest output from HYPERVISOR_console_io and hypervisor parsing ELF images (dom0) will be logged in the Xen ring buffer. +config DEVICE_TREE_DEBUG + bool "Device tree debug messages" + depends on HAS_DEVICE_TREE + ---help--- + Device tree parsing and DOM0 device tree building messages are + logged in the Xen ring buffer. + If unsure, say N here. + endif # DEBUG || EXPERT endmenu diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 2e4c2958a4..85adbec294 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -42,9 +42,7 @@ static void __init parse_dom0_mem(const char *s) } custom_param("dom0_mem", parse_dom0_mem); -//#define DEBUG_DT - -#ifdef DEBUG_DT +#ifdef CONFIG_DEVICE_TREE_DEBUG # define DPRINT(fmt, args...) printk(XENLOG_DEBUG fmt, ##args) #else # define DPRINT(fmt, args...) do {} while ( 0 ) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 06a283728f..0df2e4b950 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -54,9 +54,7 @@ struct dt_alias_prop { static LIST_HEAD(aliases_lookup); -// #define DEBUG_DT - -#ifdef DEBUG_DT +#ifdef CONFIG_DEVICE_TREE_DEBUG # define dt_dprintk(fmt, args...) printk(XENLOG_DEBUG fmt, ##args) static void dt_dump_addr(const char *s, const __be32 *addr, int na) { -- 2.39.5