From e410fb159da8bf26ec27a8ad1aa22023dc37eb0f Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Tue, 16 Feb 2021 19:35:07 +0100 Subject: ltq-vdsl-app: fix -Wundef warnings The following warnings are shown during build: /usr/include/vdsl/cmv_message_format.h:33:6: warning: "MEI_SUPPORT_DEBUG_STREAMS" is not defined, evaluates to 0 [-Wundef] #if (MEI_SUPPORT_DEBUG_STREAMS == 1) ^~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/vdsl/drv_mei_cpe_interface.h:2256:6: warning: "MEI_SUPPORT_OPTIMIZED_FW_DL" is not defined, evaluates to 0 [-Wundef] #if (MEI_SUPPORT_OPTIMIZED_FW_DL == 1) ^~~~~~~~~~~~~~~~~~~~~~~~~~~ The headers are provided by the MEI driver, but the defines are never set by the vdsl app. While the struct with the MEI_SUPPORT_OPTIMIZED_FW_DL conditional isn't used by the vdsl app, however CMV_USED_PAYLOAD_8BIT_SIZE which value depends on MEI_SUPPORT_DEBUG_STREAMS is. Since the MEI driver doesn't provide an autogenerated header with compile flags, the flags are hardcoded for the vdsl app. Set them for the MEI driver as well, to indicate a relation to the values used for the vdsl app and to be not surprised by a changed default in case the MEI driver gets updated. Use the current default values defined in the MEI driver. Signed-off-by: Mathias Kresin --- package/network/config/ltq-vdsl-app/Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'package/network/config') diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile index 0968811984..7665f37514 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-app/Makefile @@ -36,6 +36,18 @@ define Package/ltq-vdsl-app/description Userland tool needed to control Lantiq VDSL CPE endef +# ltq-vdsl-app uses a header provided by the MEI driver which has some +# conditionals. +# +# Define them here with the default values they would get in the MEI driver, +# have the same view on both sides. +# +# If you change them, you need to change them for the ltq-vdsl-app as well +VDSL_APP_CFLAGS = \ + -DMAX_CLI_PIPES=1 \ + -DMEI_SUPPORT_DEBUG_STREAMS=1 \ + -DMEI_SUPPORT_OPTIMIZED_FW_DL=1 + CONFIGURE_ARGS += \ --enable-vrx \ --enable-vrx-device=vr9 \ @@ -44,10 +56,10 @@ CONFIGURE_ARGS += \ --enable-ifxos \ --enable-ifxos-include="-I$(STAGING_DIR)/usr/include/ifxos" \ --enable-ifxos-library="-I$(STAGING_DIR)/usr/lib" \ - --enable-add-appl-cflags="-DMAX_CLI_PIPES=1" \ + --enable-add-appl-cflags="$(VDSL_APP_CFLAGS)" \ --enable-debug \ --disable-dti \ - --with-channels-per-line="1" \ + --with-channels-per-line="1" #CONFIGURE_ARGS += --enable-model=full #CONFIGURE_ARGS += --enable-model=lite -- cgit v1.2.3