[U-Boot] [PATCH] Fix issues introduced by 16fc32f: unify {CONFIG_, }ENV_IS_EMBEDDED

Albin Tonnerre albin.tonnerre at free-electrons.com
Tue Aug 25 12:21:10 CEST 2009


On Tue, Aug 25, 2009 at 06:16:24AM -0400, Mike Frysinger wrote :
> On Tuesday 25 August 2009 04:46:07 Albin Tonnerre wrote:
> > Commit 16fc32f introduced an error in include/environment.h, which makes
> > u-boot fail to compile due to a missing #endif.
> > This also fixes a merge conflict remaining in
> > include/configs/EB+MCF-EV123.h which was caused by the same commit
> 
> this is only an issue for the "next" branch ...
> 
> my local git tree has the right number of #endif's, so i guess i must have 
> sent out the wrong patch
> 
> guess this needs to get squashed into the relevant change rather than added as 
> a new commit.  thanks for the update.

How exactly would you do that? The commit actually got pushed, and AFAIK next
doesn't get rebased

Regards,
-- 
Albin Tonnerre, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: Digital signature
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090825/dd1f719c/attachment.pgp 


More information about the U-Boot mailing list