Dear Jean-Christophe PLAGNIOL-VILLARD,
In message 1220147181-29804-1-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
common/cmd_nvedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index f5b93df..f449715 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -60,7 +60,7 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_ONENAND) && \ !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ !defined(CONFIG_ENV_IS_NOWHERE) -# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE} +# error Define one of CONFIG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE} #endif
Sorry:
Applying nvedit: rename error comment to CONFIG_ENV_IS_IN_ error: patch failed: common/cmd_nvedit.c:60 error: common/cmd_nvedit.c: patch does not apply fatal: sha1 information is lacking or useless (common/cmd_nvedit.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001.
Please rebase and resubmit.
Best regards,
Wolfgang Denk