From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Sun, 21 Aug 2011 12:30:38 +0200 Subject: [U-Boot] Pull request u-boot-marvell.git -- watch out In-Reply-To: <4E50DCCD.4070101@aribaud.net> References: <4E50DCCD.4070101@aribaud.net> Message-ID: <4E50DE4E.9090802@aribaud.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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.