From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=Yxa95Ifo; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by groups.io with SMTP; Wed, 24 Apr 2019 06:29:57 -0700 Received: by mail-wm1-f66.google.com with SMTP id v14so5090454wmf.2 for ; Wed, 24 Apr 2019 06:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FexLuCwTXV3bvqB+ODZe+D2eiopwALXiuuuX1KQ5qHE=; b=Yxa95IfoP59R6gSHKUZybc7RjtjzEQlCdTnWf5PJFRWDRDwSQr7Keitsy0Y0c/a21j QBQH+YGSrAmfki5sjBCCIHc1nSjspVZtW8CtcPOY8Yr/SCqtTNWmzIvx7BYjMinAvpnT FiBnn7KFnvIUonJd7x2sH+Xv7lJa+J0J6WOKYrH63F/GCeVWc34Ii/GXwgnv7XfQfoo/ zKUwYLSbNwz9z+VfrIMUsVhkY+Sl//NyWyj4/Sq6u9fBB8yUm+FUU9Yx60FRTq+JjCco Qj0rpQXi5TI61isGYT1/JmlzBmj0uywQaEpJCtXwPy58tWQrV5pSBiuKSMdXVPBaOm7N Zhvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FexLuCwTXV3bvqB+ODZe+D2eiopwALXiuuuX1KQ5qHE=; b=GvTOAmt7jSac11V01HB2kdl4MfDaEl9EYg4ps4GQeHJNipLdwdkqLEgzqZIBiWsyiB qPzvgXFa1If4pIshMI014QDdk1T7HCXY7zvUlpbjirZPD16hH3j6WDXldtRc1u3cxQZR OL5+9Sj2EDvpqpl4WJQNRxdYDBUg2MRdFPTDivS4lafNP9R9XcE2ORHKiQ2yb0bbGQD3 d5igRsVB48di8KYg0sS1S8dY8FuQ7hTgG0VpNcZ3qofAZVLHzTS+jcshTToY6ONGe49M WUeCP190SBepjtEM8vwQNyw9qQYeq+ubG8KbHHEgklPNSg9rcMt6dYdetcULJssn1fRs Woog== X-Gm-Message-State: APjAAAWtQ5SsQEl527Ijn9L5h+KLXKKgtPGJ1aGjcK0nwliYZcDQwclw TcpO2EOlY9m15oC3vFzmqeQ80TEWSDVEgw== X-Google-Smtp-Source: APXvYqxmSbrlN9ASSFd8ZhVffBPGSPAmpwn46F7BAZjxqKILxo9yLYYpzl0P3RjiuOV38EkSZ4kk2g== X-Received: by 2002:a1c:6587:: with SMTP id z129mr6394495wmb.84.1556112595256; Wed, 24 Apr 2019 06:29:55 -0700 (PDT) Return-Path: Received: from localhost.localdomain (91-167-84-221.subs.proxad.net. [91.167.84.221]) by smtp.gmail.com with ESMTPSA id s189sm36374996wmf.45.2019.04.24.06.29.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 06:29:54 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [PATCH edk2-platforms] Silicon/AMD/Styx: remove the non-capsule based flasher tool Date: Wed, 24 Apr 2019 15:29:52 +0200 Message-Id: <20190424132952.8883-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit We have had capsule support enabled on this platform for a while now, so let's drop the hacked up flasher tool that we no longer have a need for. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 8 -- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 8 -- Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 8 -- Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.inf | 53 ----------- Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.c | 96 -------------------- Silicon/AMD/Styx/Applications/StyxFlashUefi/Scripts/GccBase.lds | 86 ------------------ Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashImage.S | 25 ----- 7 files changed, 284 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 0e1db0745d89..616553172bf0 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -18,7 +18,6 @@ [Defines] DEFINE NUM_CORES = 8 -DEFINE DO_FLASHER = FALSE DEFINE X64EMU_ENABLE = FALSE PLATFORM_NAME = Overdrive @@ -747,13 +746,6 @@ DEFINE X64EMU_ENABLE = FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } -!if $(DO_FLASHER) == TRUE - Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.inf { - - ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf - } -!endif - # # Firmware update # diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index 56a31a97a4ec..c26d38226cd2 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -18,7 +18,6 @@ [Defines] DEFINE NUM_CORES = 4 -DEFINE DO_FLASHER = FALSE PLATFORM_NAME = Cello PLATFORM_GUID = 77861b3e-74b0-4ff3-8d18-c5ba5803e1bf @@ -676,10 +675,3 @@ DEFINE DO_FLASHER = FALSE !ifdef $(RENESAS_XHCI_FW_DIR) OpenPlatformPkg/Drivers/Xhci/RenesasFirmwarePD720202/RenesasFirmwarePD720202.inf !endif - -!if $(DO_FLASHER) == TRUE - Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.inf { - - ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf - } -!endif diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc index 6ae0f2620c38..4fbc4201cf6b 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc @@ -18,7 +18,6 @@ [Defines] DEFINE NUM_CORES = 4 -DEFINE DO_FLASHER = FALSE PLATFORM_NAME = Overdrive1000 PLATFORM_GUID = 36774DD7-20DE-4C5B-8722-f8861DFF1F16 @@ -668,10 +667,3 @@ DEFINE DO_FLASHER = FALSE gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } - -!if $(DO_FLASHER) == TRUE - Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.inf { - - ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf - } -!endif diff --git a/Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.inf b/Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.inf deleted file mode 100644 index 0c289dcf95f4..000000000000 --- a/Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.inf +++ /dev/null @@ -1,53 +0,0 @@ -#/** @file -# -# Copyright (c) 2017, Linaro Ltd. All rights reserved.
-# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -#**/ - -[Defines] - INF_VERSION = 0x00010019 - BASE_NAME = StyxFlashUefi - FILE_GUID = 07b65d9d-b1a2-416e-bd04-0b61b775f924 - MODULE_TYPE = UEFI_APPLICATION - VERSION_STRING = 0.1 - ENTRY_POINT = ShellCEntryLib - -# -# VALID_ARCHITECTURES = AARCH64 -# - -[Sources] - StyxFlashImage.S - StyxFlashUefi.c - -[Packages] - ArmPkg/ArmPkg.dec - MdePkg/MdePkg.dec - ShellPkg/ShellPkg.dec - Silicon/AMD/Styx/AmdModulePkg/AmdModulePkg.dec - -[LibraryClasses] - BaseMemoryLib - ShellCEntryLib - UefiBootServicesTableLib - UefiLib - -[Protocols] - gAmdIscpDxeProtocolGuid - -[FixedPcd] - gArmTokenSpaceGuid.PcdFdBaseAddress - gArmTokenSpaceGuid.PcdFvBaseAddress - -[BuildOptions] - *_*_*_CC_FLAGS = -mcmodel=small - *_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -Wl,-T,$(MODULE_DIR)/Scripts/GccBase.lds - *_*_*_PLATFORM_FLAGS = -I$(BIN_DIR)/../FV diff --git a/Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.c b/Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.c deleted file mode 100644 index 8f181bc2a54d..000000000000 --- a/Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashUefi.c +++ /dev/null @@ -1,96 +0,0 @@ -/** @file - - Copyright (c) 2017, Linaro Ltd. All rights reserved.
- - This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include -#include -#include -#include -#include - -#include - -#define UEFI_IMAGE_OFFSET FixedPcdGet64 (PcdFvBaseAddress) - FixedPcdGet64 (PcdFdBaseAddress) -#define BLOCK_SIZE SIZE_64KB - -STATIC AMD_ISCP_DXE_PROTOCOL *mIscpDxeProtocol; -STATIC UINT8 Buffer[BLOCK_SIZE]; - -extern CONST UINT8 StyxFlashImageStart[]; -extern CONST UINT32 StyxFlashImageSize; - -/*** - Main entrypoint - - Establishes the main structure of the application. - - @retval 0 The application exited normally. - @retval Other An error occurred. -***/ -INTN -EFIAPI -ShellAppMain ( - IN UINTN Argc, - IN CHAR16 **Argv - ) -{ - EFI_STATUS Status; - UINTN Index; - INTN Remaining; - - Print (L"StyxFlashUefi: firmware updater for AMD Seattle based boards.\n"); - - Status = gBS->LocateProtocol (&gAmdIscpDxeProtocolGuid, NULL, - (VOID **)&mIscpDxeProtocol); - if (EFI_ERROR (Status)) { - Print (L"Failed to locate ISCP communication protocol, terminating...\n"); - return (INTN)Status; - } - - Index = 0; - Remaining = StyxFlashImageSize; - do { - Status = mIscpDxeProtocol->AmdExecuteEraseFvBlockDxe ( - mIscpDxeProtocol, - UEFI_IMAGE_OFFSET + Index * BLOCK_SIZE, - BLOCK_SIZE); - if (EFI_ERROR (Status)) { - Print (L"Erase failed!\n"); - return (INTN)Status; - } - - CopyMem (Buffer, StyxFlashImageStart + Index * BLOCK_SIZE, - MIN (Remaining, BLOCK_SIZE)); - - Status = mIscpDxeProtocol->AmdExecuteUpdateFvBlockDxe ( - mIscpDxeProtocol, - UEFI_IMAGE_OFFSET + Index * BLOCK_SIZE, - Buffer, - MIN (Remaining, BLOCK_SIZE)); - - if (EFI_ERROR (Status)) { - Print (L"Update failed!\n"); - return (INTN)Status; - } - - Remaining -= BLOCK_SIZE; - Index++; - - Print (L"Block %d of %d updated\n", Index, StyxFlashImageSize / BLOCK_SIZE); - - } while (Remaining > 0); - - Print (L"\nDone!\n"); - - return 0; -} diff --git a/Silicon/AMD/Styx/Applications/StyxFlashUefi/Scripts/GccBase.lds b/Silicon/AMD/Styx/Applications/StyxFlashUefi/Scripts/GccBase.lds deleted file mode 100644 index 7a0c87c6e32b..000000000000 --- a/Silicon/AMD/Styx/Applications/StyxFlashUefi/Scripts/GccBase.lds +++ /dev/null @@ -1,86 +0,0 @@ -/** @file - - Unified linker script for GCC based builds - - Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
- Copyright (c) 2015 - 2017, Linaro Ltd. All rights reserved.
- (C) Copyright 2016 Hewlett Packard Enterprise Development LP
- - This program and the accompanying materials are licensed and made available under - the terms and conditions of the BSD License that accompanies this distribution. - The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php. - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -SECTIONS { - - /* - * The PE/COFF binary consists of DOS and PE/COFF headers, and a sequence of - * section headers adding up to PECOFF_HEADER_SIZE bytes (which differs - * between 32-bit and 64-bit builds). The actual start of the .text section - * will be rounded up based on its actual alignment. - */ - . = PECOFF_HEADER_SIZE; - - .text : ALIGN(CONSTANT(COMMONPAGESIZE)) { - *(.text .text.* .stub .gnu.linkonce.t.*) - *(.rodata .rodata.* .gnu.linkonce.r.*) - *(.got .got.*) - - /* - * The contents of AutoGen.c files are mostly constant from the POV of the - * program, but most of it ends up in .data or .bss by default since few of - * the variable definitions that get emitted are declared as CONST. - * Unfortunately, we cannot pull it into the .text section entirely, since - * patchable PCDs are also emitted here, but we can at least move all of the - * emitted GUIDs here. - */ - *:AutoGen.obj(.data.g*Guid) - } - - /* - * The alignment of the .data section should be less than or equal to the - * alignment of the .text section. This ensures that the relative offset - * between these sections is the same in the ELF and the PE/COFF versions of - * this binary. - */ - .data ALIGN(ALIGNOF(.text)) : ALIGN(CONSTANT(COMMONPAGESIZE)) { - *(.data .data.* .gnu.linkonce.d.*) - *(.bss .bss.*) - *(.payload) - } - - .eh_frame ALIGN(CONSTANT(COMMONPAGESIZE)) : { - KEEP (*(.eh_frame)) - } - - .rela (INFO) : { - *(.rela .rela.*) - } - - .hii : ALIGN(CONSTANT(COMMONPAGESIZE)) { - KEEP (*(.hii)) - } - - /* - * Retain the GNU build id but in a non-allocatable section so GenFw - * does not copy it into the PE/COFF image. - */ - .build-id (INFO) : { *(.note.gnu.build-id) } - - /DISCARD/ : { - *(.note.GNU-stack) - *(.gnu_debuglink) - *(.interp) - *(.dynsym) - *(.dynstr) - *(.dynamic) - *(.hash .gnu.hash) - *(.comment) - *(COMMON) - } -} diff --git a/Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashImage.S b/Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashImage.S deleted file mode 100644 index 041339ee9b47..000000000000 --- a/Silicon/AMD/Styx/Applications/StyxFlashUefi/StyxFlashImage.S +++ /dev/null @@ -1,25 +0,0 @@ -/** @file - - Copyright (c) 2017, Linaro Ltd. All rights reserved.
- - This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - - .section ".payload" - .align 12 - -ASM_GLOBAL ASM_PFX(StyxFlashImageStart) -ASM_PFX(StyxFlashImageStart): - .incbin "STYX_EFI.Fv" - - .align 2 -ASM_GLOBAL ASM_PFX(StyxFlashImageSize) -ASM_PFX(StyxFlashImageSize): - .long . - ASM_PFX(StyxFlashImageStart) -- 2.20.1