diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-21 11:37:07 +0200 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-10-21 11:37:07 +0200 |
| commit | e71fc7b2b3a228383e770a7d78150497d9c48d3c (patch) | |
| tree | 1fba7eafc9884577e029b50953b27dae340342d3 /common | |
| parent | 14abfe361b3ed23b02f564e2f5d663e158cd5799 (diff) | |
merged changes for u8500 (mop500).
Diffstat (limited to 'common')
| -rwxr-xr-x[-rw-r--r--] | common/Makefile | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | common/cmd_nvedit.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index 3781738e1..7ba449505 100644..100755 --- 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 index 2186205a1..3fe1fc239 100644..100755 --- 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 |