[U-Boot] 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
MAINTAINERS | 7 ++- MAKEALL | 3 +- arch/arm/include/asm/arch-kirkwood/config.h | 2 + board/keymile/km_arm/km_arm.c | 45 ++++++++++++++- boards.cfg | 5 +- include/configs/km/km_arm.h | 32 ++-------- include/configs/{suen3.h => km_kirkwood.h} | 18 ++++-- include/configs/mgcoge3un.h | 6 ++ include/configs/portl2.h | 81 +++++++++++++++++++++++++++ include/configs/suen8.h | 50 ---------------- 10 files changed, 161 insertions(+), 88 deletions(-) rename include/configs/{suen3.h => km_kirkwood.h} (77%) create mode 100644 include/configs/portl2.h delete mode 100644 include/configs/suen8.h
Regards.. Prafulla . .
(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,
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@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.
Hi Prafulla,
Le 20/06/2011 07:16, Prafulla Wadaskar a écrit :
-----Original Message----- From: Albert ARIBAUD [mailto:albert.u.boot@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 breaksare 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,
participants (2)
-
Albert ARIBAUD -
Prafulla Wadaskar