From patchwork Sun May 22 08:45:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 624917 X-Patchwork-Delegate: bmeng.cn@gmail.com 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 3rCFbc2f2xz9t3p for ; Sun, 22 May 2016 18:44:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=otEDPlQH; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1119EA75D6; Sun, 22 May 2016 10:44:17 +0200 (CEST) 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 PFnlBRRoigCg; Sun, 22 May 2016 10:44:16 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2082FA75CC; Sun, 22 May 2016 10:43:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2E8B0A750E for ; Sun, 22 May 2016 10:42:32 +0200 (CEST) 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 STfn-g0hQ8W8 for ; Sun, 22 May 2016 10:42:32 +0200 (CEST) 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-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by theia.denx.de (Postfix) with ESMTPS id E20F4A7498 for ; Sun, 22 May 2016 10:42:18 +0200 (CEST) Received: by mail-pf0-f196.google.com with SMTP id 145so15772279pfz.1 for ; Sun, 22 May 2016 01:42:18 -0700 (PDT) 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=uqi37d5GJn1HGeeZ0kjdRw+9LqkyMw5VFyREXAmeQpQ=; b=otEDPlQHrFa213/Q6W4AgF+/nJ8BKrhWltdOw9TsEPfansw90u3RsdpgiAgYQeB1zk AM512lsre6/9m5GjhpmGzQUOa3TBsqntYODeJBw/t+eRt5B1T1iDoXdiHYturWCiMM5Z UPXpxrSsZCEbUN3x+vLC76xSEBZ5hJDIiQ0Fp1vl5doNQQs2r0zo/tsiaG+RIQe5wblj hWeNnLhFRvKExUocTNkvb+7bEZVTsYaJhDaFngiVnTKiDa2I/KTdcEMV3UQe2nyCepea G4UH245PMFIlDdxEH+zlR0/tY0hRCCQ6+oINPSUfnaY6ZxLB+VYYLSpnQA8qx/OB0/Mt 91jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=uqi37d5GJn1HGeeZ0kjdRw+9LqkyMw5VFyREXAmeQpQ=; b=EUHQb5RLXApptb5kqD/jVNx+Fdan+nhe497uwwCO4lzWUWBHeNZacmqz92k8MHpewN XFXbaqi7zrs1vq5cGyRHuox3gg4Mvqz9xS5W+O0akDiXdIeEa6rniF4hGMatUQCyIvez a5uB5Mv5DYr0sZnjaH4DE0cdNtBM4DOKZrVuaFf10TclBfq/cCXSzqOD5BP3R8t9gAG9 XPUfxriktg05LinZCOzh9D5XN4LSF4Vh1hsIYYM6mtGbhQOcExofIOe5hKc9MeO4KcvB tawyS5FY3Gpar1D0P9n3QNvh3+yuxTxZ0eI2VOtwDHYWMHQ0L+A3CN1BiH4mQHxEatq6 zb4Q== X-Gm-Message-State: AOPr4FWSXYFexALphzaLGeR5nUR9qor1Zmaya0fRta4sXIruRsBMQsgLVJnbj9Hm+7MwxQ== X-Received: by 10.98.70.144 with SMTP id o16mr18427007pfi.26.1463906537237; Sun, 22 May 2016 01:42:17 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-157-139.windriver.com. [147.11.157.139]) by smtp.gmail.com with ESMTPSA id z63sm38430143pfb.47.2016.05.22.01.42.16 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 May 2016 01:42:16 -0700 (PDT) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Sun, 22 May 2016 01:45:38 -0700 Message-Id: <1463906739-934-15-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1463906739-934-1-git-send-email-bmeng.cn@gmail.com> References: <1463906739-934-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH 14/15] x86: Switch to use SMBIOS Kconfig options when writing SMBIOS tables X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Make use of the newly added Kconfig options of board manufacturer and product name to write SMBIOS tables. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/lib/smbios.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/lib/smbios.c b/arch/x86/lib/smbios.c index 441fca9..9f30550 100644 --- a/arch/x86/lib/smbios.c +++ b/arch/x86/lib/smbios.c @@ -105,8 +105,8 @@ static int smbios_write_type1(u32 *current, int handle) memset(t, 0, sizeof(struct smbios_type1)); fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle); - t->manufacturer = smbios_add_string(t->eos, CONFIG_SYS_VENDOR); - t->product_name = smbios_add_string(t->eos, CONFIG_SYS_BOARD); + t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER); + t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME); len = t->length + smbios_string_table_len(t->eos); *current += len; @@ -121,8 +121,8 @@ static int smbios_write_type2(u32 *current, int handle) memset(t, 0, sizeof(struct smbios_type2)); fill_smbios_header(t, SMBIOS_BOARD_INFORMATION, len, handle); - t->manufacturer = smbios_add_string(t->eos, CONFIG_SYS_VENDOR); - t->product_name = smbios_add_string(t->eos, CONFIG_SYS_BOARD); + t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER); + t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME); t->feature_flags = SMBIOS_BOARD_FEATURE_HOSTING; t->board_type = SMBIOS_BOARD_MOTHERBOARD; @@ -139,7 +139,7 @@ static int smbios_write_type3(u32 *current, int handle) memset(t, 0, sizeof(struct smbios_type3)); fill_smbios_header(t, SMBIOS_SYSTEM_ENCLOSURE, len, handle); - t->manufacturer = smbios_add_string(t->eos, CONFIG_SYS_VENDOR); + t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER); t->chassis_type = SMBIOS_ENCLOSURE_DESKTOP; t->bootup_state = SMBIOS_STATE_SAFE; t->power_supply_state = SMBIOS_STATE_SAFE;