Merge pull request #1193 from jwerner-chromium/JW_coreboot

author davidcunado-arm <david.cunado@arm.com>

Wed, 24 Jan 2018 14:31:53 +0000 (14:31 +0000)

committer GitHub <noreply@github.com>

Wed, 24 Jan 2018 14:31:53 +0000 (14:31 +0000)
author davidcunado-arm <david.cunado@arm.com>
Wed, 24 Jan 2018 14:31:53 +0000 (14:31 +0000)
committer GitHub <noreply@github.com>
Wed, 24 Jan 2018 14:31:53 +0000 (14:31 +0000)
diff --cc Makefile
Simple merge
diff --cc docs/porting-guide.rst
Simple merge
diff --cc make_helpers/defaults.mk
Simple merge
author	davidcunado-arm <david.cunado@arm.com>
	Wed, 24 Jan 2018 14:31:53 +0000 (14:31 +0000)
committer	GitHub <noreply@github.com>
	Wed, 24 Jan 2018 14:31:53 +0000 (14:31 +0000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
docs/porting-guide.rst	patch \|	diff1 \|	diff2 \|	blob \| history
make_helpers/defaults.mk	patch \|	diff1 \|	diff2 \|	blob \| history