diff mbox

[net-next] net/mlxfw: select CONFIG_XZ_DEC

Message ID 20170530092628.1306028-1-arnd@arndb.de
State Accepted
Commit 9831724a08f06f9560fcc3f1132cbd290e5f9149
Headers show

Commit Message

Arnd Bergmann May 30, 2017, 9:26 a.m. UTC
The new mlxfw code fails to build without the xz library:

drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.o: In function `mlxfw_mfa2_xz_dec_run':
:(.text.mlxfw_mfa2_xz_dec_run+0x8): undefined reference to `xz_dec_run'
drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.o: In function `mlxfw_mfa2_file_component_get':
:(.text.mlxfw_mfa2_file_component_get+0x218): undefined reference to `xz_dec_init'
:(.text.mlxfw_mfa2_file_component_get+0x2c0): undefined reference to `xz_dec_end'

This adds a Kconfig 'select' statement for it, which is also what
the other user of that library has.

Fixes: 410ed13cae39 ("Add the mlxfw module for Mellanox firmware flash process")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/net/ethernet/mellanox/mlxfw/Kconfig | 1 +
 1 file changed, 1 insertion(+)

-- 
2.9.0

Comments

Yotam Gigi May 30, 2017, 9:28 a.m. UTC | #1
On 05/30/2017 12:26 PM, Arnd Bergmann wrote:
> The new mlxfw code fails to build without the xz library:

>

> drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.o: In function `mlxfw_mfa2_xz_dec_run':

> :(.text.mlxfw_mfa2_xz_dec_run+0x8): undefined reference to `xz_dec_run'

> drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.o: In function `mlxfw_mfa2_file_component_get':

> :(.text.mlxfw_mfa2_file_component_get+0x218): undefined reference to `xz_dec_init'

> :(.text.mlxfw_mfa2_file_component_get+0x2c0): undefined reference to `xz_dec_end'

>

> This adds a Kconfig 'select' statement for it, which is also what

> the other user of that library has.

>

> Fixes: 410ed13cae39 ("Add the mlxfw module for Mellanox firmware flash process")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/net/ethernet/mellanox/mlxfw/Kconfig | 1 +

>  1 file changed, 1 insertion(+)

>

> diff --git a/drivers/net/ethernet/mellanox/mlxfw/Kconfig b/drivers/net/ethernet/mellanox/mlxfw/Kconfig

> index 56b60ac7bc34..2b21af8a2b1d 100644

> --- a/drivers/net/ethernet/mellanox/mlxfw/Kconfig

> +++ b/drivers/net/ethernet/mellanox/mlxfw/Kconfig

> @@ -4,3 +4,4 @@

>  

>  config MLXFW

>          tristate "mlxfw" if COMPILE_TEST

> +	select XZ_DEC


Thanks!

Acked-by: Yotam Gigi <yotamg@mellanox.com>
David Miller May 31, 2017, 4:53 p.m. UTC | #2
From: Arnd Bergmann <arnd@arndb.de>

Date: Tue, 30 May 2017 11:26:14 +0200

> The new mlxfw code fails to build without the xz library:

> 

> drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.o: In function `mlxfw_mfa2_xz_dec_run':

> :(.text.mlxfw_mfa2_xz_dec_run+0x8): undefined reference to `xz_dec_run'

> drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.o: In function `mlxfw_mfa2_file_component_get':

> :(.text.mlxfw_mfa2_file_component_get+0x218): undefined reference to `xz_dec_init'

> :(.text.mlxfw_mfa2_file_component_get+0x2c0): undefined reference to `xz_dec_end'

> 

> This adds a Kconfig 'select' statement for it, which is also what

> the other user of that library has.

> 

> Fixes: 410ed13cae39 ("Add the mlxfw module for Mellanox firmware flash process")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Applied, thanks Arnd.
diff mbox

Patch

diff --git a/drivers/net/ethernet/mellanox/mlxfw/Kconfig b/drivers/net/ethernet/mellanox/mlxfw/Kconfig
index 56b60ac7bc34..2b21af8a2b1d 100644
--- a/drivers/net/ethernet/mellanox/mlxfw/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlxfw/Kconfig
@@ -4,3 +4,4 @@ 
 
 config MLXFW
         tristate "mlxfw" if COMPILE_TEST
+	select XZ_DEC