From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=0SHgAzku; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.167.51, mailfrom: mw@semihalf.com) Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by groups.io with SMTP; Mon, 20 May 2019 08:28:09 -0700 Received: by mail-lf1-f51.google.com with SMTP id v18so10679083lfi.1 for ; Mon, 20 May 2019 08:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rlVlnxRJkNWEKUGFlpz7Slnv9SUrXY186eXQHHNupv8=; b=0SHgAzkuETYDurbdk65905rDHMZxdrNruubzCxTLRZ4r1i0lhSYxQrOfOh1ZkYIUr3 FRCM0gCHImJt/Q8Q9JBgQnM2z3BCsxWmry3hBLWNrhp4T706aHM7EpZ00Jp0ENMqg7+x WTL0qvvQZ2uqKzCelNEX6iwlCIrM9WukkhlP/EhrURvl9/VWfnYKyi5qyR8oIxlPLGsL OxJm7QZvuyjESYV8l3J2+HpJvg/r9Jf6g2eP55XjfYSuEXZIs21U1cWEqYxwgQe9PAmi Mt4yHSbIQifwSRHmcqXiv61wH0ZmwoTKUurusM2ZQ/1ajAwguGB35olCFOTId1jEGU1/ +iwQ== 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:in-reply-to :references; bh=rlVlnxRJkNWEKUGFlpz7Slnv9SUrXY186eXQHHNupv8=; b=WlFQonEXPpdahr21u5Nyov0wfDhCWkrYsbXLjVeWzwEeVqdzYs/Yml87kQvOt/YcNw XL8AmDR8I9wFRagBU1g9Gkas4A32N+mAlGVmOZFu6us+gOvt2uwIYhZsDXrZSOXXjOnD bNw/N3vQnwMwVNowIkKE3JgmgCq0zraKrKCfExZM1lE4/fIw/RNf14VVOe1FYUsOk0BZ DKuZrYWUqwl/+cS5i0NFMZ67ne5MS2WnMiIxJdgggKZWxLqPWfAf98VSKxTVKPrc4eWB Ws3YTMjjL5uRg6CrPDA3SWDpyv19AVzXAuCm5ThAHhmbsVi2q6hryAPDVSCYor/ZChTe n//A== X-Gm-Message-State: APjAAAXyopQwzJJXGORjKJ9wrdhCunIvaEiMRVqHbe1brKrRTK6Obogz tlC864kJJMqnOj+y4ZiwAiPut6GuveA= X-Google-Smtp-Source: APXvYqxG5ZcM4D40vVV0+9VEdyvpnQJKZ4W0TnFo866TCGTEySeCMolD3lxmMq+MAqem5WozKH1hjw== X-Received: by 2002:ac2:5621:: with SMTP id b1mr37722302lff.27.1558366087518; Mon, 20 May 2019 08:28:07 -0700 (PDT) Return-Path: Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id d5sm3906205lji.85.2019.05.20.08.28.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 May 2019 08:28:06 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com, Jici.Gao@arm.com, rebecca@bluestop.org, kettenis@jive.eu Subject: [edk2-platforms: PATCH v2 13/14] Marvell/Armada7k8k: Remove duplication in .dsc files Date: Mon, 20 May 2019 17:27:26 +0200 Message-Id: <1558366047-15994-14-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558366047-15994-1-git-send-email-mw@semihalf.com> References: <1558366047-15994-1-git-send-email-mw@semihalf.com> Mistakenly in all Marvell Armada7k8k .dsc files '[LibraryClasses.common]' section was split. Merge entries into one for each platform. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas --- Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 4 +--- Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 4 +--- Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc index 01532b4..9ceb872 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc @@ -48,9 +48,6 @@ !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc -[LibraryClasses.common] - NonDiscoverableInitLib|Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf - [Components.common] Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf @@ -59,6 +56,7 @@ [LibraryClasses.common] ArmadaBoardDescLib|Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf + NonDiscoverableInitLib|Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf ################################################################################ # diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc index c6510bb..6487321 100644 --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc @@ -48,9 +48,6 @@ !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc -[LibraryClasses.common] - NonDiscoverableInitLib|Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf - [Components.common] Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf @@ -59,6 +56,7 @@ [LibraryClasses.common] ArmadaBoardDescLib|Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf + NonDiscoverableInitLib|Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf ################################################################################ # diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc index d080136..cb41f4e 100644 --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc @@ -49,9 +49,6 @@ !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc -[LibraryClasses.common] - NonDiscoverableInitLib|Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.inf - [Components.common] Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf @@ -60,6 +57,7 @@ [LibraryClasses.common] ArmadaBoardDescLib|Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.inf + NonDiscoverableInitLib|Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.inf ################################################################################ # -- 2.7.4