2012-06-13 18:24:00

by Seth Jennings

Subject: [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile

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 <[email protected]>
Signed-off-by: Seth Jennings <[email protected]>
---
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

2012-06-13 18:25:29

by Seth Jennings

Subject: [PATCH 2/2] drivers: crypto: fix typo in nx driver config option

Cc: Kent Yoder <[email protected]>
Signed-off-by: Seth Jennings <[email protected]>
---
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

2012-06-13 18:44:42

by Kent Yoder

Subject: Re: [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile

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 <[email protected]>

> Cc: Kent Yoder <[email protected]>
> Signed-off-by: Seth Jennings <[email protected]>
> ---
> 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/

2012-06-13 20:22:13

by Kent Yoder

Subject: Re: [PATCH 2/2] drivers: crypto: fix typo in nx driver config option

On Wed, 2012-06-13 at 13:22 -0500, Seth Jennings wrote:
> Cc: Kent Yoder <[email protected]>
> Signed-off-by: Seth Jennings <[email protected]>
> ---
> drivers/crypto/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Kent Yoder <[email protected]>

> 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

2012-06-27 06:49:27

by Herbert Xu

Subject: Re: [PATCH 1/2] drivers: crypto: move nx build to driver/crypto Makefile

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 <[email protected]>
> Signed-off-by: Seth Jennings <[email protected]>

Both patches applied.

Thanks!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt