[U-Boot] [PATCH 1/2 v4] env: only build env_embedded and envcrc when needed

[Mike Frysinger <vapier@gentoo.org>]

On Sunday 25 October 2009 17:55:07 Wolfgang Denk wrote:
> Mike Frysinger wrote:
> > i'm attaching two patches here.  since we're past the merge window but
> > before rc1, i dont know how invasive you want to get.
> >
> > the first one restores env_embedded.o building for certain config options
> > (even though it'll only produce a 0 byte file).  if you want to be
> > cautious for this release, then i guess we can merge just this patch.
> >
> > the second one attempts to clean up env_embedded.o in all linker scripts
> > where the board would only end up with a 0 byte file.  obviously i cant
> > test any of these since i dont have the hardware, but the logic seems
> > straight forward. if you want to stay cautious, this would go into the
> > next branch for start of next merge window.
> >
> > or just merge the 2nd patch only and assume that people who dont test the
> > rc1+ are dead boards anyways.  i got some build errors even after these
> > fixes, but they seem unrelated to my env_embedded changes as they have to
> > do with sections filling up & overflowing with my gcc-4.1.1 compiler.
> 
> Hm... even though I like patch #2 more than the other one (which is
> why I applied #2), there is a strange phenomenon remaining:
> 
> 
> With patch #2 applied, I get these errors for the acadia_nand,
> bamboo_nand, canyonlands_nand, and kilauea_nand configurations:
> 
> 	-> ./MAKEALL  kilauea_nand
> 	Configuring for kilauea_nand board...
> 	In file included from include/common.h:724:
> 	/home/wd/git/u-boot/work/include/environment.h:117:1: warning:
>  "CONFIG_ENV_IS_EMBEDDED" redefined In file included from
>  /home/wd/git/u-boot/work/include/config.h:4, from include/common.h:37:
> 	/home/wd/git/u-boot/work/include/configs/kilauea.h:127:1: warning: this is
>  the location of the previous definition
> 
> But when I remove the CONFIG_ENV_IS_EMBEDDED definition from line 127
> of include/configs/kilauea.h, then I get this:
> 
> 	./MAKEALL kilauea kilauea_nand
> 	Configuring for kilauea board...
> 	   text    data     bss     dec     hex filename
> 	 287816   24656   46548  359020   57a6c /work/wd/tmp-ppc/u-boot
> 	Configuring for kilauea_nand board...
> 	ppc_6xx-ld: cannot find common/env_embedded.o
> 	make: *** [/work/wd/tmp-ppc/u-boot] Error 1
> 
> There seems to be still a logic error ...

should be harmless, but obviously it's ugly.  the attached patch should fix 
things up.  the related issue is the one i raised in the other env embedded 
thread wrt the meaning of "ENV_IS_EMBEDDED" ...
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-env-avoid-redefining-CONFIG_ENV_IS_EMBEDDED.patch
Type: text/x-patch
Size: 1393 bytes
Desc: not available
Url : http://lists.denx.de/pipermail/u-boot/attachments/20091026/a9354f04/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20091026/a9354f04/attachment.pgp