From 30ed1257dbd61efc5d3d0856d81b69aba380705b Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Thu, 4 Jun 2015 17:25:32 +0200 Subject: [PATCH] arm: imx6: tqma6: implement IMX_CONFIG with Kconfig Now that we have the Kconfig based CPU type selection, use this to fill the IMX_CONFIG automatically Signed-off-by: Markus Niebel --- board/tqc/tqma6/Kconfig | 4 ++++ configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index 3e4d9f5170..ce47ba49c6 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -33,4 +33,8 @@ config TQMA6S endchoice +config IMX_CONFIG + default "board/tqc/tqma6/tqma6q.cfg" if TQMA6Q + default "board/tqc/tqma6/tqma6s.cfg" if TQMA6S + endif diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index 31b3fc3e1b..7ca343f3ab 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_MMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index 30ad2330fb..bba751c0dd 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_SPI_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index ab6b0ea7c1..262ce2e83e 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -2,6 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_MMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index f4cfc8dc2f..8c62a03178 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -2,6 +2,6 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_SPI_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y -- 2.39.2