--- Makefile.original	2011-11-20 00:48:00.195758021 +0100
+++ Makefile	2011-11-20 00:49:22.535765827 +0100
@@ -868,6 +868,25 @@
 	@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 	@$(MKCONFIG) $@ arm arm926ejs tx25 karo mx25
 
+
+sam9_l9260_nandflash_config \
+sam9_l9260_dataflash_cs0_config \
+sam9_l9260_dataflash_cs1_config \
+sam9_l9260_config :	unconfig
+	@mkdir -p $(obj)include
+	@if [ "$(findstring _nandflash,$@)" ] ; then \
+		echo "#define CONFIG_SYS_USE_NANDFLASH 1"	>>$(obj)include/config.h ; \
+		$(XECHO) "... with environment variable in NAND FLASH" ; \
+	elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
+		echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1"	>>$(obj)include/config.h ; \
+		$(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \
+	else \
+		echo "#define CONFIG_SYS_USE_DATAFLASH_CS1 1"	>>$(obj)include/config.h ; \
+		$(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \
+	fi;
+	@$(MKCONFIG) -a sam9_l9260 arm arm926ejs sam9_l9260 olimex at91
+
+
 #########################################################################
 ## XScale Systems
 #########################################################################