From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com [IPv6:2a00:1450:400c:c09::234]) (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 205881A1DED for ; Thu, 8 Sep 2016 08:11:20 -0700 (PDT) Received: by mail-wm0-x234.google.com with SMTP id w12so95208313wmf.0 for ; Thu, 08 Sep 2016 08:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=tt1zfx5Hc9zVRCEOQuF+s8+cE6XBRtCGs9Zd/yfm/lY=; b=ajcQ0qq66A67ydHUQmzKc9+TBi4+pIBke4reOIIWFHENVQzBpUaAyNfawSUhJ3xxrY bkn0Z9+yl62FFpl+yUPXQ/y1zq6WUmxtlsEsTG0JaGlE0upfZaz5DDRzcBPJpYCGg2/C FD/uTkBIrwMfnNChXgwD0tfisn2aRkCRpcJB0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=tt1zfx5Hc9zVRCEOQuF+s8+cE6XBRtCGs9Zd/yfm/lY=; b=Zx5tWOLAlOOeOYrXiS+VNFGrhjo1XmVukTGJYMj1tnpaIO9Qkez8wanG73iEgvUaHm reKgI3a7fgfZ3fRzkTNSF+qlHRq9YtE4P9put41m39MTgB/jYeq8KQc69eqRJMRRhBOW ZV+VNwy48RyZKyZZlcHLd4xDqm9wbo9U7K6iA0T7IwsPGpPAM82Gz1ymZzEvaYcVkk0O A1zWXLMO1hUCBn533jmhB2v7wY7vSivIeTeHybS9NIIvCu5U7I5dll8rXxsNNrSeXjUe gxTGaorFoSigmGeq3wpTP+eDazDPzanwaEo2WnOD6nf73v8BgbdOMV7Di4UGOwYA1dRa Q2kw== X-Gm-Message-State: AE9vXwOOHdwAJthp/MChgfwMYM+yMDSkuHz4g7fsFamZcWEQxD8dAIrmKyROdgZmnlgOdnIk X-Received: by 10.194.73.99 with SMTP id k3mr114764wjv.63.1473347478148; Thu, 08 Sep 2016 08:11:18 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id t5sm8312388wjm.12.2016.09.08.08.11.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Sep 2016 08:11:17 -0700 (PDT) Date: Thu, 8 Sep 2016 16:11:15 +0100 From: Leif Lindholm To: Ard Biesheuvel Cc: edk2-devel@lists.01.org Message-ID: <20160908151115.GI16080@bivouac.eciton.net> References: <1473327868-17953-1-git-send-email-ard.biesheuvel@linaro.org> <1473327868-17953-2-git-send-email-ard.biesheuvel@linaro.org> MIME-Version: 1.0 In-Reply-To: <1473327868-17953-2-git-send-email-ard.biesheuvel@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH 2/2] ArmPkg/ArmBaseLib: clean up directory structure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Sep 2016 15:11:20 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Sep 08, 2016 at 10:44:28AM +0100, Ard Biesheuvel wrote: > For historical reasons, the files under ArmLib are split up into 'common' > files under Common/, containing common C files as well as AArch64 and Arm > specific asm files, and ArmV7 and AArch64 files under ArmV7/ and AArch64/, > respectively. This presumably dates back to the time when ArmLib supported > different revisions of the 32-bit architecture (i.e., pre-V7) > > Since the PI spec requires V7 or later, we can simplify this to Arm/ and > AArch64, which aligns ArmLib with the majority of other modules that carry > ARM or AArch64 specific code. > > So move the files around so that shared files live at the same level as > ArmBaseLib.inf, and ARM/AArch64 specific files live in Arm/ or AArch64/, > respectively. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel For the series: Reviewed-by: Leif Lindholm > --- > ArmPkg/Library/ArmLib/{Common => }/AArch64/ArmLibSupport.S | 0 > ArmPkg/Library/ArmLib/{Common => }/Arm/ArmLibSupport.S | 0 > ArmPkg/Library/ArmLib/{Common => }/Arm/ArmLibSupport.asm | 0 > ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmLibSupportV7.S | 0 > ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmLibSupportV7.asm | 0 > ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7ArchTimer.c | 0 > ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7ArchTimerSupport.S | 0 > ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7ArchTimerSupport.asm | 0 > ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7Lib.c | 0 > ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7Lib.h | 0 > ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7Support.S | 0 > ArmPkg/Library/ArmLib/{ArmV7 => Arm}/ArmV7Support.asm | 0 > ArmPkg/Library/ArmLib/ArmBaseLib.inf | 24 ++++++++++---------- > ArmPkg/Library/ArmLib/{Common => }/ArmLib.c | 0 > ArmPkg/Library/ArmLib/{Common => }/ArmLibPrivate.h | 0 > 15 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S > similarity index 100% > rename from ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S > rename to ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S > diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S > similarity index 100% > rename from ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S > rename to ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S > diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm > similarity index 100% > rename from ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm > rename to ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm > diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S > similarity index 100% > rename from ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.S > rename to ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S > diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm > similarity index 100% > rename from ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm > rename to ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm > diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimer.c > similarity index 100% > rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimer.c > rename to ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimer.c > diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.S b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S > similarity index 100% > rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.S > rename to ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S > diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.asm b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.asm > similarity index 100% > rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7ArchTimerSupport.asm > rename to ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.asm > diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c > similarity index 100% > rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c > rename to ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c > diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h > similarity index 100% > rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h > rename to ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h > diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S > similarity index 100% > rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S > rename to ArmPkg/Library/ArmLib/Arm/ArmV7Support.S > diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.asm > similarity index 100% > rename from ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm > rename to ArmPkg/Library/ArmLib/Arm/ArmV7Support.asm > diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.inf > index 3e9f19c3cab1..05a585343cda 100644 > --- a/ArmPkg/Library/ArmLib/ArmBaseLib.inf > +++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf > @@ -23,30 +23,30 @@ [Defines] > LIBRARY_CLASS = ArmLib > > [Sources] > - Common/ArmLib.c > + ArmLib.c > > [Sources.ARM] > - ArmV7/ArmV7Lib.c > - ArmV7/ArmV7ArchTimer.c > + Arm/ArmV7Lib.c > + Arm/ArmV7ArchTimer.c > > - ArmV7/ArmLibSupportV7.S | GCC > - ArmV7/ArmV7Support.S | GCC > - ArmV7/ArmV7ArchTimerSupport.S | GCC > - Common/Arm/ArmLibSupport.S | GCC > + Arm/ArmLibSupport.S | GCC > + Arm/ArmLibSupportV7.S | GCC > + Arm/ArmV7Support.S | GCC > + Arm/ArmV7ArchTimerSupport.S | GCC > > - ArmV7/ArmLibSupportV7.asm | RVCT > - ArmV7/ArmV7Support.asm | RVCT > - ArmV7/ArmV7ArchTimerSupport.asm | RVCT > - Common/Arm/ArmLibSupport.asm | RVCT > + Arm/ArmLibSupport.asm | RVCT > + Arm/ArmLibSupportV7.asm | RVCT > + Arm/ArmV7Support.asm | RVCT > + Arm/ArmV7ArchTimerSupport.asm | RVCT > > [Sources.AARCH64] > AArch64/AArch64Lib.c > AArch64/AArch64ArchTimer.c > > + AArch64/ArmLibSupport.S > AArch64/ArmLibSupportV8.S > AArch64/AArch64Support.S > AArch64/AArch64ArchTimerSupport.S > - Common/AArch64/ArmLibSupport.S > > [Packages] > ArmPkg/ArmPkg.dec > diff --git a/ArmPkg/Library/ArmLib/Common/ArmLib.c b/ArmPkg/Library/ArmLib/ArmLib.c > similarity index 100% > rename from ArmPkg/Library/ArmLib/Common/ArmLib.c > rename to ArmPkg/Library/ArmLib/ArmLib.c > diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibPrivate.h b/ArmPkg/Library/ArmLib/ArmLibPrivate.h > similarity index 100% > rename from ArmPkg/Library/ArmLib/Common/ArmLibPrivate.h > rename to ArmPkg/Library/ArmLib/ArmLibPrivate.h > -- > 2.7.4 >