[U-Boot-Users] [GIT PULL] mpc83xx: reset status, 8360rev2.1 support, mpc8323erdb support, bugfixes
Hello Wolfgang,
Please pull the u-boot-testing.git tree.
Then, please do a:
git pull git://www.denx.de/git/u-boot-mpc83xx.git mpc83xx
to receive the following updates:
Dave Liu (3): mpc83xx: Revise the MPC8360EMDS readme doc mpc83xx: Fix the align bug of SDMA buffer mpc83xx: Add support for the display of reset status
Jerry Van Baren (2): mpc83xx: Replace fdt_node_offset() with fdt_find_node_by_path(). mpc83xx: Fix errors when CONFIG_OF_LIBFDT is enabled
Kim Phillips (3): mpc83xx: fix 8360 and cpu functions to update fdt being passed mpc83xx: fixup generic pci for libfdt mpc83xx: add support for the MPC8323E RDB
Lee Nipper (1): mpc83xx: Add support for 8360 silicon revision 2.1
Martin Krause (1): TQM834x: cleanup configuraton
Timur Tabi (2): Update SCCR programming in cpu_init_f() to support all 83xx processors FSL I2C driver programs the two I2C busses differently
david.saada (1): MPC83xx: Fix makefile to generate config.h file in the build directory
Makefile | 36 +- board/freescale/mpc8323erdb/Makefile | 50 +++ board/freescale/mpc8323erdb/config.mk | 28 ++ board/freescale/mpc8323erdb/mpc8323erdb.c | 217 +++++++++++ board/mpc8360emds/mpc8360emds.c | 11 +- board/mpc8360emds/pci.c | 22 +- cpu/mpc83xx/cpu.c | 118 ++++--- cpu/mpc83xx/cpu_init.c | 50 +++- cpu/mpc83xx/pci.c | 36 ++- doc/README.mpc8323erdb | 71 ++++ doc/README.mpc8360emds | 23 ++- drivers/fsl_i2c.c | 3 +- drivers/qe/qe.c | 2 +- drivers/qe/qe.h | 2 +- include/common.h | 2 + include/configs/MPC8323ERDB.h | 583 +++++++++++++++++++++++++++++ include/configs/TQM834x.h | 3 - include/mpc83xx.h | 4 + lib_ppc/board.c | 6 +- 19 files changed, 1173 insertions(+), 94 deletions(-) create mode 100644 board/freescale/mpc8323erdb/Makefile create mode 100644 board/freescale/mpc8323erdb/config.mk create mode 100644 board/freescale/mpc8323erdb/mpc8323erdb.c create mode 100644 doc/README.mpc8323erdb create mode 100644 include/configs/MPC8323ERDB.h
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.
Thanks,
Kim
Kim Phillips wrote:
Hello Wolfgang,
Please pull the u-boot-testing.git tree.
Then, please do a:
git pull git://www.denx.de/git/u-boot-mpc83xx.git mpc83xxto receive the following updates:
[snip]
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.
Thanks, Kim
[snip]
Hi Wolfgang,
Have you done Kim's pull request yet? I don't see any evidence of it. Kim and I traded some patches back and forth, so I would prefer his repo be pulled before -fdt so I can discover and fix any merge conflicts that may occur due to my neophyte git techniques.
WRT Kim's question on the -testing repo, what is the order or expectation for merges? I've been expecting that the custodian repos will be pulled directly into the main repo and have been doing my pull/merges against that repo, not the testing repo. If -testing is a stepping stone, I need to include that in my pull/merge to resolve any conflicts before they hit you.
Thanks, gvb
In message 46B9DF69.3050507@gmail.com you wrote:
Have you done Kim's pull request yet? I don't see any evidence of it.
No. I haven't. I haven't seen anything of it either.
When / where was it posted?
WRT Kim's question on the -testing repo, what is the order or expectation for merges? I've been expecting that the custodian repos will be pulled directly into the main repo and have been doing my pull/merges against that repo, not the testing repo. If -testing is a stepping stone, I need to include that in my pull/merge to resolve any conflicts before they hit you.
Normally I pull the custodian repos into main, but ion the last few weeks there were some requests that required code that was in -testing only, so I pulled into -testin. But only on special request. Normal pull requests go always into mainline.
Best regards,
Wolfgang Denk
Hi Wolfgang,
Wolfgang Denk wrote:
In message 46B9DF69.3050507@gmail.com you wrote:
Have you done Kim's pull request yet? I don't see any evidence of it.
No. I haven't. I haven't seen anything of it either.
When / where was it posted?
From 2007-07-27: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/30371
WRT Kim's question on the -testing repo, what is the order or expectation for merges? I've been expecting that the custodian repos will be pulled directly into the main repo and have been doing my pull/merges against that repo, not the testing repo. If -testing is a stepping stone, I need to include that in my pull/merge to resolve any conflicts before they hit you.
Normally I pull the custodian repos into main, but ion the last few weeks there were some requests that required code that was in -testing only, so I pulled into -testin. But only on special request. Normal pull requests go always into mainline.
Good. Thanks for the clarification.
Best regards,
Wolfgang Denk
Best regards, gvb
Dear Kim,
in message 20070727182317.daf10d7c.kim.phillips@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
On Thu, 2007-08-09 at 22:39 +0200, Wolfgang Denk wrote:
Dear Kim,
in message 20070727182317.daf10d7c.kim.phillips@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:
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.
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).
Dear Wolfgang,
I can not find the change of '83xx' branch of u-boot-mpc83xx tree in main tree or u-boot-testing tree.
I don't know if you pull the correct branch of u-boot-mpc83xx tree.
Thanks, Dave
Dear Dave,
in message 1186713223.3993.9.camel@localhost.localdomain you wrote:
I can not find the change of '83xx' branch of u-boot-mpc83xx tree in main tree or u-boot-testing tree.
Please check again.
I don't know if you pull the correct branch of u-boot-mpc83xx tree.
I hope I did.
Best regards,
Wolfgang Denk
participants (4)
-
Dave Liu -
Jerry Van Baren -
Kim Phillips -
Wolfgang Denk