[U-Boot] [GIT PULL] Pull request: u-boot-staging

Wolfgang Denk
2011-11-21T21:10:14Z

Dear Stefano Babic,

In message <4EC61E4C.8040107@denx.de> you wrote:
>
> let's see if the suggested approach work or there is need for an adjustment.
>
> I have applied some general and network patches to u-boot-staging.
> Should I also send an "Applied to u-boot-staging" message to the mailing
> list and to the author ? Or this is done afterwards if and when the
> branch is pulled ?

I forgot this in my initial summary of the idea: yes, please send such
information to the submitter and the list.

I just want to pull the branch, I won't go though it and send e-mails.

> git://www.denx.de/git/u-boot-staging sbabic at denx.de
>
> Andreas Bie?mann (1):
> tools/env: use lib/crc32.c directly
>
> David Wagner (1):
> new tool mkenvimage: generates an env image from an arbitrary
> config file
>
> Igor Grinberg (17):
> env: clean environment.h checkpatch and code style
> common: move extern char console_buffer[] to common.h
> env: move extern default_environment[] to environment.h
> env: move extern environment[] to environment.h
> env: clean cmd_nvedit.c checkpatch and code style
> env: clean env_nowhere.c checkpatch and code style
> env: clean env_mgdisk.c checkpatch and code style
> env: clean env_dataflash.c checkpatch and code style
> env: clean env_onenand.c checkpatch and code style
> env: clean env_nvram.c checkpatch and code style
> env: clean env_mmc.c checkpatch and code style
> env: clean env_embedded.c checkpatch and code style
> env: clean env_eeprom.c checkpatch and code style
> env: clean env_sf.c checkpatch and code style
> env: clean env_flash.c checkpatch and code style
> env: clean env_nand.c checkpatch and code style
> env: clean env_common.c checkpatch and code style
>
> Mike Frysinger (1):
> net: rtl8109: drop unused !NET_MULTI driver
>
> Simon Glass (3):
> Define uintptr_t as long int to simplify printf() format strings
> Fix warnings in cmd_nvedit.c
> sandbox: Fix warnings in hashtable.c
>
> Wolfgang Grandegger (2):
> smsc95xx: Fix MAC address programming
> smsc95xx: Debug message cleanup
>
> Makefile | 2 +-
> arch/arm/lib/board.c | 4 -
> board/amcc/yucca/cmd_yucca.c | 1 -
> board/eltec/bab7xx/misc.c | 1 -
> board/eltec/elppc/misc.c | 1 -
> board/eltec/mhpc/mhpc.c | 3 -
> board/hymod/input.c | 3 -
> board/zeus/zeus.c | 1 -
> common/cmd_bedbug.c | 1 -
> common/cmd_dcr.c | 1 -
> common/cmd_i2c.c | 1 -
> common/cmd_mem.c | 1 -
> common/cmd_nvedit.c | 104 ++++++++---------
> common/cmd_pci.c | 1 -
> common/env_common.c | 52 +++------
> common/env_dataflash.c | 34 ++----
> common/env_eeprom.c | 104 +++++++---------
> common/env_embedded.c | 47 ++++----
> common/env_flash.c | 181 +++++++++++++---------------
> common/env_mgdisk.c | 7 +-
> common/env_mmc.c | 78 ++++---------
> common/env_nand.c | 105 +++++++---------
> common/env_nowhere.c | 12 +-
> common/env_nvram.c | 26 ++--
> common/env_onenand.c | 21 +---
> common/env_sf.c | 51 +++-----
> common/hush.c | 1 -
> common/modem.c | 1 -
> drivers/net/Makefile | 1 -
> drivers/net/rtl8019.c | 271
> ------------------------------------------
> drivers/net/rtl8019.h | 114 ------------------
> drivers/usb/eth/smsc95xx.c | 16 +--
> include/command.h | 3 +
> include/common.h | 1 +
> include/compiler.h | 12 +--
> include/dataflash.h | 2 +
> include/environment.h | 61 ++++++----
> lib/hashtable.c | 8 +-
> tools/Makefile | 5 +
> tools/env/Makefile | 7 +-
> tools/envcrc.c | 5 +-
> tools/mkenvimage.c | 270
> +++++++++++++++++++++++++++++++++++++++++
> 42 files changed, 689 insertions(+), 932 deletions(-)
> delete mode 100644 drivers/net/rtl8019.c
> delete mode 100644 drivers/net/rtl8019.h
> create mode 100644 tools/mkenvimage.c

Sorry, but this doesn't work for me:

Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging common/cmd_mem.c
Auto-merging common/cmd_nvedit.c
Auto-merging common/env_dataflash.c
Auto-merging common/env_eeprom.c
Auto-merging common/env_flash.c
Auto-merging common/env_mmc.c
Auto-merging common/env_nand.c
Auto-merging common/env_nvram.c
Auto-merging common/env_onenand.c
Auto-merging common/env_sf.c
Removing drivers/net/rtl8019.c
Removing drivers/net/rtl8019.h
Auto-merging lib/hashtable.c
CONFLICT (content): Merge conflict in lib/hashtable.c
Auto-merging tools/Makefile
Automatic merge failed; fix conflicts and then commit the result.

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: wd at denx.de
In accord with UNIX philosophy, Perl gives you enough rope to hang
yourself. - L. Wall & R. L. Schwartz, _Programming Perl_