From mboxrd@z Thu Jan 1 00:00:00 1970 From: Markus Niebel Date: Mon, 18 May 2015 08:39:05 +0200 Subject: [U-Boot] [Resend PATCH 2/4] arm: imx6: tqma6: implement IMX_CONFIG with Kconfig In-Reply-To: <5555E8E0.4030103@denx.de> References: <1431433128-1193-1-git-send-email-list-09_u-boot@tqsc.de> <1431433128-1193-3-git-send-email-list-09_u-boot@tqsc.de> <5555E8E0.4030103@denx.de> Message-ID: <55598909.5090003@tqsc.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Stefano, Am 15.05.2015 um 14:38 schrieb Stefano Babic: > Hi Markus, > > On 12/05/2015 14:18, Markus Niebel wrote: >> From: Markus Niebel >> >> 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 3e4d9f5..ce47ba4 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 42d8928..59e7859 100644 >> --- a/configs/tqma6q_mba6_mmc_defconfig >> +++ b/configs/tqma6q_mba6_mmc_defconfig >> @@ -2,4 +2,4 @@ CONFIG_ARM=y >> CONFIG_ARCH_MX6=y >> CONFIG_TARGET_TQMA6=y >> CONFIG_TQMA6Q=y >> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_MMC_BOOT" >> +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" >> diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig >> index 7371b3d..db65778 100644 >> --- a/configs/tqma6q_mba6_spi_defconfig >> +++ b/configs/tqma6q_mba6_spi_defconfig >> @@ -2,4 +2,4 @@ CONFIG_ARM=y >> CONFIG_ARCH_MX6=y >> CONFIG_TARGET_TQMA6=y >> CONFIG_TQMA6Q=y >> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_SPI_BOOT" >> +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT" >> diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig >> index b7feb18..6c0763d 100644 >> --- a/configs/tqma6s_mba6_mmc_defconfig >> +++ b/configs/tqma6s_mba6_mmc_defconfig >> @@ -2,4 +2,4 @@ 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" >> diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig >> index 24d07cd..4873ffb 100644 >> --- a/configs/tqma6s_mba6_spi_defconfig >> +++ b/configs/tqma6s_mba6_spi_defconfig >> @@ -2,4 +2,4 @@ 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" >> > > > Rather it does not work. By compiling envcrc (host), the options are not > set and it fails: > > cc -Wp,-MD,tools/.envcrc.o.d -Wall -Wstrict-prototypes -O2 > -fomit-frame-pointer -include ./include/libfdt_env.h -idirafterinclude > -idirafter./arch/arm/include -I./lib/libfdt -I./tools > -DCONFIG_SYS_TEXT_BASE=0x4fc00000 -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES > -D_GNU_SOURCE -c -o tools/envcrc.o tools/envcrc.c > In file included from include/config.h:5:0, > from tools/envcrc.c:19: > include/configs/tqma6.h:342:2: error: #error "need to define boot source" > > This happens for the SPI boards, not for MMC - I have not checked why. > > Can you investigate this issue ? First: sorry for inconvinience! Seems to be an issue with the new build system - env tools do not see the kconfig defines when tqma6.h is preprocessed. I'm not sure what's the best solution: if I include linux/kconfig.h at top of tqma6.h this build break is fixed. The canyonlands board makes this, too. But I have the feeling that this should be better done at a central place, shouldn't it? > Best regards, > Stefano Babic > Best Regards, Markus Niebel