From e71fc7b2b3a228383e770a7d78150497d9c48d3c Mon Sep 17 00:00:00 2001 From: Michael Brandt Date: Wed, 21 Oct 2009 11:37:07 +0200 Subject: merged changes for u8500 (mop500). --- common/Makefile | 1 + common/cmd_nvedit.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 common/Makefile mode change 100644 => 100755 common/cmd_nvedit.c (limited to 'common') diff --git a/common/Makefile b/common/Makefile old mode 100644 new mode 100755 index 3781738e1..7ba449505 --- a/common/Makefile +++ b/common/Makefile @@ -61,6 +61,7 @@ COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o +COBJS-$(CONFIG_ENV_IS_IN_EMMC) += env_emmc.o COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o # command diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c old mode 100644 new mode 100755 index 2186205a1..3fe1fc239 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -60,9 +60,10 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_NVRAM) && \ !defined(CONFIG_ENV_IS_IN_ONENAND) && \ !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ + !defined(CONFIG_ENV_IS_IN_EMMC) && \ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\ -SPI_FLASH|MG_DISK|NVRAM|NOWHERE} +SPI_FLASH|MG_DISK|NVRAM|EMMC|NOWHERE} #endif #define XMK_STR(x) #x -- cgit v1.2.3