On Fri, May 2, 2008 at 7:57 AM, Myles Watson mylesgw@gmail.com wrote:
This patch consolidates the payload .conf files to eliminate redundancy. A couple of them were not consolidated because it appeared that they will be more specialized in the future.
follow the patch with: svn rm config/payloads/etherboot.conf svn rm config/payloads/memtest.conf svn rm config/payloads/tint.conf svn rm config/payloads/grub2.conf svn rm config/payloads/gpxe.conf svn rm config/payloads/coreinfo.conf svn rm config/payloads/filo.conf
since they are no longer needed.
file by file changes:
Makefile: Eliminated a payload copy to simplify build. Added empty targets for custom and custom-clean.
packages/coreboot-v3/coreboot-v3.mk: Same payload copy change as Makefile.
packages/ofw/ofw.mk: Moved the SVN information here from ofw.conf because it is here for every other payload.
config/payloads/ofw.conf: The only thing keeping this file here is a comment about crc32sum.
config/payloads/payloads.conf: Change the way PAYLOAD and PAYLOAD-y are set. Both are needed for lab since lab is the name of the payload, but isn't an actual payload.
config/payloads/lab.conf: Removed redundant PAYLOAD assignment.
config/payloads/openbios.conf: Include the generic and leave this file for possible fcode-utils dependency.
config/payloads/kernel.conf: Removed redundant PAYLOAD and PAYLOAD-y assignment.
config/payloads/Config.in: Removed extra menu for Custom Payload with only one option in it.
config/payloads/custom.conf: Simplified this file since there was no CUSTOM_PAYLOAD variable set anywhere. Included Makefile.generic so that lzma compression would just work.
I forgot to svn add the two new files. New patch attached.
config/payloads/generic.conf: The commonalities from all the other .conf files
config/payloads/libpayload-dep.conf: A .conf file for payloads that would have been generic, but they add a dependency on libpayload (tint, coreinfo).
Signed-off-by: Myles Watson mylesgw@gmail.com
Thanks, Myles