[incubator-nuttx] branch master updated: lpc17_40_progmem: fixed compilation issues.

[xi...@apache.org]

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/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new de21340  lpc17_40_progmem: fixed compilation issues.
de21340 is described below

commit de213401a7b44a7b7744e2d924387921961f2f7f
Author: Fotis Panagiotopoulos <f....@gmail.com>
AuthorDate: Thu Jul 1 15:20:41 2021 +0300

    lpc17_40_progmem: fixed compilation issues.
---
 arch/arm/src/lpc17xx_40xx/Make.defs          | 2 +-
 arch/arm/src/lpc17xx_40xx/lpc17_40_progmem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/lpc17xx_40xx/Make.defs b/arch/arm/src/lpc17xx_40xx/Make.defs
index 81a1515..b87f5af 100644
--- a/arch/arm/src/lpc17xx_40xx/Make.defs
+++ b/arch/arm/src/lpc17xx_40xx/Make.defs
@@ -160,6 +160,6 @@ ifeq ($(CONFIG_LPC17_40_TMR0),y)
 CHIP_CSRCS += lpc17_40_timer.c
 endif
 
-ifeq ($(CONFIG_MTD_PROGMEM),y)
+ifeq ($(CONFIG_LPC17_40_PROGMEM),y)
 CHIP_CSRCS += lpc17_40_progmem.c
 endif
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_progmem.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_progmem.c
index b203bdf..2c4edc1 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_progmem.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_progmem.c
@@ -74,7 +74,7 @@ static void lpc17_40_iap(FAR void *in, FAR void *out)
 
   flags = enter_critical_section();
 
-  ((void *(FAR void *, FAR void *))LPC17_40_IAP_ENTRY_ADDR)(in, out);
+  ((void (*)(FAR void *, FAR void *))LPC17_40_IAP_ENTRY_ADDR)(in, out);
 
   leave_critical_section(flags);
 }