Hello Heiko, On Thu, Jan 12, 2012 at 8:24 AM, Heiko Schocher <h...@denx.de> wrote: > 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 <urwithsugh...@gmail.com> >> Signed-off-by: Heiko Schocher <h...@denx.de> >> Cc: Heiko Schocher <h...@denx.de> >> Cc: Christian Riesch <christian.rie...@omicron.at> >> Cc: Sudhakar Rajashekhara <sudhakar....@ti.com> >> Cc: Tom Rini <tr...@ti.com> >> --- > > Patch looks good to me, but it doesn't aplly to current TOT > > [hs@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@pollux u-boot]$ > > My tree is > commit 9a420986cccc9bd2c37affd931d627b3c3e72952 > Author: Rob Herring <rob.herr...@calxeda.com> > 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 ...)
It applies only to ti/master due to commit 1091e5a65ad2710f7e53e49dd44f9613e789f9b9 in git://git.denx.de/u-boot-ti.git Regards, Christian _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
