* [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile
@ 2012-06-13 18:22 Seth Jennings
2012-06-13 18:22 ` [PATCH 2/2] drivers: crypto: fix typo in nx driver config option Seth Jennings
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Seth Jennings @ 2012-06-13 18:22 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Seth Jennings, Herbert Xu, linux-kernel, Paul Mackerras,
linux-crypto, Kent Yoder, linuxppc-dev, David S. Miller
When the nx driver was pulled, the Makefile that actually
builds it is arch/powerpc/Makefile. This is unnatural.
This patch moves the line that builds the nx driver from
arch/powerpc/Makefile to drivers/crypto/Makefile where it
belongs.
Cc: Kent Yoder <key@linux.vnet.ibm.com>
Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
---
arch/powerpc/Makefile | 1 -
drivers/crypto/Makefile | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 950d1f7..159e94f 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -149,7 +149,6 @@ core-$(CONFIG_KVM) += arch/powerpc/kvm/
core-$(CONFIG_PERF_EVENTS) += arch/powerpc/perf/
drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
-drivers-$(CONFIG_CRYPTO_DEV_NX) += drivers/crypto/nx/
# Default to zImage, override when needed
all: zImage
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 0139032..67b4fbf 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -14,4 +14,5 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o
-obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
\ No newline at end of file
+obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
+obj-$(CONFIG_CRYPTO_DEV_NX) += nx/
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] drivers: crypto: fix typo in nx driver config option
2012-06-13 18:22 [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile Seth Jennings
@ 2012-06-13 18:22 ` Seth Jennings
2012-06-13 20:23 ` Kent Yoder
2012-06-13 18:45 ` [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile Kent Yoder
2012-06-27 6:49 ` Herbert Xu
2 siblings, 1 reply; 5+ messages in thread
From: Seth Jennings @ 2012-06-13 18:22 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Seth Jennings, trivial, Herbert Xu, linux-kernel, Paul Mackerras,
linux-crypto, Kent Yoder, linuxppc-dev, David S. Miller
Cc: Kent Yoder <key@linux.vnet.ibm.com>
Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
---
drivers/crypto/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 1092a77..b9b11a6 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -298,7 +298,7 @@ config CRYPTO_DEV_TEGRA_AES
will be called tegra-aes.
config CRYPTO_DEV_NX
- tristate "Support for Power7+ in-Nest cryptographic accleration"
+ tristate "Support for Power7+ in-Nest cryptographic acceleration"
depends on PPC64 && IBMVIO
select CRYPTO_AES
select CRYPTO_CBC
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drivers: crypto: fix typo in nx driver config option
2012-06-13 18:22 ` [PATCH 2/2] drivers: crypto: fix typo in nx driver config option Seth Jennings
@ 2012-06-13 20:23 ` Kent Yoder
0 siblings, 0 replies; 5+ messages in thread
From: Kent Yoder @ 2012-06-13 20:23 UTC (permalink / raw)
To: Seth Jennings
Cc: trivial, Herbert Xu, linux-kernel, Paul Mackerras, linux-crypto,
linuxppc-dev, David S. Miller
On Wed, 2012-06-13 at 13:22 -0500, Seth Jennings wrote:
> Cc: Kent Yoder <key@linux.vnet.ibm.com>
> Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
> ---
> drivers/crypto/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by: Kent Yoder <key@linux.vnet.ibm.com>
> diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
> index 1092a77..b9b11a6 100644
> --- a/drivers/crypto/Kconfig
> +++ b/drivers/crypto/Kconfig
> @@ -298,7 +298,7 @@ config CRYPTO_DEV_TEGRA_AES
> will be called tegra-aes.
>
> config CRYPTO_DEV_NX
> - tristate "Support for Power7+ in-Nest cryptographic accleration"
> + tristate "Support for Power7+ in-Nest cryptographic acceleration"
> depends on PPC64 && IBMVIO
> select CRYPTO_AES
> select CRYPTO_CBC
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile
2012-06-13 18:22 [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile Seth Jennings
2012-06-13 18:22 ` [PATCH 2/2] drivers: crypto: fix typo in nx driver config option Seth Jennings
@ 2012-06-13 18:45 ` Kent Yoder
2012-06-27 6:49 ` Herbert Xu
2 siblings, 0 replies; 5+ messages in thread
From: Kent Yoder @ 2012-06-13 18:45 UTC (permalink / raw)
To: Seth Jennings
Cc: Herbert Xu, linux-kernel, Paul Mackerras, linux-crypto,
linuxppc-dev, David S. Miller
On Wed, 2012-06-13 at 13:22 -0500, Seth Jennings wrote:
> When the nx driver was pulled, the Makefile that actually
> builds it is arch/powerpc/Makefile. This is unnatural.
>
> This patch moves the line that builds the nx driver from
> arch/powerpc/Makefile to drivers/crypto/Makefile where it
> belongs.
Acked-by: Kent Yoder <key@linux.vnet.ibm.com>
> Cc: Kent Yoder <key@linux.vnet.ibm.com>
> Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
> ---
> arch/powerpc/Makefile | 1 -
> drivers/crypto/Makefile | 3 ++-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
> index 950d1f7..159e94f 100644
> --- a/arch/powerpc/Makefile
> +++ b/arch/powerpc/Makefile
> @@ -149,7 +149,6 @@ core-$(CONFIG_KVM) += arch/powerpc/kvm/
> core-$(CONFIG_PERF_EVENTS) += arch/powerpc/perf/
>
> drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
> -drivers-$(CONFIG_CRYPTO_DEV_NX) += drivers/crypto/nx/
>
> # Default to zImage, override when needed
> all: zImage
> diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
> index 0139032..67b4fbf 100644
> --- a/drivers/crypto/Makefile
> +++ b/drivers/crypto/Makefile
> @@ -14,4 +14,5 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
> obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
> obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
> obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o
> -obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
> \ No newline at end of file
> +obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
> +obj-$(CONFIG_CRYPTO_DEV_NX) += nx/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile
2012-06-13 18:22 [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile Seth Jennings
2012-06-13 18:22 ` [PATCH 2/2] drivers: crypto: fix typo in nx driver config option Seth Jennings
2012-06-13 18:45 ` [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile Kent Yoder
@ 2012-06-27 6:49 ` Herbert Xu
2 siblings, 0 replies; 5+ messages in thread
From: Herbert Xu @ 2012-06-27 6:49 UTC (permalink / raw)
To: Seth Jennings
Cc: linux-kernel, Paul Mackerras, linux-crypto, Kent Yoder,
linuxppc-dev, David S. Miller
On Wed, Jun 13, 2012 at 01:22:42PM -0500, Seth Jennings wrote:
> When the nx driver was pulled, the Makefile that actually
> builds it is arch/powerpc/Makefile. This is unnatural.
>
> This patch moves the line that builds the nx driver from
> arch/powerpc/Makefile to drivers/crypto/Makefile where it
> belongs.
>
> Cc: Kent Yoder <key@linux.vnet.ibm.com>
> Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Both patches applied.
Thanks!
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-06-27 7:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-13 18:22 [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile Seth Jennings
2012-06-13 18:22 ` [PATCH 2/2] drivers: crypto: fix typo in nx driver config option Seth Jennings
2012-06-13 20:23 ` Kent Yoder
2012-06-13 18:45 ` [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile Kent Yoder
2012-06-27 6:49 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).