[U-Boot-Users] [GIT PULL] mpc83xx: reset status, 8360rev2.1 support, mpc8323erdb support, bugfixes

[Wolfgang Denk]

Dear Kim,

in message <20070727182317.daf10d7c.kim.phillips at freescale.com> you wrote:
> 
> Please pull the u-boot-testing.git tree.

Done.

I apologize for the long delay - actually, if Jerry Van Baren had nod
explicitely asked for it, I probably had never seen it. Two requests:

1) Please use something like "Please pull ..." or similar in the
   _text_ part of the subject. The "[GIT PULL]" you used is something
   I don't "see" usually.

2) If I haven't responded within some reasonable time (say a week or
   so) after sending a pull request, please send a reminder (directly
   to me, no need to bother the list).

Thanks.

I got a merge conflict for "include/configs/MPC8349ITX.h:

<<<<<<< master
=======
#ifdef CFG_NO_FLASH
#define CONFIG_COMMANDS_DEFAULT (CONFIG_CMD_DFL & ~(CFG_CMD_FLASH | \ 
                                                    CFG_CMD_IMLS))
#else
#define CONFIG_COMMANDS_DEFAULT CONFIG_CMD_DFL
#endif

#define CONFIG_COMMANDS         (CONFIG_COMMANDS_DEFAULT | \ 
                                CONFIG_COMMANDS_CF      | \ 
                                CFG_CMD_NET     | \ 
                                CFG_CMD_PING    | \ 
                                CONFIG_COMMANDS_I2C     | \ 
                                CONFIG_COMMANDS_PCI     | \ 
                                CFG_CMD_SDRAM   | \ 
                                CFG_CMD_DATE    | \ 
                                CFG_CMD_CACHE   | \ 
                                CFG_CMD_IRQ)
#include <cmd_confdefs.h>
>>>>>>> u-boot-mpc83xx

I used the master code, i. e. dropped  the  code  in  u-boot-mpc83xx;
please submit a new patch if this was wrong.

> btw, I think there would be more testing work done if you applied
> patches directly to the main u-boot.git tree (bypassing
> u-boot-testing.git). I know it would save me (and others) the hassle
> of always having to merge it.

Sorry, but I can't do that. The mainline branch  is  supposed  to  be
stable,  at  least  in  so far as it should build for the majority of
boards. Bigger changes cannot be done directly there. 

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
It's all Klatchian to me.
        - Terry Pratchett & Stephen Briggs, _The Discworld Companion_