From 76dd0f2c3dbfe2fe56288d7ec8f6743eca460864 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 9 Apr 2018 04:34:33 +0300 Subject: [PATCH] ARM: s32v234evb: Set CONFIG_DM & CONFIG_DM_SERIAL in Kconfig These symbols are declared in Kconfig, so it's wrong to set them in header files. Note that this is not size-neutral - some 'default y' options will now get turned on by Kconfig, such as CONFIG_CMD_DM=y and CONFIG_DM_STDIO=y. Signed-off-by: Tuomas Tynkkynen --- configs/s32v234evb_defconfig | 3 ++- include/configs/s32v234evb.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/s32v234evb_defconfig b/configs/s32v234evb_defconfig index 19b31db5b4..c59abe1bd8 100644 --- a/configs/s32v234evb_defconfig +++ b/configs/s32v234evb_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_TARGET_S32V234EVB=y CONFIG_SYS_TEXT_BASE=0x3E800000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_MALLOC_F=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/s32v234evb/s32v234evb.cfg" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyLF0 root=/dev/ram rw" @@ -10,5 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM=y CONFIG_FSL_ESDHC=y +CONFIG_DM_SERIAL=y CONFIG_OF_LIBFDT=y diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 34e8441ea0..168658e023 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -12,7 +12,6 @@ #include #define CONFIG_S32V234 -#define CONFIG_DM /* Config GIC */ #define CONFIG_GICV2 @@ -58,7 +57,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) #endif -#define CONFIG_DM_SERIAL #define CONFIG_FSL_LINFLEXUART #define LINFLEXUART_BASE LINFLEXD0_BASE_ADDR -- 2.39.5