Add in Makefile: use "make" for default build; use "make linaro" to build
things the Linaro way (requires ../uefi-tools to have been cloned, also).

Signed-off-by: Al Stone <ahs3@redhat.com>
Add back in PCD entries for Initrd and such.

Signed-off-by: Al Stone <ahs3@redhat.com>
Merge branch 'apm-scratch' of git+ssh://git.engineering.redhat.com/srv/git/users/astone/linaro-edk2 into apm-scratch

Conflicts:
	Makefile