From nobody Wed Dec 25 03:04:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1510638569184663.6819247732207; Mon, 13 Nov 2017 21:49:29 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9832E20349D87; Mon, 13 Nov 2017 21:45:20 -0800 (PST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6115C202E5E66 for ; Mon, 13 Nov 2017 21:45:19 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2017 21:49:23 -0800 Received: from zwei4-mobl1.ccr.corp.intel.com ([10.239.193.162]) by orsmga001.jf.intel.com with ESMTP; 13 Nov 2017 21:49:21 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=david.wei@intel.com; receiver=edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,393,1505804400"; d="scan'208";a="4658694" From: zwei4 To: edk2-devel@lists.01.org Date: Tue, 14 Nov 2017 13:49:17 +0800 Message-Id: <20171114054917.2180-1-david.wei@intel.com> X-Mailer: git-send-email 2.14.1.windows.1 Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Benson FAB B X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add code for Benson Glacier FAB B. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: zwei4 --- .../BensonGlacier/BoardInitPostMem/BoardGpios.h | 6 +- .../BensonGlacier/BoardInitPostMem/BoardInit.c | 2 - .../BensonGlacier/BoardInitPreMem/BoardInit.c | 15 ++- .../BensonGlacier/BoardInitPreMem/PlatformId.c | 136 ++++-------------= ---- .../BensonGlacier/BoardInitPreMem/PlatformId.h | 16 +-- .../Board/LeafHill/BoardInitPostMem/BoardInit.c | 2 - .../Board/LeafHill/BoardInitPreMem/BoardInit.c | 5 +- .../MinnowBoard3/BoardInitPostMem/BoardInit.c | 2 - .../Board/MinnowBoard3/BoardInitPreMem/BoardInit.c | 6 +- Platform/BroxtonPlatformPkg/BuildBxtBios.bat | 6 +- .../Common/Tools/Stitch/IFWIStitch_Simple.bat | 12 +- 11 files changed, 55 insertions(+), 153 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostM= em/BoardGpios.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInit= PostMem/BoardGpios.h index d72cd80c9..d5accbc17 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/Boar= dGpios.h +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/Boar= dGpios.h @@ -90,10 +90,10 @@ BXT_GPIO_PAD_INIT mBenson_GpioInitData_N[] =3D BXT_GPIO_PAD_CONF(L"GPIO_24", M0 , GPO ,GPIO_D ,= NA , NA , Wake_Disabled, P_20K_H, NA , NA, NA , = NA, GPIO_PADBAR+0x00C0, NORTH),//SATA_DEVSLP0 BXT_GPIO_PAD_CONF(L"GPIO_25", M0 , GPO ,GPIO_D ,= NA , Level , Wake_Disabled, P_20K_H, Inverted, SCI, NA , = NA, GPIO_PADBAR+0x00C8, NORTH),//Feature:ODD MD/DA SCI Net in= Sch: SATA_ODD_DA_IN BXT_GPIO_PAD_CONF(L"GPIO_26", M0 , GPIO ,GPIO_D ,= NA , NA , Wake_Disabled, P_20K_L, NA , NA, NA , = NA, GPIO_PADBAR+0x00D0, NORTH),//SATA_LEDN - BXT_GPIO_PAD_CONF(L"GPIO_27", M0 , GPO , GPIO_D,= HI , NA , Wake_Disabled, P_20K_L, NA , NA, NA , = NA, GPIO_PADBAR+0x00D8, NORTH),//Feature:DFU Net in= Sch: NFC_DFU + BXT_GPIO_PAD_CONF(L"GPIO_27", M0 , GPO ,GPIO_D ,= HI , NA , Wake_Disabled, P_20K_L, NA , NA, NA , = NA, GPIO_PADBAR+0x00D8, NORTH),//Feature:DFU Net in= Sch: NFC_DFU BXT_GPIO_PAD_CONF(L"GPIO_28", M2 , NA , NA ,= NA , NA , Wake_Disabled, P_20K_L, NA , NA,IOS_Masked, = SAME, GPIO_PADBAR+0x00E0, NORTH),// Net in= Sch: ISH_GPIO10 - BXT_GPIO_PAD_CONF(L"GPIO_29", M2 , NA , NA ,= NA , NA , Wake_Disabled, P_20K_L, NA , NA,IOS_Masked, = SAME, GPIO_PADBAR+0x00E8, NORTH),// Net in= Sch: ISH_GPIO11 - BXT_GPIO_PAD_CONF(L"GPIO_30", M1 , NA , NA ,= NA , NA , Wake_Disabled, P_20K_L, NA , NA,IOS_Masked, = SAME, GPIO_PADBAR+0x00F0, NORTH),// Net in= Sch: ISH_GPIO12 + BXT_GPIO_PAD_CONF(L"GPIO_29", M0 , GPO ,GPIO_D ,= NA , NA , Wake_Disabled, P_20K_L, NA , NA, NA , = NA, GPIO_PADBAR+0x00E8, NORTH),// SOC_M2_RST = Net in Sch: ISH_GPIO11 + //BXT_GPIO_PAD_CONF(L"GPIO_30", M1 , NA , NA = , NA , NA , Wake_Disabled, P_20K_L, NA , NA,IOS_Masked= , SAME, GPIO_PADBAR+0x00F0, NORTH),// FAB ID = Net in Sch: ISH_GPIO12 BXT_GPIO_PAD_CONF(L"GPIO_31", M5 , NA , NA ,= NA , NA , Wake_Disabled, P_20K_L, NA , NA,IOS_Masked, = SAME, GPIO_PADBAR+0x00F8, NORTH),//Feature: SUSCLK1 BXT_GPIO_PAD_CONF(L"GPIO_32", M5 , NA , NA ,= NA , NA , Wake_Disabled, P_20K_L, NA , NA,IOS_Masked, = SAME, GPIO_PADBAR+0x0100, NORTH),// Net in= Sch: SUSCLK2 BXT_GPIO_PAD_CONF(L"GPIO_33", M5 , NA , NA ,= NA , NA , Wake_Disabled, P_20K_L, NA , NA,IOS_Masked, = SAME, GPIO_PADBAR+0x0108, NORTH),//Feature: SUSCLK3 diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostM= em/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitP= ostMem/BoardInit.c index ab11aaafd..07246c155 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/Boar= dInit.c +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/Boar= dInit.c @@ -59,7 +59,6 @@ BensonGlacierPostMemInitCallback ( &Instance ); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "Benson Glacier Post Mem Init callback: Skip\n")); return EFI_SUCCESS; } =20 @@ -67,7 +66,6 @@ BensonGlacierPostMemInitCallback ( FabId =3D (UINT8) PcdGet8 (PcdFabId); DEBUG ((EFI_D_INFO, "PostMemInit: BoardId =3D=3D 0x%X, FabId =3D=3D 0x%= X\n", BoardId, FabId)); if (BoardId !=3D (UINT8) BOARD_ID_BENSON) { - DEBUG ((EFI_D_INFO, "Benson Glacier Post Mem Init callback: Skip\n")); return EFI_SUCCESS; } =20 diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMe= m/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPr= eMem/BoardInit.c index 24cfaf3a7..6c75f7594 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Board= Init.c +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Board= Init.c @@ -59,22 +59,27 @@ BensonGlacierPreMemInit ( &Instance ); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "Benson Glacier Pre Mem Init: Skip\n")); return EFI_SUCCESS; } =20 - DEBUG ((EFI_D_INFO, "Benson Glacier Pre Mem Init\n")); - // // Pre Mem Board Init // - Status =3D BensonGetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId); + Status =3D BensonGetBoardId (PeiServices, &BoardId); =20 if (BoardId !=3D (UINT8) BOARD_ID_BENSON) { - DEBUG ((EFI_D_INFO, "Not a Benson Glacier - skip\n")); return EFI_SUCCESS; } =20 + DEBUG ((EFI_D_INFO, "This is Benson Glacier board.\n")); + =20 + Status =3D BensonGetFabId (PeiServices, &FabId); + if (FabId =3D=3D 1) { + DEBUG ((EFI_D_INFO, "This is Benson Glacier FAB B.\n")); + } else if (FabId =3D=3D 0) { + DEBUG ((EFI_D_INFO, "This is Benson Glacier FAB A.\n")); + } + =20 PcdSet8 (PcdBoardId, BoardId); PcdSet8 (PcdFabId, FabId); =20 diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMe= m/PlatformId.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitP= reMem/PlatformId.c index e164cfda7..70369248d 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Platf= ormId.c +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Platf= ormId.c @@ -22,17 +22,16 @@ =20 EFI_STATUS EFIAPI -BensonGetEmbeddedBoardIdFabId( +BensonGetBoardId( IN CONST EFI_PEI_SERVICES **PeiServices, - OUT UINT8 *BoardId, - OUT UINT8 *FabId + OUT UINT8 *BoardId ) { BXT_CONF_PAD0 padConfg0; BXT_CONF_PAD1 padConfg1; - IN UINT32 CommAndOffset; + UINT32 CommAndOffset; =20 - DEBUG ((DEBUG_INFO, "GetEmbeddedBoardIdFabId++\n")); + DEBUG ((DEBUG_INFO, "GetBoardId.\n")); =20 // // Board_ID0: PMIC_STDBY @@ -91,136 +90,43 @@ BensonGetEmbeddedBoardIdFabId( =20 DEBUG ((DEBUG_INFO, "BoardId: %02X\n", *BoardId)); =20 - // - // Fab_ID0: PMIC_I2C_SDA - // - CommAndOffset =3D GetCommOffset (NORTHWEST, 0x0108); - padConfg0.padCnf0 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OF= FSET); - padConfg0.r.PMode =3D 0; - padConfg0.r.GPIORxTxDis =3D 0x1; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCn= f0); - // - // Set to Pull Up 20K - // - padConfg1.r.Term =3D 0xC; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCn= f1); - // - // Fab_ID1: PMIC_I2C_SCL - // - CommAndOffset =3D GetCommOffset (NORTHWEST, 0x0100); - padConfg0.padCnf0 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OF= FSET); - padConfg0.r.PMode =3D 0; - padConfg0.r.GPIORxTxDis =3D 0x1; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCn= f0); - //Set to Pull Up 20K - padConfg1.r.Term =3D 0xC; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCn= f1); - // - // Fab_ID2: PMIC_BCUDISW2 - // - CommAndOffset =3D GetCommOffset (NORTHWEST, 0x00D8); - padConfg0.padCnf0 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OF= FSET); - padConfg0.r.PMode =3D 0; - padConfg0.r.GPIORxTxDis =3D 0x1; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCn= f0); - // - // Set to Pull Up 20K - // - padConfg1.r.Term =3D 0xC; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCn= f1); - // - // Fab_ID3: PMIC_BCUDISCRIT - // - CommAndOffset =3D GetCommOffset (NORTHWEST, 0x00E0); - padConfg0.padCnf0 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OF= FSET); - padConfg0.r.PMode =3D 0; - padConfg0.r.GPIORxTxDis =3D 0x1; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCn= f0); - // - // Set to Pull Up 20K - // - padConfg1.r.Term =3D 0xC; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCn= f1); - - *FabId =3D (UINT8) (((GpioPadRead (GetCommOffset (NORTHWEST, 0x0108) + B= XT_GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) | \ - (((GpioPadRead (GetCommOffset (NORTHWEST, 0x0100) + BXT= _GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 1) | \ - (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00D8) + BXT= _GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \ - (((GpioPadRead (GetCommOffset (NORTHWEST, 0x00E0) + BXT= _GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3)); - - DEBUG ((EFI_D_INFO, "FabId: %02X\n", *FabId)); - - return EFI_SUCCESS; } =20 - EFI_STATUS EFIAPI -BensonGetIVIBoardIdFabId ( +BensonGetFabId( IN CONST EFI_PEI_SERVICES **PeiServices, - OUT UINT8 *BoardId, OUT UINT8 *FabId ) { BXT_CONF_PAD0 padConfg0; BXT_CONF_PAD1 padConfg1; - IN UINT32 CommAndOffset; + UINT32 CommAndOffset; + + DEBUG ((DEBUG_INFO, "Benson GetFabId++\n")); =20 - DEBUG ((DEBUG_INFO, "GetIVIBoardIdFabId++\n")); =20 // - // Board_ID0: GPIO_62 - // - CommAndOffset =3D GetCommOffset (NORTH, 0x0190); - padConfg0.padCnf0 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OF= FSET); - padConfg0.r.PMode =3D 0; - padConfg0.r.GPIORxTxDis =3D 0x1; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCn= f0); - padConfg1.padCnf1 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF1_OF= FSET); - padConfg1.r.IOSTerm =3D 0x3; //Enable Pullup - padConfg1.r.Term =3D 0xC; //20k wpu - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCn= f1); - // - // Board_ID1: GPIO_63 - // - CommAndOffset =3D GetCommOffset (NORTH, 0x0198); - padConfg0.padCnf0 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OF= FSET); - padConfg0.r.PMode =3D 0; - padConfg0.r.GPIORxTxDis =3D 0x1; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCn= f0); - padConfg1.padCnf1 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF1_OF= FSET); - padConfg1.r.IOSTerm =3D 0x3; //Enable Pullup - padConfg1.r.Term =3D 0xC; //20k wpu - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCn= f1); - // - // Board_ID2: GPIO_64 + // FAB_ID: GPIO_30 // - CommAndOffset =3D GetCommOffset (NORTH, 0x01A0); + + CommAndOffset =3D GetCommOffset (NORTH, 0x0F0); padConfg0.padCnf0 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OF= FSET); - padConfg0.r.PMode =3D 0; - padConfg0.r.GPIORxTxDis =3D 0x1; - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCn= f0); padConfg1.padCnf1 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF1_OF= FSET); - padConfg1.r.IOSTerm =3D 0x3; //Enable Pullup - padConfg1.r.Term =3D 0xC; //20k wpu - GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCn= f1); - // - // Board_ID3: GPIO_65 - // - CommAndOffset =3D GetCommOffset (NORTH, 0x01A8); - padConfg0.padCnf0 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF0_OF= FSET); - padConfg0.r.PMode =3D 0; - padConfg0.r.GPIORxTxDis =3D 0x1; + + padConfg0.r.PMode =3D M0; // Set to GPIO mode + padConfg0.r.GPIORxTxDis =3D GPI; // Set to GPI GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF0_OFFSET, padConfg0.padCn= f0); - padConfg1.padCnf1 =3D GpioPadRead (CommAndOffset + BXT_GPIO_PAD_CONF1_OF= FSET); - padConfg1.r.IOSTerm =3D 0x3; //Enable Pullup - padConfg1.r.Term =3D 0xC; //20k wpu + + padConfg1.r.IOSTerm =3D EnPd; // Enable pull-down + padConfg1.r.Term =3D P_20K_L; // Set to 20K pull-down =20 GpioPadWrite (CommAndOffset + BXT_GPIO_PAD_CONF1_OFFSET, padConfg1.padCn= f1); =20 - *BoardId =3D (UINT8) (((GpioPadRead (GetCommOffset (NORTH, 0x0190) + BXT= _GPIO_PAD_CONF0_OFFSET) & BIT1) >> 1) | \ - (((GpioPadRead (GetCommOffset (NORTH, 0x0198) + BXT_G= PIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 1) | \ - (((GpioPadRead (GetCommOffset (NORTH, 0x01A0) + BXT_G= PIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 2) | \ - (((GpioPadRead (GetCommOffset (NORTH, 0x01A8) + BXT_G= PIO_PAD_CONF0_OFFSET) & BIT1) >> 1) << 3)); + + *FabId =3D (UINT8) (((GpioPadRead (GetCommOffset (NORTH, 0x0F0) + BXT_GP= IO_PAD_CONF0_OFFSET) & BIT1) >> 1)); + + DEBUG ((EFI_D_INFO, "FabId: %02X\n", *FabId)); =20 return EFI_SUCCESS; } diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMe= m/PlatformId.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitP= reMem/PlatformId.h index 7fc0cc3f9..c0b0f3610 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Platf= ormId.h +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Platf= ormId.h @@ -34,25 +34,15 @@ BensonGetFwCfgId ( =20 EFI_STATUS EFIAPI -BensonGetBoardIdFabId ( +BensonGetBoardId ( IN CONST EFI_PEI_SERVICES **PeiServices, - OUT UINT8 *BoardId, - OUT UINT8 *FabId - ); - -EFI_STATUS -EFIAPI -BensonGetEmbeddedBoardIdFabId ( - IN CONST EFI_PEI_SERVICES **PeiServices, - OUT UINT8 *BoardId, - OUT UINT8 *FabId + OUT UINT8 *BoardId ); =20 EFI_STATUS EFIAPI -BensonGetIVIBoardIdFabId ( +BensonGetFabId ( IN CONST EFI_PEI_SERVICES **PeiServices, - OUT UINT8 *BoardId, OUT UINT8 *FabId ); =20 diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/Bo= ardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/Boa= rdInit.c index 7221f84a3..8051b0021 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit= .c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit= .c @@ -67,7 +67,6 @@ LeafHillPostMemInitCallback ( &Instance ); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "Leaf Hill Post Mem Init callback: Skip\n")); return EFI_SUCCESS; } =20 @@ -75,7 +74,6 @@ LeafHillPostMemInitCallback ( FabId =3D (UINT8) PcdGet8 (PcdFabId); DEBUG ((EFI_D_INFO, "PostMemInit: BoardId =3D=3D 0x%X, FabId =3D=3D 0x%= X\n", BoardId, FabId)); if (BoardId !=3D (UINT8) BOARD_ID_LFH_CRB) { - DEBUG ((EFI_D_INFO, "LeafHill Post Mem Init callback: Skip\n")); return EFI_SUCCESS; } =20 diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/Boa= rdInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/Board= Init.c index aa22e5622..b0be91dd2 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPreMem/BoardInit.c @@ -68,20 +68,19 @@ LeafHillPreMemInit ( &Instance ); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "LeafHill PreMem Init: Skip\n")); return EFI_SUCCESS; } - DEBUG ((EFI_D_INFO, "LeafHill Pre Mem Init\n")); =20 // // Pre Mem Board Init // Status =3D LeafHillGetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabI= d); if (BoardId !=3D (UINT8) BOARD_ID_LFH_CRB) { - DEBUG ((EFI_D_INFO, "Not a Leaf Hill Board - skip\n")); return EFI_SUCCESS; } =20 + DEBUG ((EFI_D_INFO, "This is LeafHill CRB.\n")); + PcdSet8 (PcdBoardId, BoardId); PcdSet8 (PcdFabId, FabId); =20 diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMe= m/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPos= tMem/BoardInit.c index f329b5f2b..6ee7e3d3f 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/Board= Init.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/Board= Init.c @@ -67,7 +67,6 @@ MinnowBoard3PostMemInitCallback ( &Instance ); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "Minnow Board 3 Post Mem Init callback: Skip\n")); return EFI_SUCCESS; } =20 @@ -75,7 +74,6 @@ MinnowBoard3PostMemInitCallback ( FabId =3D (UINT8) PcdGet8 (PcdFabId); DEBUG ((EFI_D_INFO, "PostMemInit: BoardId =3D=3D 0x%X, FabId =3D=3D 0x%= X\n", BoardId, FabId)); if (BoardId !=3D (UINT8) BOARD_ID_MINNOW) { - DEBUG ((EFI_D_INFO, "Minnow Board 3 Post Mem Init callback: Skip\n")); return EFI_SUCCESS; } =20 diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem= /BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreM= em/BoardInit.c index 720d11add..c07d4c044 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardI= nit.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPreMem/BoardI= nit.c @@ -68,22 +68,20 @@ MinnowBoard3PreMemInit ( &Instance ); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "Minnow Board 3 Pre Mem Init: Skip\n")); return EFI_SUCCESS; } =20 - DEBUG ((EFI_D_INFO, "Minnow Board 3 Pre Mem Init\n")); - // // Pre Mem Board Init // Status =3D Minnow3GetEmbeddedBoardIdFabId (PeiServices, &BoardId, &FabId= ); =20 if (BoardId !=3D (UINT8) BOARD_ID_MINNOW) { - DEBUG ((EFI_D_INFO, "Not a Minnow Board - skip\n")); return EFI_SUCCESS; } =20 + DEBUG ((EFI_D_INFO, "This is MinnowBoard 3.\n")); + PcdSet8 (PcdBoardId, BoardId); PcdSet8 (PcdFabId, FabId); =20 diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat b/Platform/Broxto= nPlatformPkg/BuildBxtBios.bat index 7804dc58f..e08f5d10b 100644 --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat @@ -255,7 +255,11 @@ if /i "%~2" =3D=3D "RELEASE" ( ) =20 if %BoardId%=3D=3DBG ( - echo BOARD_REV =3D A >> Conf\BiosId.env + if %FabId%=3D=3DB ( + echo BOARD_REV =3D B >> Conf\BiosId.env + ) else ( + echo BOARD_REV =3D A >> Conf\BiosId.env + ) ) =20 if %BoardId%=3D=3DMN ( diff --git a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Sim= ple.bat b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple= .bat index 679b0eec1..42375ce87 100644 --- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat +++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat @@ -132,9 +132,15 @@ copy /y /b %BIOS_Names%\OBB.Fv .\BIOS_COMPONENTS copy /y /b %BIOS_Names%\NvStorage.Fv .\BIOS_COMPONENTS =20 if %BoardId%=3D=3DBG ( - copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk1.bin . - copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk2.bin . - copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk3.bin . + if %FabId%=3D=3DB ( + copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_B\SpiChunk1.bin . + copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_B\SpiChunk2.bin . + copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_B\SpiChunk3.bin . + ) else ( + copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk1.bin . + copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk2.bin . + copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk3.bin . =20 + ) =20 copy /y /b SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB= .Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+S= piChunk3.bin spi_out.bin ) else if %BoardId%=3D=3DMN ( if %FabId%=3D=3DB ( --=20 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel