Re: [U-Boot] [PATCH V2] qemu_mips: move env storage just after u-boot

2008-12-09 Thread Shinya Kuribayashi 
Jean-Christophe PLAGNIOL-VILLARD wrote:
 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED]
 ---
 Use CFG_MONITOR_LEN instead of value
  include/configs/qemu-mips.h |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
 index faaa889..4f02425 100644
 --- a/include/configs/qemu-mips.h
 +++ b/include/configs/qemu-mips.h
 @@ -150,7 +150,7 @@
  #define CFG_FLASH_USE_BUFFER_WRITE   1
  
  #define CONFIG_ENV_IS_IN_FLASH   1
 -#define CONFIG_ENV_ADDR  (CFG_FLASH_BASE + 0x4)
 +#define CONFIG_ENV_ADDR  (CFG_FLASH_BASE + CFG_MONITOR_LEN)

Now we have CONFIG_SYS_* instead of CFG_* in this area.  Could you
update and re-send the patch, please?

Thanks in advance,

  Shinya
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH V2] qemu_mips: move env storage just after u-boot

2008-09-09 Thread Wolfgang Denk 
Dear Jean-Christophe PLAGNIOL-VILLARD,

In message [EMAIL PROTECTED] you wrote:
 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED]
 ---
 Use CFG_MONITOR_LEN instead of value
  include/configs/qemu-mips.h |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

Does not apply:

Applying qemu_mips: move env storage just after u-boot
error: patch failed: include/configs/qemu-mips.h:150
error: include/configs/qemu-mips.h: patch does not apply
fatal: sha1 information is lacking or useless
(include/configs/qemu-mips.h).
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

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Severe culture shock results when experts from another protocol suite
[...] try to read OSI documents. The term osified is used to  refer
to  such  documents. [...] Any relationship to the word ossified is
purely intentional.- Marshall T. Rose
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot