From a2fb2808bac0ac1f1c7521fe4691b8e319feddfa Mon Sep 17 00:00:00 2001 From: Fabian Blatz Date: Fri, 26 Jul 2024 09:53:43 +0200 Subject: [PATCH] fix(kconfig): Do not set LV_CONF_SKIP by default (#6562) --- docs/porting/project.rst | 3 ++- scripts/lv_conf_internal_gen.py | 2 +- src/lv_conf_internal.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/porting/project.rst b/docs/porting/project.rst index 7109eb956..220dd9e47 100644 --- a/docs/porting/project.rst +++ b/docs/porting/project.rst @@ -90,7 +90,8 @@ will attempt to include ``lv_conf.h`` simply with You can even use a different name for ``lv_conf.h``. The custom path can be set via the :c:macro:`LV_CONF_PATH` define. For example -``-DLV_CONF_PATH="/home/joe/my_project/my_custom_conf.h"`` +``-DLV_CONF_PATH="/home/joe/my_project/my_custom_conf.h"``. If this define +is set :c:macro:`LV_CONF_SKIP` is assumed to be ``0``. If :c:macro:`LV_CONF_SKIP` is defined, LVGL will not try to include ``lv_conf.h``. Instead you can pass the config defines using build diff --git a/scripts/lv_conf_internal_gen.py b/scripts/lv_conf_internal_gen.py index 0242d3568..9c47a58d1 100755 --- a/scripts/lv_conf_internal_gen.py +++ b/scripts/lv_conf_internal_gen.py @@ -69,7 +69,7 @@ fout.write( #endif /*If lv_conf.h is not skipped include it*/ -#ifndef LV_CONF_SKIP +#if !defined(LV_CONF_SKIP) || defined(LV_CONF_PATH) #ifdef LV_CONF_PATH /*If there is a path defined for lv_conf.h use it*/ #define __LV_TO_STR_AUX(x) #x #define __LV_TO_STR(x) __LV_TO_STR_AUX(x) diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index d2f839ad5..d89bde5ba 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -47,7 +47,7 @@ #endif /*If lv_conf.h is not skipped include it*/ -#ifndef LV_CONF_SKIP +#if !defined(LV_CONF_SKIP) || defined(LV_CONF_PATH) #ifdef LV_CONF_PATH /*If there is a path defined for lv_conf.h use it*/ #define __LV_TO_STR_AUX(x) #x #define __LV_TO_STR(x) __LV_TO_STR_AUX(x)