[openwrt/openwrt] ltq-vdsl-app: fix -Wundef warnings

[LEDE Commits]

mkresin pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/e410fb159da8bf26ec27a8ad1aa22023dc37eb0f

commit e410fb159da8bf26ec27a8ad1aa22023dc37eb0f
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Tue Feb 16 19:35:07 2021 +0100

    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 <dev at kresin.me>
---
 package/kernel/lantiq/ltq-vdsl-mei/Makefile  | 11 ++++++++++-
 package/network/config/ltq-vdsl-app/Makefile | 16 ++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/package/kernel/lantiq/ltq-vdsl-mei/Makefile b/package/kernel/lantiq/ltq-vdsl-mei/Makefile
index 8e52d20a72..796918549a 100644
--- a/package/kernel/lantiq/ltq-vdsl-mei/Makefile
+++ b/package/kernel/lantiq/ltq-vdsl-mei/Makefile
@@ -56,6 +56,15 @@ MAKE_FLAGS += \
 	$(KERNEL_MAKE_FLAGS) \
 	SHELL="$(BASH)"
 
+# ltq-vdsl-app uses a header provided by the MEI driver which has some
+# conditionals.
+# Define the conditionals here to have the same view on both sides. If you
+# change them, you need to change them for the ltq-vdsl-app as well
+MEI_DRV_CFLAGS = \
+	-DMEI_DRV_ATM_PTM_INTERFACE_ENABLE=1 \
+	-DMEI_SUPPORT_DEBUG_STREAMS=1 \
+	-DMEI_SUPPORT_OPTIMIZED_FW_DL=1
+
 CONFIGURE_ARGS += \
 	--enable-kernelincl="$(LINUX_DIR)/include" \
 	--enable-device=vr9 \
@@ -65,7 +74,7 @@ CONFIGURE_ARGS += \
 	--enable-error_print \
 	--enable-ifxos-include="-I$(STAGING_DIR)/usr/include/ifxos/" \
 	--enable-ifxos-library="-L$(STAGING_DIR)/usr/lib" \
-	--enable-add_drv_cflags="-DMEI_DRV_ATM_PTM_INTERFACE_ENABLE=1" \
+	--enable-add_drv_cflags="$(MEI_DRV_CFLAGS)" \
 	--enable-linux-26 \
 	--enable-kernelbuild="$(LINUX_DIR)" \
 	--enable-drv_test_appl=yes \
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