From patchwork Wed Dec 17 07:50:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 422192 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id B69361400DE for ; Wed, 17 Dec 2014 18:51:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 462AA4B6B2; Wed, 17 Dec 2014 08:51:33 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3XgJlTaiHlCo; Wed, 17 Dec 2014 08:51:33 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C6B684B6A2; Wed, 17 Dec 2014 08:51:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E68FD4B69C for ; Wed, 17 Dec 2014 08:51:23 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cCTTD+2P51ik for ; Wed, 17 Dec 2014 08:51:23 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by theia.denx.de (Postfix) with ESMTPS id 3932C4B67C for ; Wed, 17 Dec 2014 08:51:18 +0100 (CET) Received: by mail-pd0-f182.google.com with SMTP id p10so15703110pdj.27 for ; Tue, 16 Dec 2014 23:51:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=vKuA1WxIGjtda+7An6NgPWqtfcKH40mCWg1kVy+5bfQ=; b=nLr2ZnlMOMRzTYPgPhgFq3ehZm569puyNSaLoMcesCMB0WXlCrw2hKbSlxxbK3eHfe PZ0pa93BC4RO53rWOwW9FVR5I1ano9mKQYXUfNeNB7jiZosjGgk+quV3TNuIid9X12B/ 9ETe1TBH92yDELLrH5jTMyK86+Dji/OQw1Rz/WBG2Ms347KuYtcV4vjzQNoAm95gyR1r wLPE1ATmhDgLbWJvoRo4kNZ79RsGusm6g4XobxMc3I3z/w9M8LXrbZ0dQLgX0+otsYzM k9b9PfCasdBfpLdI5svCh1oFEmFHsNbIaQG5F3HeUzTjI6SiuAWQNiILZPcU83J4qHF3 ZXhQ== X-Received: by 10.70.109.203 with SMTP id hu11mr65627545pdb.36.1418802676830; Tue, 16 Dec 2014 23:51:16 -0800 (PST) Received: from localhost ([106.120.101.38]) by mx.google.com with ESMTPSA id wg7sm3039984pac.44.2014.12.16.23.51.15 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 16 Dec 2014 23:51:16 -0800 (PST) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Wed, 17 Dec 2014 15:50:37 +0800 Message-Id: <1418802649-32647-4-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1418802649-32647-1-git-send-email-bmeng.cn@gmail.com> References: <1418802649-32647-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v4 03/15] x86: Convert microcode format to device-tree-only X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Simon Glass 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 Reviewed-by: Bin Meng Tested-by: Bin Meng --- Changes in v4: - Squash the microcode.dtsi to patch#1 in the v4 series Changes in v3: None Changes in v2: None Makefile | 4 +++- arch/x86/cpu/queensbay/tnc_car.S | 11 ++++------- arch/x86/dts/crownbay.dts | 7 +++++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index fd24cde..d4e60e8 100644 --- a/Makefile +++ b/Makefile @@ -947,7 +947,9 @@ ifneq ($(CONFIG_X86_RESET_VECTOR),) 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),) diff --git a/arch/x86/cpu/queensbay/tnc_car.S b/arch/x86/cpu/queensbay/tnc_car.S index 6834a64..2e9139e 100644 --- a/arch/x86/cpu/queensbay/tnc_car.S +++ b/arch/x86/cpu/queensbay/tnc_car.S @@ -116,12 +116,9 @@ temp_ram_init_romstack: .long temp_ram_init_ret .long temp_ram_init_params temp_ram_init_params: - .long ucode_start /* microcode base */ - .long ucode_size /* microcode size */ +_dt_ucode_base_size: + /* These next two fields are filled in by ifdtool */ + .long 0 /* microcode base */ + .long 0 /* microcode size */ .long CONFIG_SYS_MONITOR_BASE /* code region base */ .long CONFIG_SYS_MONITOR_LEN /* code region size */ - - .balign 4 -ucode_start: - .include "arch/x86/cpu/queensbay/M0220661105.inc" -ucode_size = ( . - ucode_start) diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts index 399dafb..3f43f3c 100644 --- a/arch/x86/dts/crownbay.dts +++ b/arch/x86/dts/crownbay.dts @@ -50,4 +50,11 @@ memory-map = <0xffe00000 0x00200000>; }; }; + + microcode { + update@0 { +#include "microcode/m0220661105_cv.dtsi" + }; + }; + };