[coreboot] SMM included twice

Stefan Reinauer stepan at coresystems.de
Mon Oct 26 17:36:20 CET 2009


Myles Watson wrote:
> src/cpu/x86/smm/Makefile.inc:33: warning: overriding commands for
> target
> `/home/myles/try/buildrom-devel/work/coreboot/svn/build/cpu/x86/smm/smm.o'
> src/cpu/x86/smm/Makefile.inc:33: warning: ignoring old commands for
> target
> `/home/myles/try/buildrom-devel/work/coreboot/svn/build/cpu/x86/smm/smm.o'
> src/cpu/x86/smm/Makefile.inc:36: warning: overriding commands for
> target
> `/home/myles/try/buildrom-devel/work/coreboot/svn/build/cpu/x86/smm/smm'
> src/cpu/x86/smm/Makefile.inc:36: warning: ignoring old commands for
> target
> `/home/myles/try/buildrom-devel/work/coreboot/svn/build/cpu/x86/smm/smm'
> src/cpu/x86/smm/Makefile.inc:41: warning: overriding commands for
> target
> `/home/myles/try/buildrom-devel/work/coreboot/svn/build/cpu/x86/smm/smm_bin.c'
> src/cpu/x86/smm/Makefile.inc:41: warning: ignoring old commands for
> target
> `/home/myles/try/buildrom-devel/work/coreboot/svn/build/cpu/x86/smm/smm_bin.c'
>
> myles at orangutan:svn$ grep -Ir subdirs.*smm src/ | grep -v svn
> src/cpu/x86/Makefile.inc:subdirs-y += smm
> src/cpu/via/model_c7/Makefile.inc:subdirs-y += ../../x86/smm
> src/cpu/via/model_c3/Makefile.inc:subdirs-y += ../../x86/smm
> src/cpu/intel/ep80579/Makefile.inc:subdirs-y += ../../x86/smm
>
> First it gets included with src/cpu/x86, then with every cpu model. 
> Can we just remove those?
>
> subdirs-y += amd
> subdirs-y += intel
> subdirs-y += via
> subdirs-y += emulation
> subdirs-y += x86
>
> This is a little strange, though.  All the rest are brands.
>
> To be consistent, I think we should remove subdirs-y += x86 from
> src/cpu/Makefile.inc, and let every CPU include it.  Patch attached.
>
> Signed-off-by: Myles Watson <mylesgw at gmail.com <mailto:mylesgw at gmail.com>>
>
> I'd be equally happy with every CPU (since we only have x86), just
> doing subdir-y += ../../x86 so they didn't have to be repeated.

Ooops my fault.. Whatever appeals people most ...

There's an additional Kconfig flag which guards the actual addition of
code, so we could include it in x86/Makefile.inc so we don't have to add
it everywhere.

If a socket includes intel/model_6ex and intel/model_6fx and both
include smm, we would get duplicates again,.. so just including x86 from
cpu and including smm from x86 seems the cleanest way to me, since smm
really is an x86 thing, across cpu types.

Stefan





More information about the coreboot mailing list