Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Tuesday, September 13, 2011 11:13 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Le 13/09/2011 15:08, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 07db205b5186ac9722a1f141d97c9a67c43c4ae1: Joe Hershberger (1): omap4_panda: Ignore omap4 SPL called MLO are available in the git repository at: u-boot-marvell.git next branch. Ajay Bhargav (3): net: Adds Fast Ethernet Controller driver for Armada100 Armada100: Enable Ethernet support for GplugD Armada100: Enable 88E3015 PHY support for GplugD arch/arm/include/asm/arch-armada100/armada100.h | 58 ++ arch/arm/include/asm/arch-armada100/mfp.h | 19 + board/Marvell/gplugd/gplugd.c | 71 +++ drivers/net/Makefile|1 + drivers/net/armada100_fec.c | 736 +++ drivers/net/armada100_fec.h | 232 +++ include/configs/gplugd.h| 30 +- include/netdev.h|1 + 8 files changed, 1146 insertions(+), 2 deletions(-) create mode 100644 drivers/net/armada100_fec.c create mode 100644 drivers/net/armada100_fec.h Regards.. Prafulla . . I assume that this 'next' branch is actually your 'master' for the upcoming release, and you want me to apply it to u-boot-arm/master, right? I have provided pull request for next branch since these patches were originated after closure of last merge window (just one day latter). That's good if you can do it. If so, please use 'master' as the branch to pull next time, so that there is no doubt what you are asking. Yes, I will do this. Thanks and regards.. Prafulla .. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla, Le 14/09/2011 08:06, Prafulla Wadaskar a écrit : -Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Tuesday, September 13, 2011 11:13 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Le 13/09/2011 15:08, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 07db205b5186ac9722a1f141d97c9a67c43c4ae1: Joe Hershberger (1): omap4_panda: Ignore omap4 SPL called MLO are available in the git repository at: u-boot-marvell.git next branch. Ajay Bhargav (3): net: Adds Fast Ethernet Controller driver for Armada100 Armada100: Enable Ethernet support for GplugD Armada100: Enable 88E3015 PHY support for GplugD arch/arm/include/asm/arch-armada100/armada100.h | 58 ++ arch/arm/include/asm/arch-armada100/mfp.h | 19 + board/Marvell/gplugd/gplugd.c | 71 +++ drivers/net/Makefile|1 + drivers/net/armada100_fec.c | 736 +++ drivers/net/armada100_fec.h | 232 +++ include/configs/gplugd.h| 30 +- include/netdev.h|1 + 8 files changed, 1146 insertions(+), 2 deletions(-) create mode 100644 drivers/net/armada100_fec.c create mode 100644 drivers/net/armada100_fec.h Regards.. Prafulla . . I assume that this 'next' branch is actually your 'master' for the upcoming release, and you want me to apply it to u-boot-arm/master, right? I have provided pull request for next branch since these patches were originated after closure of last merge window (just one day latter). That's good if you can do it. Right after rc1, and as this does not seem to be a matter of urgency, I'd rather not apply them to u-boot-arm/master just in case it would break something. I will thus apply them to u-boot-arm/next, so that they will move to u-boot-arm/master as soon as the new release is out; you won't need to keep them in your repo once I have (rebased and) applied them. If so, please use 'master' as the branch to pull next time, so that there is no doubt what you are asking. (or explicitly specify the branch to pull to; either way is fine to me, as long as there is no doubt on the destination of the pull) Yes, I will do this. Thanks! Thanks and regards.. Prafulla .. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla, Le 13/09/2011 15:08, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 07db205b5186ac9722a1f141d97c9a67c43c4ae1: Joe Hershberger (1): omap4_panda: Ignore omap4 SPL called MLO are available in the git repository at: u-boot-marvell.git next branch. Ajay Bhargav (3): net: Adds Fast Ethernet Controller driver for Armada100 Armada100: Enable Ethernet support for GplugD Armada100: Enable 88E3015 PHY support for GplugD arch/arm/include/asm/arch-armada100/armada100.h | 58 ++ arch/arm/include/asm/arch-armada100/mfp.h | 19 + board/Marvell/gplugd/gplugd.c | 71 +++ drivers/net/Makefile|1 + drivers/net/armada100_fec.c | 736 +++ drivers/net/armada100_fec.h | 232 +++ include/configs/gplugd.h| 30 +- include/netdev.h|1 + 8 files changed, 1146 insertions(+), 2 deletions(-) create mode 100644 drivers/net/armada100_fec.c create mode 100644 drivers/net/armada100_fec.h Regards.. Prafulla . . I assume that this 'next' branch is actually your 'master' for the upcoming release, and you want me to apply it to u-boot-arm/master, right? If so, please use 'master' as the branch to pull next time, so that there is no doubt what you are asking. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git next branch
Hi Prafulla, Le 22/08/2011 11:29, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 5557e86bb0793012057d5462976c2a902bc629ac: aneeshv (1): omap4: increase SRAM budget to fix build error are available in the git repository at: u-boot-marvell.git next branch. Ajay Bhargav (2): gpio: Add GPIO driver framework for Marvell SoCs gpio: Add GPIO driver for Marvell SoC Armada100 arch/arm/include/asm/arch-armada100/gpio.h | 48 drivers/gpio/Makefile |1 + drivers/gpio/mvgpio.c | 115 drivers/gpio/mvgpio.h | 74 ++ 4 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 drivers/gpio/mvgpio.c create mode 100644 drivers/gpio/mvgpio. I hope this will be okay. :-) Perfect! Applied to u-boot-arm/next, thanks! These will move to master upon opening of the upcoming merge window. Regards.. Prafulla . . Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla, Le 21/08/2011 15:00, Prafulla Wadaskar a écrit : -Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Sunday, August 21, 2011 3:46 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Le 21/08/2011 10:15, Prafulla Wadaskar a écrit : -Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Sunday, August 21, 2011 1:36 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Le 21/08/2011 09:34, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 043a76397696ca0a77ebee0ffc60bf31bdf37f02: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): gpio: Add GPIO driver framework for Marvell SoCs gpio: Add GPIO driver for Marvell SoC Armada100 arch/arm/include/asm/arch-armada100/gpio.h | 48 drivers/gpio/Makefile |1 + drivers/gpio/mvgpio.c | 115 drivers/gpio/mvgpio.h | 74 ++ 4 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 drivers/gpio/mvgpio.c create mode 100644 drivers/gpio/mvgpio.h Regards.. Prafulla . . One question, to you, and one note, to all ARM custodians: The question, about the patches: These were submitted on 2011/07/21, after the merge window close of 2011/07/16, and are not a bugfix, right? If so they should only go to master after the september release -- I can pull them into u-boot-arm/next if you want then out of your plate, though. Hi Albert, You are right, you may pull them to your next branch. I am sorry, it's my mistake I should have pulled and requested on next branch. Ok. To avoid any issue, I'll cherry-pick these two onto utboo-arm/next. Maybe you'll want to roll back your own master and move them to your own next, too. If you have not cherry picked. I will move them to next and will provide a fresh pull request. With suggested rollbacks. Please do, thanks in advance! Regards.. Prafulla . . Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla, Le 21/08/2011 09:34, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 043a76397696ca0a77ebee0ffc60bf31bdf37f02: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): gpio: Add GPIO driver framework for Marvell SoCs gpio: Add GPIO driver for Marvell SoC Armada100 arch/arm/include/asm/arch-armada100/gpio.h | 48 drivers/gpio/Makefile |1 + drivers/gpio/mvgpio.c | 115 drivers/gpio/mvgpio.h | 74 ++ 4 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 drivers/gpio/mvgpio.c create mode 100644 drivers/gpio/mvgpio.h Regards.. Prafulla . . One question, to you, and one note, to all ARM custodians: The question, about the patches: These were submitted on 2011/07/21, after the merge window close of 2011/07/16, and are not a bugfix, right? If so they should only go to master after the september release -- I can pull them into u-boot-arm/next if you want then out of your plate, though. The note, about pull request to the ARM repo: I see (here, as in some pull reqs to ARM from others as well) that you have merged the u-boot-arm/master tip in your tree. This causes two problems, one minor, and one major. The minor one is that the commit on which your pull request is emitted is *not* a commit of u-boot-arm/master, whereas it should be. The (more) major problem is that this merging is contrary to http://www.denx.de/wiki/view/U-Boot/CustodianGitTrees#Tips_for_maintaining_custodian_t, which mandates that repos be rebased onto their upstream repo, not that they merge it. This is not simply a question of style vs. substance: one of the reasons to prefer rebases to merges is that merges prevent effective use of git bisect, thus prevent tracking regressions. (note: I think the Wiki can mislead readers into doing git pulls, which actually cause merges, and it would be better if the Wiki suggested git fetches instead -- and did not suggest use of intermediate branches such as 'uboot' which are only syntactic sugaring for 'u-boot/master'.) So custodians, instead of merging the upstream repo onto which you will send a pull request, please do rebase your repo onto the upstream master branch! Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Sunday, August 21, 2011 1:36 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Le 21/08/2011 09:34, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 043a76397696ca0a77ebee0ffc60bf31bdf37f02: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): gpio: Add GPIO driver framework for Marvell SoCs gpio: Add GPIO driver for Marvell SoC Armada100 arch/arm/include/asm/arch-armada100/gpio.h | 48 drivers/gpio/Makefile |1 + drivers/gpio/mvgpio.c | 115 drivers/gpio/mvgpio.h | 74 ++ 4 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 drivers/gpio/mvgpio.c create mode 100644 drivers/gpio/mvgpio.h Regards.. Prafulla . . One question, to you, and one note, to all ARM custodians: The question, about the patches: These were submitted on 2011/07/21, after the merge window close of 2011/07/16, and are not a bugfix, right? If so they should only go to master after the september release -- I can pull them into u-boot-arm/next if you want then out of your plate, though. Hi Albert, You are right, you may pull them to your next branch. I am sorry, it's my mistake I should have pulled and requested on next branch. Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla, Le 21/08/2011 10:15, Prafulla Wadaskar a écrit : -Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Sunday, August 21, 2011 1:36 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Le 21/08/2011 09:34, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 043a76397696ca0a77ebee0ffc60bf31bdf37f02: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): gpio: Add GPIO driver framework for Marvell SoCs gpio: Add GPIO driver for Marvell SoC Armada100 arch/arm/include/asm/arch-armada100/gpio.h | 48 drivers/gpio/Makefile |1 + drivers/gpio/mvgpio.c | 115 drivers/gpio/mvgpio.h | 74 ++ 4 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 drivers/gpio/mvgpio.c create mode 100644 drivers/gpio/mvgpio.h Regards.. Prafulla . . One question, to you, and one note, to all ARM custodians: The question, about the patches: These were submitted on 2011/07/21, after the merge window close of 2011/07/16, and are not a bugfix, right? If so they should only go to master after the september release -- I can pull them into u-boot-arm/next if you want then out of your plate, though. Hi Albert, You are right, you may pull them to your next branch. I am sorry, it's my mistake I should have pulled and requested on next branch. Ok. To avoid any issue, I'll cherry-pick these two onto utboo-arm/next. Maybe you'll want to roll back your own master and move them to your own next, too. Regards.. Prafulla . . Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git -- watch out
Hi again Prafulla, Le 21/08/2011 09:34, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 043a76397696ca0a77ebee0ffc60bf31bdf37f02: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): gpio: Add GPIO driver framework for Marvell SoCs gpio: Add GPIO driver for Marvell SoC Armada100 arch/arm/include/asm/arch-armada100/gpio.h | 48 drivers/gpio/Makefile |1 + drivers/gpio/mvgpio.c | 115 drivers/gpio/mvgpio.h | 74 ++ 4 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 drivers/gpio/mvgpio.c create mode 100644 drivers/gpio/mvgpio.h Regards.. Prafulla . . In order to cherry-pick those two commits to my 'next' branch as agreed, I did fetch your u-boot-marvell/master, and then realized that not only does it a merge, but it even does it to a bad u-bot-arm branch that Wolfgang pointed out to me, so I'd rolled back and forced an update which did not reach you. Namely, your master contains 28b7cbdd (Don't compile in large memory test function by default) and 61cb36df (Added documentation for CONFIG_SYS_TEXT_BASE). Please roll back your master branch to just before merge commit 043a7639! Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git -- watch out
Le 21/08/2011 12:24, Albert ARIBAUD a écrit : Hi again Prafulla, Le 21/08/2011 09:34, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 043a76397696ca0a77ebee0ffc60bf31bdf37f02: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): gpio: Add GPIO driver framework for Marvell SoCs gpio: Add GPIO driver for Marvell SoC Armada100 arch/arm/include/asm/arch-armada100/gpio.h | 48 drivers/gpio/Makefile |1 + drivers/gpio/mvgpio.c | 115 drivers/gpio/mvgpio.h | 74 ++ 4 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 drivers/gpio/mvgpio.c create mode 100644 drivers/gpio/mvgpio.h Regards.. Prafulla . . In order to cherry-pick those two commits to my 'next' branch as agreed, I did fetch your u-boot-marvell/master, and then realized that not only does it a merge, but it even does it to a bad u-bot-arm branch that Wolfgang pointed out to me, so I'd rolled back and forced an update which did not reach you. Namely, your master contains 28b7cbdd (Don't compile in large memory test function by default) and 61cb36df (Added documentation for CONFIG_SYS_TEXT_BASE). Please roll back your master branch to just before merge commit 043a7639! Make that please roll back so that your master branch is fully rebased on u-boot-arm/master -- sorry for the bad wording above. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git -- watch out
-Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Sunday, August 21, 2011 3:54 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git -- watch out Hi again Prafulla, Le 21/08/2011 09:34, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 043a76397696ca0a77ebee0ffc60bf31bdf37f02: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): gpio: Add GPIO driver framework for Marvell SoCs gpio: Add GPIO driver for Marvell SoC Armada100 arch/arm/include/asm/arch-armada100/gpio.h | 48 drivers/gpio/Makefile |1 + drivers/gpio/mvgpio.c | 115 drivers/gpio/mvgpio.h | 74 ++ 4 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 drivers/gpio/mvgpio.c create mode 100644 drivers/gpio/mvgpio.h Regards.. Prafulla . . In order to cherry-pick those two commits to my 'next' branch as agreed, I did fetch your u-boot-marvell/master, and then realized that not only does it a merge, but it even does it to a bad u-bot-arm branch that Wolfgang pointed out to me, so I'd rolled back and forced an update which did not reach you. Namely, your master contains 28b7cbdd (Don't compile in large memory test function by default) and 61cb36df (Added documentation for CONFIG_SYS_TEXT_BASE). Please roll back your master branch to just before merge commit 043a7639! Okay, I will do the needful Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Sunday, August 21, 2011 3:46 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Le 21/08/2011 10:15, Prafulla Wadaskar a écrit : -Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Sunday, August 21, 2011 1:36 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Le 21/08/2011 09:34, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 043a76397696ca0a77ebee0ffc60bf31bdf37f02: Prafulla Wadaskar (1): Merge branch 'master' of git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): gpio: Add GPIO driver framework for Marvell SoCs gpio: Add GPIO driver for Marvell SoC Armada100 arch/arm/include/asm/arch-armada100/gpio.h | 48 drivers/gpio/Makefile |1 + drivers/gpio/mvgpio.c | 115 drivers/gpio/mvgpio.h | 74 ++ 4 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-armada100/gpio.h create mode 100644 drivers/gpio/mvgpio.c create mode 100644 drivers/gpio/mvgpio.h Regards.. Prafulla . . One question, to you, and one note, to all ARM custodians: The question, about the patches: These were submitted on 2011/07/21, after the merge window close of 2011/07/16, and are not a bugfix, right? If so they should only go to master after the september release -- I can pull them into u-boot-arm/next if you want then out of your plate, though. Hi Albert, You are right, you may pull them to your next branch. I am sorry, it's my mistake I should have pulled and requested on next branch. Ok. To avoid any issue, I'll cherry-pick these two onto utboo-arm/next. Maybe you'll want to roll back your own master and move them to your own next, too. If you have not cherry picked. I will move them to next and will provide a fresh pull request. With suggested rollbacks. Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
On 04/08/2011 14:51, Prafulla Wadaskar wrote: Hi Albert Please kindly pull The following changes since commit a3df225cd92034b03b276391a45efc516716a31a: Thomas Abraham (1): SMDKV310: Enable device tree support are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): Armada100: MFP macro naming correction Armada100: Add Board Support for Marvell GuruPlug-Display Jason Cooper (1): drivers/rtc: add Marvell Integrated RTC Applied tu u-boot-arm/master, thanks! Note however that your pull req was based on a bad u-boot-arm/master, which I had to change as it integrated two unwanted patches. I thus took 523bac01981c761c2536ae44b66658581914de7a (the commit of yours that you merged the wrong u-boot-arm/master with), merged it mith my corrected u-boot-arm/master, and then cherry-picking the three commits above into u-boot-arm/master. You will have to force-reset your own master (and next, and possibly other) branch(es) onto the current u-boot-arm/master. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Thursday, August 04, 2011 8:16 PM To: Prafulla Wadaskar Cc: 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git On 04/08/2011 14:51, Prafulla Wadaskar wrote: Hi Albert Please kindly pull The following changes since commit a3df225cd92034b03b276391a45efc516716a31a: Thomas Abraham (1): SMDKV310: Enable device tree support are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): Armada100: MFP macro naming correction Armada100: Add Board Support for Marvell GuruPlug-Display Jason Cooper (1): drivers/rtc: add Marvell Integrated RTC Applied tu u-boot-arm/master, thanks! Note however that your pull req was based on a bad u-boot-arm/master, which I had to change as it integrated two unwanted patches. I thus took 523bac01981c761c2536ae44b66658581914de7a (the commit of yours that you merged the wrong u-boot-arm/master with), merged it mith my corrected u-boot-arm/master, and then cherry-picking the three commits above into u-boot-arm/master. You will have to force-reset your own master (and next, and possibly other) branch(es) onto the current u-boot-arm/master. Hi Albert, Thanks, I will do it at my end. Regards.. Prafulla . . Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla, Le 20/06/2011 07:16, Prafulla Wadaskar a écrit : -Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Saturday, June 18, 2011 11:16 AM To: Prafulla Wadaskar Cc: u-boot@lists.denx.de Subject: Re: Pull request u-boot-marvell.git (resent as this was not sent to the list, sorry Prafulla for the duplicate) Hi Prafulla, Le 16/06/2011 13:23, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 7b2fac7654f7420c2787f74ec3b1540fa3b343e9: Aneesh V (1): omap730p2: fix build breaks are available in the git repository at: u-boot-marvell.git next branch. Are these meant for this release, i.e. should I pull that in u-boot-arm/master? If so, can you please rebase your master branch onto your next branch? Next is supposed to hold commits waiting for next merge window. Hi Albert By default they should go in next release that's why I put them in next branch Still not clear to me -- next release is 2011-06, but next merge window is for *after* 2011-06, and anyway, the U-Boot wiki clearly describes pull reqs as being done on master branches, not next. So: - if you want these commits in for 2011-06, then please move your master to have them in, and send a pull req for master, not next. - if you want them in after 2011-06, then simply wait for the merge window, then move them to your master and issue the pull request. Which is it? Sorry if I seem either convoluted or dense (or both). Regards.. Prafulla . . Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Saturday, June 18, 2011 11:16 AM To: Prafulla Wadaskar Cc: u-boot@lists.denx.de Subject: Re: Pull request u-boot-marvell.git (resent as this was not sent to the list, sorry Prafulla for the duplicate) Hi Prafulla, Le 16/06/2011 13:23, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 7b2fac7654f7420c2787f74ec3b1540fa3b343e9: Aneesh V (1): omap730p2: fix build breaks are available in the git repository at: u-boot-marvell.git next branch. Are these meant for this release, i.e. should I pull that in u-boot-arm/master? If so, can you please rebase your master branch onto your next branch? Next is supposed to hold commits waiting for next merge window. Hi Albert By default they should go in next release that's why I put them in next branch Regards.. Prafulla . . Also: uboot@lilith:~/src/u-boot-arm$ git fetch u-boot-marvell remote: error: refs/remotes/origin/mkimage does not point to a valid object! remote: Counting objects: 88, done. remote: Compressing objects: 100% (38/38), done. remote: Total 68 (delta 51), reused 38 (delta 29) Unpacking objects: 100% (68/68), done. From git://git.denx.de/u-boot-marvell + 0b41af5...7b2fac7 master - u-boot-marvell/master (forced update) + 02e1082...7e481f6 next - u-boot-marvell/next (forced update) uboot@lilith:~/src/u-boot-arm$ Anyone know what the error message about refs/remote/origin/mkimage means? Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Prafulla Wadaskar Sent: Thursday, June 16, 2011 4:54 PM To: 'Albert ARIBAUD' Cc: 'Wolfgang Denk'; 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Pull request u-boot-marvell.git Hi Albert Please kindly pull The following changes since commit 7b2fac7654f7420c2787f74ec3b1540fa3b343e9: Aneesh V (1): omap730p2: fix build breaks are available in the git repository at: u-boot-marvell.git next branch. Holger Brunck (4): arm/kirkwood: if CONFIG_SOFT_I2C is set don't set CONFIG_I2C_MVTWSI arm/km: fix u-boot.kwb build breakage arm/km: remove unneeded define arm/km: replace suenx targets with km_kirkwood Valentin Longchamp (3): arm/km: use board KM_ENV_BUS for CONFIG_I2C_ENV_EEPROM_BUS arm/km: ethernet support for mgcoge3un arm/km: add support for portl2 board Hi Albert I have pushed one more patch on this branch i.e. Simon Guinot (1): Add support for Network Space v2 and parent With additions: board/LaCie/netspace_v2/Makefile| 49 board/LaCie/netspace_v2/kwbimage.cfg| 162 +++ board/LaCie/netspace_v2/netspace_v2.c | 142 +++ board/LaCie/netspace_v2/netspace_v2.h | 42 +++ include/configs/netspace_v2.h | 162 +++ Please kindly consider this for pull or let me know if I need to generate separate pull request for the same. Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
(resent as this was not sent to the list, sorry Prafulla for the duplicate) Hi Prafulla, Le 16/06/2011 13:23, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 7b2fac7654f7420c2787f74ec3b1540fa3b343e9: Aneesh V (1): omap730p2: fix build breaks are available in the git repository at: u-boot-marvell.git next branch. Are these meant for this release, i.e. should I pull that in u-boot-arm/master? If so, can you please rebase your master branch onto your next branch? Next is supposed to hold commits waiting for next merge window. Also: uboot@lilith:~/src/u-boot-arm$ git fetch u-boot-marvell remote: error: refs/remotes/origin/mkimage does not point to a valid object! remote: Counting objects: 88, done. remote: Compressing objects: 100% (38/38), done. remote: Total 68 (delta 51), reused 38 (delta 29) Unpacking objects: 100% (68/68), done. From git://git.denx.de/u-boot-marvell + 0b41af5...7b2fac7 master - u-boot-marvell/master (forced update) + 02e1082...7e481f6 next - u-boot-marvell/next (forced update) uboot@lilith:~/src/u-boot-arm$ Anyone know what the error message about refs/remote/origin/mkimage means? Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla,
Le 11/05/2011 13:51, Prafulla Wadaskar a écrit :
Hi Albert
Please kindly pull
The following changes since commit 33e4e15695f7e502fc414984f67d6636f03854fa:
Ben Gardiner (1):
da850evm: fix NAND WSTROBE and TA timings
are available in the git repository at:
u-boot-marvell.git master branch.
Clint Adams (4):
Rename openrd_base files to openrd
Add definitions for OpenRD-Client and OpenRD-Ultimate
Initialize second PHY on OpenRD-Client and OpenRD-Ultimate
Enable multiple fs options for Marvell SoC family on OpenRD boards
Simon Guinot (2):
Kirkwood: allow to override CONFIG_SYS_TCLK
mv-common.h: fix DRAM banks configuration
MAKEALL|2 +
arch/arm/include/asm/arch-kirkwood/kw88f6281.h |8 +++--
board/Marvell/{openrd_base = openrd}/Makefile |2 +-
board/Marvell/{openrd_base = openrd}/kwbimage.cfg |0
.../{openrd_base/openrd_base.c = openrd/openrd.c} | 33
+---
.../{openrd_base/openrd_base.h = openrd/openrd.h} |0
boards.cfg |4 ++-
include/configs/mv-common.h|8 ++--
include/configs/{openrd_base.h = openrd.h}| 33
+---
9 files changed, 71 insertions(+), 19 deletions(-)
rename board/Marvell/{openrd_base = openrd}/Makefile (98%)
rename board/Marvell/{openrd_base = openrd}/kwbimage.cfg (100%)
rename board/Marvell/{openrd_base/openrd_base.c = openrd/openrd.c} (80%)
rename board/Marvell/{openrd_base/openrd_base.h = openrd/openrd.h} (100%)
rename include/configs/{openrd_base.h = openrd.h} (81%)
Applied, thanks.
Regards..
Prafulla . .
Amicalement,
--
Albert.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla, Le 06/05/2011 22:43, Prafulla Wadaskar a écrit : -Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Saturday, May 07, 2011 1:30 AM To: Prafulla Wadaskar Cc: Wolfgang Denk; 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Please do not use my former address; use my current From: one. Le 06/05/2011 15:25, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683: Grant Likely (1): Add CONFIG_OF_LIBFDT to more boards. are available in the git repository at: u-boot-marvell.git master branch. Clint Adams (4): Rename openrd_base files to openrd Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards Simon Guinot (2): Kirkwood: allow to override CONFIG_SYS_TCLK mv-common.h: fix DRAM banks configuration Seems like you've got more than these 6 patches on your master branch above mine. On my side I see Yes, you are correct Even I have mentioned this in my mail. Sorry, I'd missed this as I directly went to check the list of commits. Clint Adams (4): Rename openrd_base files to openrd Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards Jason Liu (2): mx53loco: set mmc env to MMC slot1 MX5: Enable flat-device-tree support on mx53 loco board Liu Hui-R64343 (1): MX53: support for freescale MX53LOCO board Minkyu Kang (1): Don't grab memory for LCD if FB address is defined Simon Guinot (2): Kirkwood: allow to override CONFIG_SYS_TCLK mv-common.h: fix DRAM banks configuration Some of which, IIRC, are not to be applied yet (the MX53LOCO ones, for instance) and some which are already (the don't grab LCD... one). Can you double-check your tree? I have rebased with u-boot-arm.git master and those are available there. What should I do now to resolve this? BTW: This is first time I am facing this problem. What is root cause of it? I has the same issue, caused by some patches in IMX that were initially accepted then rejected, only after I had pulled the IMX tree. I had to do an interactive rebase to select which patches I needed. Here is what you should do: 1) checkout your current master branch (with the spurious commits) 2) do a 'git rebase -i u-boot-arm/master'. The -i will cause the list of commits to be presented to you in an editor, and you will be able to remove those which you do not want. You'll need to re-push the master (and possibly next, if you need to rebase and export it too) with the -f option. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla, Please do not use my former address; use my current From: one. Le 06/05/2011 15:25, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683: Grant Likely (1): Add CONFIG_OF_LIBFDT to more boards. are available in the git repository at: u-boot-marvell.git master branch. Clint Adams (4): Rename openrd_base files to openrd Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards Simon Guinot (2): Kirkwood: allow to override CONFIG_SYS_TCLK mv-common.h: fix DRAM banks configuration Seems like you've got more than these 6 patches on your master branch above mine. On my side I see Clint Adams (4): Rename openrd_base files to openrd Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards Jason Liu (2): mx53loco: set mmc env to MMC slot1 MX5: Enable flat-device-tree support on mx53 loco board Liu Hui-R64343 (1): MX53: support for freescale MX53LOCO board Minkyu Kang (1): Don't grab memory for LCD if FB address is defined Simon Guinot (2): Kirkwood: allow to override CONFIG_SYS_TCLK mv-common.h: fix DRAM banks configuration Some of which, IIRC, are not to be applied yet (the MX53LOCO ones, for instance) and some which are already (the don't grab LCD... one). Can you double-check your tree? Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Albert ARIBAUD [mailto:albert.u.b...@aribaud.net] Sent: Saturday, May 07, 2011 1:30 AM To: Prafulla Wadaskar Cc: Wolfgang Denk; 'u-boot@lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik Subject: Re: Pull request u-boot-marvell.git Hi Prafulla, Please do not use my former address; use my current From: one. Le 06/05/2011 15:25, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683: Grant Likely (1): Add CONFIG_OF_LIBFDT to more boards. are available in the git repository at: u-boot-marvell.git master branch. Clint Adams (4): Rename openrd_base files to openrd Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards Simon Guinot (2): Kirkwood: allow to override CONFIG_SYS_TCLK mv-common.h: fix DRAM banks configuration Seems like you've got more than these 6 patches on your master branch above mine. On my side I see Yes, you are correct Even I have mentioned this in my mail. Clint Adams (4): Rename openrd_base files to openrd Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards Jason Liu (2): mx53loco: set mmc env to MMC slot1 MX5: Enable flat-device-tree support on mx53 loco board Liu Hui-R64343 (1): MX53: support for freescale MX53LOCO board Minkyu Kang (1): Don't grab memory for LCD if FB address is defined Simon Guinot (2): Kirkwood: allow to override CONFIG_SYS_TCLK mv-common.h: fix DRAM banks configuration Some of which, IIRC, are not to be applied yet (the MX53LOCO ones, for instance) and some which are already (the don't grab LCD... one). Can you double-check your tree? I have rebased with u-boot-arm.git master and those are available there. What should I do now to resolve this? BTW: This is first time I am facing this problem. What is root cause of it? Regards.. Prafulla. . . Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Le 13/04/2011 16:47, Prafulla Wadaskar a écrit : Hi Albert Please kindly pull The following changes since commit 531bb02c0bfc783e95f1b761f18e15d6f565e357: Fabio Estevam (1): MX25: tx25: Add _end section on nand_spl are available in the git repository at: u-boot-marvell.git master branch Lei Wen (6): pxa: move i2c driver to the common place mv_i2c: fix timeout value to be consistent with comments mv_i2c: use structure to replace the direclty define I2C: add i2c support for Pantheon platform I2C: mv_i2c: add multi bus support I2C: add i2c support for Armada100 platform Rogan Dawes (1): Orion5x: Correct DRAM bank detection Applied, thanks! Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Hi Prafulla, Le 14/02/2011 07:58, Prafulla Wadaskar a écrit : Hi Albert/Wolfgang Resending pull re quest for master branch Please kindly pull The following changes since commit 3b66ae65d7f9b18f281ae975a075b991048c8864: Albert Aribaud (1): Merge remote branch 'u-boot-imx/master' are available in the git repository at: u-boot-marvell.git master branch. Applied, thanks! Wolfgang, I will do some scrubbing on patchwork this evening to make sure I haven't missed anything and then I will send my pull request for ARM. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Le 09/02/2011 10:49, Prafulla Wadaskar a écrit : Hi Albert/Wolfgang Please pull The following changes since commit 97a85b223ab316d11f3a374fecc5d449a1c8a694: Scott Wood (1): powerpc/nand spl: link libgcc are available in the git repository at: u-boot-marvell.git on next branch. Hi Prafulla et al., FYI, I will pull this tomorrow evening. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19f11c1...@sc-vexch4.marvell.com you wrote: Please pull The following changes since commit a429db7e3ce6136f80f22584588247926ba60b05: Andreas Bießmann (1): arm920t/at91/timer: replace bss variables by gd are available in the git repository at: u-boot-marvell.git master branch. Prafulla Wadaskar (8): (Ignore-already pulled by wolfgang) ARM: make timer variables in gt_t available for all ARM platforms arm: Add Support for Marvell ARMADA 100 Familiy SoCs gpio: Add Multi-Function-Pin configuration driver for Marvell SoCs add Multi Function Pin configuration support for ARMADA100 Serial: ns16550: Add support for CONFIG_SYS_NS16550_IER macro Serial: Add UART support for Marvell ARMADA 100 SoCs. mv-common.h: Add support for ARMADA100 Platforms Armada100: Add Board Support for Marvell Aspenite-DB Simon Kagstrom (1): MAINTAINERS: Transfer openrd_base maintainership to Prafulla Wadaskar MAINTAINERS |6 +- MAKEALL |1 + arch/arm/cpu/arm926ejs/armada100/Makefile | 46 + arch/arm/cpu/arm926ejs/armada100/cpu.c | 92 ++ arch/arm/cpu/arm926ejs/armada100/dram.c | 131 ++ arch/arm/cpu/arm926ejs/armada100/timer.c| 207 +++ arch/arm/include/asm/arch-armada100/armada100.h | 121 + arch/arm/include/asm/arch-armada100/cpu.h | 53 ++ arch/arm/include/asm/arch-armada100/mfp.h | 67 arch/arm/include/asm/global_data.h |4 +- board/Marvell/aspenite/Makefile | 52 ++ board/Marvell/aspenite/aspenite.c | 53 ++ boards.cfg |1 + drivers/gpio/Makefile |1 + drivers/gpio/mvmfp.c| 87 ++ drivers/serial/ns16550.c|8 +- drivers/serial/serial.c |5 +- include/configs/aspenite.h | 63 +++ include/configs/mv-common.h | 66 ++-- include/mvmfp.h | 100 +++ 20 files changed, 1139 insertions(+), 25 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/armada100/Makefile create mode 100644 arch/arm/cpu/arm926ejs/armada100/cpu.c create mode 100644 arch/arm/cpu/arm926ejs/armada100/dram.c create mode 100644 arch/arm/cpu/arm926ejs/armada100/timer.c create mode 100644 arch/arm/include/asm/arch-armada100/armada100.h create mode 100644 arch/arm/include/asm/arch-armada100/cpu.h create mode 100644 arch/arm/include/asm/arch-armada100/mfp.h create mode 100644 board/Marvell/aspenite/Makefile create mode 100644 board/Marvell/aspenite/aspenite.c create mode 100644 drivers/gpio/mvmfp.c create mode 100644 include/configs/aspenite.h create mode 100644 include/mvmfp.h Applied to next branch, thanks. 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: w...@denx.de A Puritan is someone who is deathly afraid that someone, somewhere, is having fun. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19f11c1...@sc-vexch4.marvell.com you wrote: are available in the git repository at: u-boot-marvell.git master branch. Prafulla Wadaskar (8): (Ignore-already pulled by wolfgang) ARM: make timer variables in gt_t available for all ARM platforms arm: Add Support for Marvell ARMADA 100 Familiy SoCs gpio: Add Multi-Function-Pin configuration driver for Marvell SoCs add Multi Function Pin configuration support for ARMADA100 Serial: ns16550: Add support for CONFIG_SYS_NS16550_IER macro Serial: Add UART support for Marvell ARMADA 100 SoCs. mv-common.h: Add support for ARMADA100 Platforms Armada100: Add Board Support for Marvell Aspenite-DB Are you sure this pull request is for master? These commits don't look like bug fixes to me; they appear to add new stuff instead? So should these go into next ? 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: w...@denx.de That Microsoft, the Trabant of the operating system world, may be glancing over the Berlin Wall at the Audis and BMWs and Mercedes. In their own universe Trabants and Ladas were mainstream too... -- Evan Leibovitch ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a9291...@sc-vexch4.marvell.com you wrote: Please pull The following changes since commit e81bb57f2d98a65aa1a3c61d54cf40294f9039c8= : Wolfgang Denk (1): DaVinci: remove bogus DEF_BOOTM definition are available in the git repository at: u-boot-marvell.git master branch Eric Cooper (2): Seagate FreeAgent DockStar support sort and reformat boards.cfg MAINTAINERS |4 + board/Seagate/dockstar/Makefile | 54 ++ board/Seagate/dockstar/dockstar.c | 181 + board/Seagate/dockstar/dockstar.h | 44 ++ board/Seagate/dockstar/kwbimage.cfg | 165 boards.cfg | 1452 ++-= include/configs/dockstar.h | 125 +++ 7 files changed, 1303 insertions(+), 722 deletions(-) create mode 100644 board/Seagate/dockstar/Makefile create mode 100644 board/Seagate/dockstar/dockstar.c create mode 100644 board/Seagate/dockstar/dockstar.h create mode 100644 board/Seagate/dockstar/kwbimage.cfg create mode 100644 include/configs/dockstar.h Thanks - I cherry-picked (into u-boot-arm) the Seagate FreeAgent DockStar support commit but omitted the sort and reformat boards.cfg commit so far as it causes me a number of merge conflicts with my pending PPC gc-sections patch series. I will apply this patch later, after merging the gc-sections stuff. 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: w...@denx.de When a program is being tested, it is too late to make design changes. -- Geoffrey James, The Tao of Programming ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Le 29/10/2010 13:11, Prafulla Wadaskar a écrit : u-boot-marvell.git ..BRANCH.NOT.VERIFIED.. Is this normal? Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Albert ARIBAUD [mailto:albert.arib...@free.fr] Sent: Friday, October 29, 2010 4:53 PM To: Prafulla Wadaskar Cc: Tom Rix; Wolfgang Denk; u-boot@lists.denx.de; Prabhanjan Sarnaik; Ashish Karkare Subject: Re: Pull request u-boot-marvell.git Le 29/10/2010 13:11, Prafulla Wadaskar a écrit : u-boot-marvell.git ..BRANCH.NOT.VERIFIED.. Sorry, this should be master branch. Hi Wolfgang, Shall I send separate email? Or you will pull them from master? Regards.. Prafulla . . Is this normal? Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
On Friday 29 October 2010 13:23:26 Albert ARIBAUD wrote: Le 29/10/2010 13:11, Prafulla Wadaskar a écrit : u-boot-marvell.git ..BRANCH.NOT.VERIFIED.. Is this normal? From my experience, this happens when the local branch is not yet pushed into the official repository at denx.de. git request-pull generates this output in this case. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
From: Stefan Roese [mailto:s...@denx.de] Sent: Friday, October 29, 2010 5:01 PM To: u-boot@lists.denx.de Cc: Albert ARIBAUD; Prafulla Wadaskar Subject: Re: [U-Boot] Pull request u-boot-marvell.git On Friday 29 October 2010 13:23:26 Albert ARIBAUD wrote: Le 29/10/2010 13:11, Prafulla Wadaskar a écrit : u-boot-marvell.git ..BRANCH.NOT.VERIFIED.. Is this normal? From my experience, this happens when the local branch is not yet pushed into the official repository at denx.de. git request-pull generates this output in this case. You are right Stefan For me, I pull from internal mirror repository whereas push to original repository. Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a6aba...@sc-vexch4.marvell.com you wrote: u-boot-marvell.git ..BRANCH.NOT.VERIFIED.. Sorry, this should be master branch. Shall I send separate email? Or you will pull them from master? It's ok with me. No additional mail needed. Thanks. 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: w...@denx.de I must follow the people. Am I not their leader? - Benjamin Disraeli ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a6aba...@sc-vexch4.marvell.com you wrote: Hi Wolfgang/Tom Pls pull The following changes since commit 66fca016057b1c6b697552cc7220ebada9d4f82d= : Thomas Weber (1): Devkit8000: Adapt changes to ARM relocation support are available in the git repository at: u-boot-marvell.git ..BRANCH.NOT.VERIFIED.. Gray Remlin (1): kirkwood: guruplug: Relocate NAND environment area Heiko Schocher (1): arm926ejs, suen3: fix relocation issues Prafulla Wadaskar (2): Kirkwood: bugfix: broken early console messages kirkwood: get rid of config.mk files Tanmay Upadhyay (1): Kirkwood: bugfix: DRAM size initialization Makefile|2 +- arch/arm/cpu/arm926ejs/kirkwood/dram.c | 10 +++ board/Marvell/guruplug/config.mk| 27 -- board/Marvell/guruplug/guruplug.c |6 +++- board/Marvell/mv88f6281gtw_ge/config.mk | 28 --- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |6 +++- board/Marvell/openrd_base/config.mk | 33 ---= board/Marvell/openrd_base/openrd_base.c |6 +++- board/Marvell/rd6281a/config.mk | 28 --- board/Marvell/rd6281a/rd6281a.c |6 +++- board/Marvell/sheevaplug/config.mk | 28 --- board/Marvell/sheevaplug/sheevaplug.c |6 +++- board/keymile/km_arm/config.mk | 28 --- board/keymile/km_arm/km_arm.c | 24 ++-- include/configs/guruplug.h |4 +- include/configs/keymile-common.h| 16 +++ include/configs/km_arm.h|6 +++- include/configs/mv-common.h | 17 18 files changed, 90 insertions(+), 191 deletions(-) delete mode 100644 board/Marvell/guruplug/config.mk delete mode 100644 board/Marvell/mv88f6281gtw_ge/config.mk delete mode 100644 board/Marvell/openrd_base/config.mk delete mode 100644 board/Marvell/rd6281a/config.mk delete mode 100644 board/Marvell/sheevaplug/config.mk delete mode 100644 board/keymile/km_arm/config.mk Applied, thanks. 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: w...@denx.de Knowledge, sir, should be free to all! -- Harry Mudd, I, Mudd, stardate 4513.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a69e2...@sc-vexch4.marvell.com you wrote: The following changes since commit d778a2fbb360530395dfbc0dbe1f80b7bf959028= : Albert Aribaud (1): orion5x: fix relocation-incompatible code are available in the git repository at: u-boot-marvell.git master branch Albert Aribaud (2): mvsata_ide: adjust port init sequence orion5x: optimize window size computation Prafulla Wadaskar (4): Kirkwood: print_cpuinfo fixed for valid devid revid Kirkwood: dram_init is moved to dram.c kirkwood: added common config file mv-common.h Kirkwood: Changes specific to ARM relocation support arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 34 +++- arch/arm/cpu/arm926ejs/kirkwood/dram.c | 38 arch/arm/cpu/arm926ejs/orion5x/cpu.c| 32 ++- arch/arm/include/asm/arch-kirkwood/cpu.h|2 + board/Marvell/guruplug/guruplug.c | 11 - board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 11 - board/Marvell/openrd_base/openrd_base.c | 11 - board/Marvell/rd6281a/rd6281a.c | 11 - board/Marvell/sheevaplug/sheevaplug.c | 11 - drivers/block/mvsata_ide.c | 42 - include/configs/guruplug.h | 103 +-- include/configs/keymile-common.h|1 + include/configs/mv-common.h | 230 +++= include/configs/mv88f6281gtw_ge.h | 120 ++--- include/configs/openrd_base.h | 146 +-- include/configs/rd6281a.h | 101 +- include/configs/sheevaplug.h| 104 +-- 17 files changed, 389 insertions(+), 619 deletions(-) create mode 100644 include/configs/mv-common.h Applied to u-boot-arm, thanks. 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: w...@denx.de The glory of creation is in its infinite diversity. And in the way our differences combine to create meaning and beauty. -- Dr. Miranda Jones and Spock, Is There in Truth No Beauty?, stardate 5630.8 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Wolfgang Denk [mailto:w...@denx.de] Sent: Wednesday, September 08, 2010 2:55 AM To: Prafulla Wadaskar Cc: Tom Rix; u-boot@lists.denx.de; Prabhanjan Sarnaik; Ashish Karkare Subject: Re: Pull request u-boot-marvell.git Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a6803...@sc-vexch4.marvell. com you wrote: Hi Wolfgang/Tom Pls pull The following changes since commit 5549d22b656550d36b2cc46743c7220ab0e9dcc4= : Wolfgang Denk (1): Merge branch 'master' of /home/wd/git/u-boot/master are available in the git repository at: u-boot-marvell.git master branch. Albert Aribaud (1): Orion5x: bugfix: window size (mis)calculation Prafulla Wadaskar (1): Kirkwood: bugfix: window size (mis)calculation arch/arm/cpu/arm926ejs/kirkwood/cpu.c |2 +- arch/arm/cpu/arm926ejs/orion5x/cpu.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Hm... when pulling as instructed I also got this commit which you do not mention here: I am sorry about this, I added it after sending this request. Author: Albert Aribaud [albert.arib...@free.fr] 2010-08-27 18:11:48 Committer: Prafulla Wadaskar prafu...@marvell.com 2010-08-27 18:11:48 orion5x: fix comment-in-comment typo in cpu.h As this is trivial and obvious enough, I left it in. Please kindly pull this patch too Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a6879...@sc-vexch4.marvell.com you wrote: Hm... when pulling as instructed I also got this commit which you do not mention here: I am sorry about this, I added it after sending this request. No problem. As this is trivial and obvious enough, I left it in. Please kindly pull this patch too Sorry for not being clear: that's what I did - it's in u-boot-arm now. 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: w...@denx.de A supercomputer is a machine that runs an endless loop in 2 seconds. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a6803...@sc-vexch4.marvell.com you wrote: Hi Wolfgang/Tom Pls pull The following changes since commit 5549d22b656550d36b2cc46743c7220ab0e9dcc4= : Wolfgang Denk (1): Merge branch 'master' of /home/wd/git/u-boot/master are available in the git repository at: u-boot-marvell.git master branch. Albert Aribaud (1): Orion5x: bugfix: window size (mis)calculation Prafulla Wadaskar (1): Kirkwood: bugfix: window size (mis)calculation arch/arm/cpu/arm926ejs/kirkwood/cpu.c |2 +- arch/arm/cpu/arm926ejs/orion5x/cpu.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Hm... when pulling as instructed I also got this commit which you do not mention here: Author: Albert Aribaud [albert.arib...@free.fr] 2010-08-27 18:11:48 Committer: Prafulla Wadaskar prafu...@marvell.com 2010-08-27 18:11:48 orion5x: fix comment-in-comment typo in cpu.h As this is trivial and obvious enough, I left it in. Applied to u-boot-arm, thanks. 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: w...@denx.de There's an old proverb that says just about whatever you want it to. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a6577...@sc-vexch4.marvell.com you wrote: are available in the git repository at: u-boot-marvell.git maaster branch Albert Aribaud (5): ide: add configuration ide: reorder object files alphabetically ide: add mvsata_ide driver cmd_ide: add support for orion5x edminiv2: add mvsata_ide and cmd_ide support Prafulla Wadaskar (2): cmd_ide: add support for Kirkwood Kirkwood: openrd_base: Added SATA support arch/arm/include/asm/arch-kirkwood/kirkwood.h |5 + arch/arm/include/asm/arch-orion5x/orion5x.h |3 + arch/powerpc/include/asm/config.h |3 + common/cmd_ide.c | 25 +++-- doc/README.PXA_CF |8 ++ drivers/block/Makefile|7 +- drivers/block/mvsata_ide.c| 140 += include/configs/ap325rxa.h|1 + include/configs/edminiv2.h| 34 ++- include/configs/ms7720se.h|1 + include/configs/openrd_base.h | 31 ++ include/configs/r2dplus.h |1 + include/configs/r7780mp.h |1 + 13 files changed, 247 insertions(+), 13 deletions(-) create mode 100644 drivers/block/mvsata_ide.c Pulled into u-boot-arm #master. Thanks. 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: w...@denx.de How many seconds are there in a year? If I tell you there are 3.155 x 10^7, you won't even try to remember it. On the other hand, who could forget that, to within half a percent, pi seconds is a nanocentury. -- Tom Duff, Bell Labs ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Albert ARIBAUD, In message 4c5fbee7.4050...@free.fr you wrote: I haven't got a publically accessible repo at this point. Wolfgang, as Prafulla acknowledged the 'default windows mapping' patch except for the formal Ack-by, could you please merge it directly from the mailing list in your mainline tree above Prafulla's latest pull request? The patch in question is: Done. 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: w...@denx.de 8) Use common sense in routing cable. Avoid wrapping coax around sources of strong electric or magnetic fields. Do not wrap the cable around flourescent light ballasts or cyclotrons, for example. - Ethernet Headstart Product, Information and Installation Guide, Bell Technologies, pg. 11 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Le 10/08/2010 22:45, Wolfgang Denk a écrit : Dear Albert ARIBAUD, In message4c5fbee7.4050...@free.fr you wrote: I haven't got a publically accessible repo at this point. Wolfgang, as Prafulla acknowledged the 'default windows mapping' patch except for the formal Ack-by, could you please merge it directly from the mailing list in your mainline tree above Prafulla's latest pull request? The patch in question is: Done. Best regards, Wolfgang Denk Thanks! Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Le 09/08/2010 08:18, Prafulla Wadaskar a écrit : Hi Wolfgang/Tom Pls pull The following changes since commit 9efac4a1eb99d9c5539aa6992025eeacab7980c6: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-samsung are available in the git repository at: u-boot-marvell.git maaster branch Albert Aribaud (5): ide: add configuration ide: reorder object files alphabetically ide: add mvsata_ide driver cmd_ide: add support for orion5x edminiv2: add mvsata_ide and cmd_ide support Thanks again Prafulla for having merged the IDE changes. I saw you saying you also would merge the default windows mappings patch, which is not in the pull request. Anything wrong with this one? Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Albert ARIBAUD [mailto:albert.arib...@free.fr] Sent: Monday, August 09, 2010 12:22 PM To: u-boot@lists.denx.de; Prafulla Wadaskar Subject: Re: [U-Boot] Pull request u-boot-marvell.git Le 09/08/2010 08:18, Prafulla Wadaskar a écrit : Hi Wolfgang/Tom Pls pull The following changes since commit 9efac4a1eb99d9c5539aa6992025eeacab7980c6: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-samsung are available in the git repository at: u-boot-marvell.git maaster branch Albert Aribaud (5): ide: add configuration ide: reorder object files alphabetically ide: add mvsata_ide driver cmd_ide: add support for orion5x edminiv2: add mvsata_ide and cmd_ide support Thanks again Prafulla for having merged the IDE changes. I saw you saying you also would merge the default windows mappings patch, which is not in the pull request. Anything wrong with this one? Yes, you are right, I am busy with some priority task, could not steal out some additional cycles for the same. If you already have it, you are welcomed, otherwise I will do it in next week Regards.. Prafulla . . Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Le 09/08/2010 10:13, Prafulla Wadaskar a écrit : -Original Message- From: Albert ARIBAUD [mailto:albert.arib...@free.fr] Sent: Monday, August 09, 2010 12:22 PM To: u-boot@lists.denx.de; Prafulla Wadaskar Subject: Re: [U-Boot] Pull request u-boot-marvell.git Le 09/08/2010 08:18, Prafulla Wadaskar a écrit : Hi Wolfgang/Tom Pls pull The following changes since commit 9efac4a1eb99d9c5539aa6992025eeacab7980c6: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-samsung are available in the git repository at: u-boot-marvell.git maaster branch Albert Aribaud (5): ide: add configuration ide: reorder object files alphabetically ide: add mvsata_ide driver cmd_ide: add support for orion5x edminiv2: add mvsata_ide and cmd_ide support Thanks again Prafulla for having merged the IDE changes. I saw you saying you also would merge the default windows mappings patch, which is not in the pull request. Anything wrong with this one? Yes, you are right, I am busy with some priority task, could not steal out some additional cycles for the same. If you already have it, you are welcomed, otherwise I will do it in next week I haven't got a publically accessible repo at this point. Wolfgang, as Prafulla acknowledged the 'default windows mapping' patch except for the formal Ack-by, could you please merge it directly from the mailing list in your mainline tree above Prafulla's latest pull request? The patch in question is: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/81108 Then Prafulla will get the commit when he pulls your master back to the marvell tree. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla, In message f766e4f80769bd478052fb6533fa745d19a4985...@sc-vexch4.marvell.com you wrote: The following changes since commit 376e7fadbad3285231e390c6534feb5af86d594b: Minkyu Kang (1): SAMSUNG: goni: add the GPL licence are available in the git repository at: u-boot-marvrell.git .. Master branch.. s/rvr/rv/ ? Albert Aribaud (3): Initial support for Marvell Orion5x SoC Add Orion5x support to 16550 device driver Add support for the LaCie ED Mini V2 board MAINTAINERS|4 + MAKEALL|1 + Makefile |3 + arch/arm/cpu/arm926ejs/orion5x/Makefile| 55 + arch/arm/cpu/arm926ejs/orion5x/cpu.c | 270 ++ arch/arm/cpu/arm926ejs/orion5x/dram.c | 64 + arch/arm/cpu/arm926ejs/orion5x/lowlevel_init.S | 293 arch/arm/cpu/arm926ejs/orion5x/timer.c | 181 +++ arch/arm/include/asm/arch-orion5x/cpu.h| 203 arch/arm/include/asm/arch-orion5x/mv88f5182.h | 40 arch/arm/include/asm/arch-orion5x/orion5x.h| 69 ++ board/LaCie/edminiv2/Makefile | 53 + board/LaCie/edminiv2/config.mk | 27 +++ board/LaCie/edminiv2/edminiv2.c| 92 drivers/serial/serial.c|3 + include/configs/edminiv2.h | 172 ++ 16 files changed, 1530 insertions(+), 0 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/orion5x/Makefile create mode 100644 arch/arm/cpu/arm926ejs/orion5x/cpu.c create mode 100644 arch/arm/cpu/arm926ejs/orion5x/dram.c create mode 100644 arch/arm/cpu/arm926ejs/orion5x/lowlevel_init.S create mode 100644 arch/arm/cpu/arm926ejs/orion5x/timer.c create mode 100644 arch/arm/include/asm/arch-orion5x/cpu.h create mode 100644 arch/arm/include/asm/arch-orion5x/mv88f5182.h create mode 100644 arch/arm/include/asm/arch-orion5x/orion5x.h create mode 100644 board/LaCie/edminiv2/Makefile create mode 100644 board/LaCie/edminiv2/config.mk create mode 100644 board/LaCie/edminiv2/edminiv2.c create mode 100644 include/configs/edminiv2.h Applied, thanks. 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: w...@denx.de Cigarette, n.: A fire at one end, a fool at the other, and a bit of tobacco in between. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Wolfgang Denk [mailto:w...@denx.de] Sent: Saturday, May 22, 2010 2:02 AM To: Prafulla Wadaskar Cc: Tom Rix; u-boot@lists.denx.de Subject: Re: [U-Boot] Pull request u-boot-marvell.git Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a24df...@sc-vexch4.marvell. com you wrote: Hi Tom Pls pull The following changes since commit 0cf7d2440e1aa91ca65f1fc08ba309184d376da6: Stefano Babic (1): Add SPI support to mx51evk board are available in the git repository at: u-boot-marvell.git master branch Mahavir Jain (1): bugfix: Guruplug: Use standard miiphy board/Marvell/guruplug/guruplug.c |9 + 1 files changed, 1 insertions(+), 8 deletions(-) I'm jumping in here as Tom is currently unavailable. I cherry-picked this commit; I did not pull as this would also bing in an update to arch/arm/include/asm/mach-types.h for which I haven't seen a pull request yet. Thanks Wolfgang For picking this patch. Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Dear Prafulla Wadaskar, In message f766e4f80769bd478052fb6533fa745d19a24df...@sc-vexch4.marvell.com you wrote: Hi Tom Pls pull The following changes since commit 0cf7d2440e1aa91ca65f1fc08ba309184d376da6: Stefano Babic (1): Add SPI support to mx51evk board are available in the git repository at: u-boot-marvell.git master branch Mahavir Jain (1): bugfix: Guruplug: Use standard miiphy board/Marvell/guruplug/guruplug.c |9 + 1 files changed, 1 insertions(+), 8 deletions(-) I'm jumping in here as Tom is currently unavailable. I cherry-picked this commit; I did not pull as this would also bing in an update to arch/arm/include/asm/mach-types.h for which I haven't seen a pull request yet. Thanks. 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: w...@denx.de Q: Why do mountain climbers rope themselves together? A: To prevent the sensible ones from going home. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
-Original Message- From: Tom Rix [mailto:t...@bumblecow.com] Sent: Thursday, April 22, 2010 5:17 AM To: Prafulla Wadaskar Cc: u-boot@lists.denx.de; Siddarth Gore; Tom Rix Subject: Re: [U-Boot] Pull request u-boot-marvell.git Prafulla Wadaskar wrote: Hi Tom Pls pull the following The following changes since commit 07739bcef5da07cc4a4edef8b91014ccc332eda3: Stefano Babic (1): Moved board specific values in config file are available in the git repository at: http://git.denx.de/u-boot/u-boot-marvell.git master branch Frans Meulenbroeks (2): configs/sheevaplug: added a few additional commands configs/openrd_base.h: reordered macros Siddarth Gore (1): Marvell GuruPlug Board Support MAINTAINERS |4 + MAKEALL |1 + Makefile|3 + board/Marvell/guruplug/Makefile | 51 + board/Marvell/guruplug/config.mk| 27 + board/Marvell/guruplug/guruplug.c | 167 + board/Marvell/guruplug/guruplug.h | 39 +++ board/Marvell/guruplug/kwbimage.cfg | 162 include/configs/guruplug.h | 198 +++ include/configs/openrd_base.h |4 +- include/configs/sheevaplug.h| 27 - 11 files changed, 676 insertions(+), 7 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h Regards.. Prafulla . . Prafulla, These have been applied to arm/master. There were some compiler warnings for the new guruplug board. kirkwood_egiga.c: In function 'kwgbe_init': kirkwood_egiga.c:448: warning: dereferencing type-punned pointer will break strict-aliasing rules kirkwood_egiga.c: In function 'kwgbe_recv': kirkwood_egiga.c:609: warning: dereferencing type-punned pointer will break strict-aliasing rules These should be fixed. Hi Tom I have already provided patch for this long back. I hope this will be pushed up through u-boot-net.git by Ben. Ref: http://lists.denx.de/pipermail/u-boot/2010-April/069464.html Hi Ben, Any comments on this? Regards.. Prafulla . . Thanks Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Prafulla Wadaskar wrote: Hi Tom Pls pull the following The following changes since commit 07739bcef5da07cc4a4edef8b91014ccc332eda3: Stefano Babic (1): Moved board specific values in config file are available in the git repository at: http://git.denx.de/u-boot/u-boot-marvell.git master branch Frans Meulenbroeks (2): configs/sheevaplug: added a few additional commands configs/openrd_base.h: reordered macros Siddarth Gore (1): Marvell GuruPlug Board Support MAINTAINERS |4 + MAKEALL |1 + Makefile|3 + board/Marvell/guruplug/Makefile | 51 + board/Marvell/guruplug/config.mk| 27 + board/Marvell/guruplug/guruplug.c | 167 + board/Marvell/guruplug/guruplug.h | 39 +++ board/Marvell/guruplug/kwbimage.cfg | 162 include/configs/guruplug.h | 198 +++ include/configs/openrd_base.h |4 +- include/configs/sheevaplug.h| 27 - 11 files changed, 676 insertions(+), 7 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h Regards.. Prafulla . . Prafulla, These have been applied to arm/master. There were some compiler warnings for the new guruplug board. kirkwood_egiga.c: In function 'kwgbe_init': kirkwood_egiga.c:448: warning: dereferencing type-punned pointer will break strict-aliasing rules kirkwood_egiga.c: In function 'kwgbe_recv': kirkwood_egiga.c:609: warning: dereferencing type-punned pointer will break strict-aliasing rules These should be fixed. Thanks Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Heiko Schocher wrote: Hello Tom, Tom wrote: Prafulla Wadaskar wrote: Hi Tom Pls pull the following The following changes since commit 1b063b552e815f90a6a880e78fc40cc309dd52ad: Anders Darander (1): Add bootcount to AT91 are available in the git repository at: http://git.denx.de/u-boot/u-boot-marvell.git master branch Heiko Schocher (1): arm: add support for the suen3 board from keymile For the regression test, I get a failure to build error. This must be fixed. Yes, you are right, good catch. The following patch will help: diff --git a/board/keymile/km_arm/Makefile b/board/keymile/km_arm/Makefile index fffc6a3..c5b0be1 100644 --- a/board/keymile/km_arm/Makefile +++ b/board/keymile/km_arm/Makefile @@ -23,6 +23,9 @@ # include $(TOPDIR)/config.mk +ifneq ($(OBJTREE),$(SRCTREE)) +$(shell mkdir -p $(obj)../common) +endif LIB= $(obj)lib$(BOARD).a Should I make a new version of the arm: add support for the suen3 board from keymile patch, or a patch based on the actual git://git.denx.de/u-boot-marvell.git ? Please just the much smaller 'Compiler fix.. ' patch. Thanks, Tom bye Heiko ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-marvell.git
Prafulla Wadaskar wrote: Hi Tom Pls pull the following The following changes since commit 1b063b552e815f90a6a880e78fc40cc309dd52ad: Anders Darander (1): Add bootcount to AT91 are available in the git repository at: http://git.denx.de/u-boot/u-boot-marvell.git master branch Heiko Schocher (1): arm: add support for the suen3 board from keymile For the regression test, I get a failure to build error. This must be fixed. Other warnings should also be fixed. Tom jffs2_1pass.c: In function 'get_fl_mem': jffs2_1pass.c:399: warning: unused variable 'id' jffs2_1pass.c: In function 'get_node_mem': jffs2_1pass.c:423: warning: unused variable 'id' kirkwood_egiga.c: In function 'kwgbe_init': kirkwood_egiga.c:448: warning: dereferencing type-punned pointer will break strict-aliasing rules kirkwood_egiga.c: In function 'kwgbe_recv': kirkwood_egiga.c:609: warning: dereferencing type-punned pointer will break strict-aliasing rules Assembler messages: Fatal error: can't create .../build/board/keymile/km_arm/../common/common.o: No such file or directory make[1]: *** [.../build/board/keymile/km_arm/../common/common.o] Error 2 make: *** [.../build/board/keymile/km_arm/libkm_arm.a] Error 2 The '...' is my reduction of path T ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
