From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::244; helo=mail-wm0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EBA9621A10963 for ; Thu, 30 Nov 2017 01:03:05 -0800 (PST) Received: by mail-wm0-x244.google.com with SMTP id i11so10912703wmf.4 for ; Thu, 30 Nov 2017 01:07:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=gWv1Fihso2IonTaQssc6uvPiJn9NnDIhuE0+weMn1So=; b=giA1Lxz36QEwwMoOq3Z7FdYZZFJE/1RWLSrJnJVH3QP+9lgu6cyU9qagnZZp/WHmTw HLVjo2gp4VnhpKCYlYN7ktQJCDSpdOwqdJBnuWqIzb3TWuzpUEMzEzbF9I+An3ip9LKr Bl/teMenv9KRAcU1t9P/fjfBrTGSjXwsv/8vQ= 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; bh=gWv1Fihso2IonTaQssc6uvPiJn9NnDIhuE0+weMn1So=; b=sTOANN2UtY5hJCfN6Aer5YnHS7QlOH/AATsatlQ6iBlGI/dbmJWndb9OqBxcIMXfVG oZM9IajH4ny/dLT/PM1TfFMDFnjy3BxFfxr09Yntfuhz/4wuj/glO3pbXFuZgZtDXcGI gVu9s2tTJCDl3wnHooXPSSgRCj+4Jx1PMXiM5xmcXZce40mEUEWosprsQKW2pGZlkxTG C8CGDmrVNwR3UbMR7+6gogEFRrxkeWDwrpREGzB2BlJg1qzq64cKl1+vIVOQKuF7dvpi G7XdnNZ7IzjC89gfmIEm6bl/MCzOcJRfeqP9HGb4BLAnJp80c1qt07Ud4keetfk7tssO ed7Q== X-Gm-Message-State: AJaThX6nNBMC2Sz5mI5T66+XqzFx7zEbDS1BwBKwegCmbsdT3m/LrQ5/ bGHYtz+8rl+HSj3pV593pkMJfbMzaZQ= X-Google-Smtp-Source: AGs4zMah1KqTOHOw5xSpNrGgzn7jCasn5IEFQglZwQNAwXrInM6mlN17W5SqDoFdRaDe42hZGIzn5w== X-Received: by 10.28.214.70 with SMTP id n67mr593711wmg.83.1512032848938; Thu, 30 Nov 2017 01:07:28 -0800 (PST) Received: from localhost.localdomain ([105.150.171.234]) by smtp.gmail.com with ESMTPSA id i65sm12991581wme.20.2017.11.30.01.07.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 01:07:28 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, joakim.bech@linaro.org, Ard Biesheuvel Date: Thu, 30 Nov 2017 09:07:21 +0000 Message-Id: <20171130090721.32065-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [PATCH edk2-platforms] Platform/ARM: move to new TFTP Shell command implementation 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: , X-List-Received-Date: Thu, 30 Nov 2017 09:03:06 -0000 Upstream EDK2 has refactored the implementation of the TFTP Shell command so update the ARM platforms accordingly. Instead of having to add the new module to all .FDF files under Platform/ARM, add it to the 'networking FDF' include file and include that everywhere. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/ARM/JunoPkg/ArmJuno.fdf | 13 ++----------- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 13 ++----------- Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 5 +++++ Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 2 +- 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf index 52586135b525..72771b1170b0 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.fdf +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf @@ -183,17 +183,8 @@ [FV.FvMain] # # Networking stack # - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc + INF EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf !if 0 INF OptionRomPkg/MarvellYukonDxe/MarvellYukonDxe.inf diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf index 46e4b9ac6758..3c75a51570b8 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf @@ -148,17 +148,8 @@ [FV.FvMain] # # Networking stack # - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc + INF EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf # diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc index 57af0f70eee8..b0107f2bbabd 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc @@ -25,3 +25,8 @@ INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf + + # + # TFTP Shell command + # + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index d4c38747b33f..3f6aa31ec434 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -477,11 +477,11 @@ [Components.common] NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf } + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf [Components.ARM] -- 2.11.0