From dd3f46399f8d1274b73a984f6e66e4e619fd30a0 Mon Sep 17 00:00:00 2001 From: Ye Li <ye.li@nxp.com> Date: Fri, 3 Mar 2017 18:19:20 +0800 Subject: [PATCH] MLK-14328 imx6slevkandroid: Remove config.h from mxc_key_defs.h header file The mx6slevk android build is broken after adding CONFIG_EFI_PARTITION. The CONFIG_LIB_UUID is not set which should be set by "config_fallbacks.h" when having CONFIG_EFI_PARTITION defined. The root cause is in "mx6slevkandroid.h", we include the "mxc_key_defs.h" which includes the "config.h". Since the "config.h" includes the "config_fallbacks.h", so the "config_fallbacks.h" is included twice in building. The first time is before the CONFIG_EFI_PARTITION definition, the second is after it. Because "config_fallbacks.h" uses __CONFIG_FALLBACKS_H to avoid being included multiple times. So the second is not effective and cause CONFIG_LIB_UUID is finally not set. This patch removes the "config.h" from "mxc_key_defs.h", no need to include it. Signed-off-by: Ye Li <ye.li@nxp.com> --- arch/arm/include/asm/imx-common/mxc_key_defs.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/include/asm/imx-common/mxc_key_defs.h b/arch/arm/include/asm/imx-common/mxc_key_defs.h index 5a1fec7ce7..f0765c4c12 100644 --- a/arch/arm/include/asm/imx-common/mxc_key_defs.h +++ b/arch/arm/include/asm/imx-common/mxc_key_defs.h @@ -7,8 +7,6 @@ #ifndef _MXC_KEYPAD_H_ #define _MXC_KEYPAD_H_ -#include <config.h> - #define KEY_1 2 #define KEY_2 3 #define KEY_3 4 -- GitLab