This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 4f3f9751c153f32cfe7cb89d03631c2ba5da3afb Author: hujun5 <[email protected]> AuthorDate: Tue Dec 3 12:39:20 2024 +0800 fix compile error lcd/st7565.c:107:4: warning: #warning "Optimal setting of CONFIG_LCD_MAXCONTRAST is 255" [-Wcpp] 107 | # warning "Optimal setting of CONFIG_LCD_MAXCONTRAST is 255" | ^~~~~~~ chip/lc823450_cpuindex.c:36: warning: "CORE_COREID" redefined 36 | #define CORE_COREID (LC823450_CORE_BASE + 0x0) | In file included from /home/hujun5/downloads1/vela_sim/nuttx/arch/arm/src/common/arm_internal.h:37, from chip/lc823450_cpuindex.c:29: /home/hujun5/downloads1/vela_sim/nuttx/arch/arm/src/chip/chip.h:48: note: this is the location of the previous definition 48 | #define CORE_COREID (LC823450_CORE_BASE + 0) | chip/lc823450_cpuindex.c:37: warning: "CORE_COREID_ID" redefined 37 | #define CORE_COREID_ID (0x1 << 0) | /home/hujun5/downloads1/vela_sim/nuttx/arch/arm/src/chip/chip.h:49: note: this is the location of the previous definition 49 | #define CORE_COREID_ID (1 << 0) Signed-off-by: hujun5 <[email protected]> --- arch/arm/src/arm/arm_allocpage.c | 2 +- arch/arm/src/lc823450/lc823450_cpuindex.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/src/arm/arm_allocpage.c b/arch/arm/src/arm/arm_allocpage.c index 003ffa7267..359fc60a03 100644 --- a/arch/arm/src/arm/arm_allocpage.c +++ b/arch/arm/src/arm/arm_allocpage.c @@ -36,8 +36,8 @@ #include <nuttx/page.h> -#include "pg_macros.h" #include "arm_internal.h" +#include "pg_macros.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/lc823450/lc823450_cpuindex.c b/arch/arm/src/lc823450/lc823450_cpuindex.c index 573b89c142..dcce257fb2 100644 --- a/arch/arm/src/lc823450/lc823450_cpuindex.c +++ b/arch/arm/src/lc823450/lc823450_cpuindex.c @@ -32,10 +32,6 @@ * Pre-processor Definitions ****************************************************************************/ -#define LC823450_CORE_BASE 0xe00fe000 -#define CORE_COREID (LC823450_CORE_BASE + 0x0) -#define CORE_COREID_ID (0x1 << 0) - /**************************************************************************** * Public Functions ****************************************************************************/
