diff options
| author | Ye Li <ye.li@nxp.com> | 2017-03-03 18:19:20 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-03-03 18:27:59 +0800 |
| commit | dd3f46399f8d1274b73a984f6e66e4e619fd30a0 (patch) | |
| tree | ab78d5b579815bfb1ef31c07c5cd5e0d4a22791d | |
| parent | 1fb61cd80af59c39d1ca01d833f566628ba48f32 (diff) | |
MLK-14328 imx6slevkandroid: Remove config.h from mxc_key_defs.h header filen7.1.1_1.1.0_7ulp-ear
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>
| -rw-r--r-- | arch/arm/include/asm/imx-common/mxc_key_defs.h | 2 |
1 files changed, 0 insertions, 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 5a1fec7..f0765c4 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 |