commit 0f61de8d9dba4ebfc4ea4b2da7f91adc937b3875
author Simon Glass <sjg@chromium.org> Wed Dec 17 15:50:37 2014 +0800
committer Simon Glass <sjg@chromium.org> Thu Dec 18 17:26:06 2014 -0700
tree 14058b8a1549a61ffa69b06ca748a9a66cdfac24
parent b2e02d28653edac48d6def9791f2fa0ebc491498

x86: Convert microcode format to device-tree-only

To avoid having two microcode formats, adjust the build system to support
obtaining the microcode from the device tree, even in the case where it
must be made available before the device tree can be accessed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>

Makefile

diff --git a/Makefile b/Makefile
index 1560bff..bda8222 100644
--- a/Makefile
+++ b/Makefile
@@ -947,7 +947,9 @@
 rom: u-boot.rom FORCE
 
 IFDTOOL=$(objtree)/tools/ifdtool
-IFDTOOL_FLAGS  = -w $(CONFIG_SYS_TEXT_BASE):$(objtree)/u-boot-dtb.bin
+IFDTOOL_FLAGS  = -f 0:$(objtree)/u-boot.dtb
+IFDTOOL_FLAGS += -m 0x$(shell $(NM) u-boot |grep _dt_ucode_base_size |cut -d' ' -f1)
+IFDTOOL_FLAGS += -U $(CONFIG_SYS_TEXT_BASE):$(objtree)/u-boot.bin
 IFDTOOL_FLAGS += -w $(CONFIG_SYS_X86_START16):$(objtree)/u-boot-x86-16bit.bin
 
 ifneq ($(CONFIG_HAVE_INTEL_ME),)