From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Thu, 12 Jan 2012 08:24:03 +0100 Subject: [U-Boot] [PATCH 2/2 V4] Changes to move hawkboard to the new spl infrastructure In-Reply-To: <1326301384-6423-1-git-send-email-urwithsughosh@gmail.com> References: <1326301384-6423-1-git-send-email-urwithsughosh@gmail.com> Message-ID: <4F0E8A93.40800@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Sughosh, Sughosh Ganu wrote: > This patch moves hawkboard to the new spl infrastructure from the > older nand_spl one. > > Removed the hawkboard_nand_config build option -- The spl code now > gets compiled with hawkboard_config, after building the main u-boot > image, using the CONFIG_SPL_TEXT_BASE. Modified the README.hawkboard > to reflect the same. > > Signed-off-by: Sughosh Ganu > Signed-off-by: Heiko Schocher > Cc: Heiko Schocher > Cc: Christian Riesch > Cc: Sudhakar Rajashekhara > Cc: Tom Rini > --- Patch looks good to me, but it doesn't aplly to current TOT [hs at pollux u-boot]$ git am index.html Applying: Changes to move hawkboard to the new spl infrastructure error: patch failed: include/configs/da850evm.h:44 error: include/configs/da850evm.h: patch does not apply Patch failed at 0001 Changes to move hawkboard to the new spl infrastructure When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". [hs at pollux u-boot]$ My tree is commit 9a420986cccc9bd2c37affd931d627b3c3e72952 Author: Rob Herring Date: Thu Dec 15 11:15:50 2011 +0000 ARM: highbank: enable networking and pxe Do I missing something here? (If I remember right, I had no such issue with your v1 patch ...) bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany