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=q4sFpKHb; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.167.44, mailfrom: mw@semihalf.com) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by groups.io with SMTP; Fri, 24 May 2019 08:59:47 -0700 Received: by mail-lf1-f44.google.com with SMTP id y13so7511968lfh.9 for ; Fri, 24 May 2019 08:59:46 -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=axVn158Esx/722OkXzSZr+DOIDnhFr9ISHJbiPgSHdA=; b=q4sFpKHbNWVfGEPNBdd3RT0B2zEoit1CGuSR65XYSIsOTpsks8omLvT6P3FCwRexW/ giaUNIxYai56gPdzYpTLMXKca4iO3ahEvfCQ5ePxW7/5Z/wWa7ujZrzO2DneFei4AcQ0 FuW03whI3/7sW5jg4bo9L/LyGFSi7k1Wdr/nPcGDklW0nGynAcAdTIXPkEUUINdwXSgN lougboWShtkiywaDotMdaBl8k0bJXcIQXxwFxIq83x9ls0vKBfcF7TloM90bpZvXUK02 RLKUX4AK8AU70Uo2yj8I3peEJfGvpUsFd+yojt7LZwoBBx4iPXUimn66SNyPTdN5/Txr ZuPQ== 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=axVn158Esx/722OkXzSZr+DOIDnhFr9ISHJbiPgSHdA=; b=mp5ZWcmaMCFw44OUUn2GaEzWywmGcaeNBWRhnM46d4VlCTsyfOL5pIrIbxdonBF+Ta x+d5qZGvPkWPfz3uYZ4uMnC6Fq81DmniQ5jopeJJhQaR5w2a5FFvHszqapaWMFWpt2HX VJd04f+L+BC3AIpmjw0BN2wDVGTIfjqS1YE4NJlSwpdgHYAz3zHAGIvrgEolmlFUDw75 LVMzRyCKLhn/0XYgwf9i/04d5rAKT1JutVjEFoqO/Mpzk3sxWFBSbUgO3o9B8ZTWKt+D O7bUyF03QEWD8ZlYjDDWzN74fzaBIQEgxmbAgM+fXB9J0u/L35oaWvRG+Kv3OKGoc4LN lEKQ== X-Gm-Message-State: APjAAAUgYrKEV45h4seZOl+pAkqREmP+mV3Ayq1SpVikjOwr+xI/9UkY huoFo9Vs/OR27h0PvUo4J0xd1EUPqWYqDA== X-Google-Smtp-Source: APXvYqzD8NtwUPtThEx5/46Vneo39q8eQKHQlwhLzSpSGL8q43XXNUoOAkc+vR9FXjjCArGZ/DiwgA== X-Received: by 2002:a05:6512:507:: with SMTP id o7mr31083688lfb.137.1558713585297; Fri, 24 May 2019 08:59:45 -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 d18sm685280lfl.95.2019.05.24.08.59.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 May 2019 08:59:44 -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 v3 13/14] Marvell/Armada7k8k: Remove duplication in .dsc files Date: Fri, 24 May 2019 17:59:10 +0200 Message-Id: <1558713551-25363-14-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558713551-25363-1-git-send-email-mw@semihalf.com> References: <1558713551-25363-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 8ee8490..990f6e6 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc @@ -56,9 +56,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 @@ -67,6 +64,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 5418ddc..a068373 100644 --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc @@ -56,9 +56,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 @@ -67,6 +64,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 ff9bd5d..32b9a74 100644 --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc @@ -57,9 +57,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 @@ -68,6 +65,7 @@ [LibraryClasses.common] ArmadaBoardDescLib|Platform/SolidRun/Armada80x0McBin/Armada80x0McBinBoardDescLib/Armada80x0McBinBoardDescLib.inf + NonDiscoverableInitLib|Platform/SolidRun/Armada80x0McBin/NonDiscoverableInitLib/NonDiscoverableInitLib.inf ################################################################################ # -- 2.7.4