From d3edb1fd150d6d656d18ebacc3b57e5aabd8c7a3 Mon Sep 17 00:00:00 2001 From: Justin Waters Date: Fri, 16 Oct 2009 16:28:49 -0400 Subject: Fix configuration so that multiple flash chips can be enabled The original port only allowed you to enable the chip that contains the environment. This enables everything possible. It also adds configuration options to build for different environment locations by specifying the flash type during the configure step. --- Makefile | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 38dbdb2cae..c483a88e0d 100644 --- a/Makefile +++ b/Makefile @@ -2715,10 +2715,28 @@ davinci_sffsdr_config : unconfig davinci_sonata_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci +da850_omapl138_exp_spiflash_config \ +da850_omapl138_exp_config \ +da850_omapl138_evm_nand_config \ +da850_omapl138_evm_nor_config \ +da850_omapl138_evm_spiflash_config \ da850_omapl138_evm_config : unconfig @mkdir -p $(obj)include - echo "#define CONFIG_DA850_EVM" >> $(obj)include/config.h - $(XECHO) "... configured for DA850/OMAP-L138 boot" + @if [ "$(findstring _exp,$@)" ] ; then \ + echo "#define CONFIG_DA850_EXP" >> $(obj)include/config.h ; \ + else \ + echo "#define CONFIG_DA850_EVM" >> $(obj)include/config.h ; \ + fi; + @if [ "$(findstring _nand,$@)" ] ; then \ + echo "#define CONFIG_SYS_USE_NAND 1" >>$(obj)include/config.h ; \ + $(XECHO) "... with environment variables in NAND FLASH" ; \ + elif [ "$(findstring _nor,$@)" ] ; then \ + echo "#define CONFIG_SYS_USE_NOR 1" >>$(obj)include/config.h ; \ + $(XECHO) "... with environment variables in NOR FLASH" ; \ + else \ + echo "#define CONFIG_SYS_SPIFLASH 1" >>$(obj)include/config.h ; \ + $(XECHO) "... with environment variables in SPI FLASH" ; \ + fi; @$(MKCONFIG) -a da850_evm arm arm926ejs da8xx-evm da8xx da8xx da830_omapl137_evm_config : unconfig -- cgit v1.2.3