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=a6UoxnE7; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.208.178, mailfrom: mw@semihalf.com) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by groups.io with SMTP; Thu, 09 May 2019 02:54:14 -0700 Received: by mail-lj1-f178.google.com with SMTP id 188so1449002ljf.9 for ; Thu, 09 May 2019 02:54:13 -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=a6UoxnE7ywY07vyJwZugSn37n7Vt67be6n3GuUWG5K+qoQTHt9thxKKQgRtVvvsQv/ iBbn/Cq3gMOKLp2NYAA08An2kOj73743Sbv3GfcY+8mn/mBr5WENRGFtBUWZ4BLcvolN yM5XijWfzz9AGoRWNDVQFObgc+4TH8RzwSKkn4OxRwAWm4syY+cvOfeRlyAftKfKSxBE 1LCMcsvv096uiJ91lS0b6txo8L11SNxxMru4NoI9+db4whqZvS2eto86ZJem7pyxaCf5 cTY1Z2YyxyrtJj/I/wvZlSIheT2FYDio/7dLPt3U6OrEp0cuQHQgwMNaToL0ENBNZAXm YWLA== 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=OIm6Mi8X+2/b5LlcrNOwoREVVz27M0Ajo56GVcBUn5TItJ95S9cqk2b9DMA+iGu5Lw lvYdVaOEqFi4gJ92RB5L7yjhlhJmoF4xbWJaiRVnY23P0HV+EKZYbonBr9oTWmTXw78v nd8wIQomFMNlCFUL6rGpfipWq0yXcgrZpvKhZq+RquKLLsVoAxyJIh3YkK2fTI3aeabc K7yqs4Y5lLivcCFEtYDYff5NlE6KFy9pu7KBLNoK2okdVujLTzZMvXDMvI4pSzM2z7gc PjMv6k0ZFFDma602WJRIz5u30HIMLqRGmjlM1ieavW+LEI2nGWfVQWgFUYkkQsYhnRvt 52nQ== X-Gm-Message-State: APjAAAWegppBBCg5YYUuDpbbys9/Wukt+dmONw3U62pZpPgjQJQq1UIx 9eoc8NKldw21qXh4rz24HsAAeompgZQ= X-Google-Smtp-Source: APXvYqzRTS44EGsem5AYrwsTWAR45GP7R9FtnVU61fY2/mwRg6mYXwkzkxsQSIVTHhS7HnjZCs3u6Q== X-Received: by 2002:a2e:6c02:: with SMTP id h2mr1723012ljc.103.1557395652091; Thu, 09 May 2019 02:54:12 -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 l25sm276668lfk.57.2019.05.09.02.54.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 May 2019 02:54:11 -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 13/14] Marvell/Armada7k8k: Remove duplication in .dsc files Date: Thu, 9 May 2019 11:53:41 +0200 Message-Id: <1557395622-32425-14-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557395622-32425-1-git-send-email-mw@semihalf.com> References: <1557395622-32425-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