Revert previous change.

 - Do not use memcpy before it is relocated to RAM.
 - Prefer library functions over RX intrinsics.( Compiler option change)

Author: miyazakh

IDE/Renesas/e2studio/RX72N/wolfBoot/.cproject

@@ -82,6 +82,7 @@
 									<listOptionValue builtIn="false" value="../../include/target.h"/>
 								</option>
 								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize.402664598" name="Optimization level (-optimize)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize" useByScannerDiscovery="false" value="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.optimize.level2" valueType="enumerated"/>
+								<option id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.library.498855776" name="Execution method of library function that can be expanded to RX instructions (-library)" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.library" value="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.option.library.functions" valueType="enumerated"/>
 								<inputType id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.gcc.inputType.1343195127" name="Compiler Input C" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.gcc.inputType"/>
 								<inputType id="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.gpp.inputType.1547456010" name="Compiler Input CPP" superClass="com.renesas.cdt.managedbuild.renesas.ccrx.compiler.gpp.inputType"/>
 							</tool>

hal/renesas-rx.c

@@ -107,17 +107,17 @@ void hal_delay_us(uint32_t us)
 
 static flash_err_t flash_check_error()
 {
-	uint32_t st = FLASH_FSTATR;
+    uint32_t st = FLASH_FSTATR;
 
-	if (st & FLASH_FSTATR_ILGLERR) return FLASH_ERR_ILGL;
-	if (st & FLASH_FSTATR_PRGERR) return FLASH_ERR_PRG;
-	if (st & FLASH_FSTATR_ERSERR) return FLASH_ERR_ERS;
-	if (st & FLASH_FSTATR_FLWEERR) return FLASH_ERR_FLWE;
-	if (st & FLASH_FSTATR_FESETERR) return FLASH_ERR_FESET;
-	if (st & FLASH_FSTATR_SECERR) return FLASH_ERR_SEC;
-	if (st & FLASH_FSTATR_OTERR) return FLASH_ERR_OT;
+    if (st & FLASH_FSTATR_ILGLERR) return FLASH_ERR_ILGL;
+    if (st & FLASH_FSTATR_PRGERR) return FLASH_ERR_PRG;
+    if (st & FLASH_FSTATR_ERSERR) return FLASH_ERR_ERS;
+    if (st & FLASH_FSTATR_FLWEERR) return FLASH_ERR_FLWE;
+    if (st & FLASH_FSTATR_FESETERR) return FLASH_ERR_FESET;
+    if (st & FLASH_FSTATR_SECERR) return FLASH_ERR_SEC;
+    if (st & FLASH_FSTATR_OTERR) return FLASH_ERR_OT;
 
-	return FLASH_OK;
+    return FLASH_OK;
 
 }
 #ifdef DEBUG_UART
@@ -250,15 +250,15 @@ void hal_clk_init(void)
     /* Wait for HOCO oscillator stabilization */
     while ((SYS_OSCOVFSR & SYS_OSCOVFSR_HCOVF) == 0) { RX_NOP(); }
 #else
-	if (SYS_HOCOCR & SYS_HOCOCR_HCSTP) {
-    	/* Turn off power to HOCO */
-	    SYS_HOCOPCR |= SYS_HOCOPCR_HOCOPCNT;
-	}
+    if (SYS_HOCOCR & SYS_HOCOCR_HCSTP) {
+        /* Turn off power to HOCO */
+        SYS_HOCOPCR |= SYS_HOCOPCR_HOCOPCNT;
+    }
 #endif
 
     /* ---- Main-Clock ---- */
 #if CFG_CKSEL == 2
-	/* MOFXIN=0 (not controlled), MODRV2=0 (24MHz), MOSEL=0 (resonator) */
+    /* MOFXIN=0 (not controlled), MODRV2=0 (24MHz), MOSEL=0 (resonator) */
     SYS_MOFCR = 0;
 
     /* OSC stabilization time (9.98 ms * (264 kHZ) + 16)/32 = 82.83) */
@@ -500,21 +500,29 @@ void hal_prepare_boot(void)
 
 }
 
+#ifdef __CCRX__
+/* copy RAM functions from ROM to RAM */
+static void copyfuncs(void)
+{
+    unsigned char *dst, *src;
+    size_t n;
+    
+    src = __sectop("PFRAM");
+    dst = __sectop("RPFRAM");
+    n = (size_t)((unsigned char*)__secend("PFRAM") -
+                 (unsigned char*)__sectop("PFRAM"));
+    wolfBoot_printf("RAM Function start = 0x%p\n", __sectop("RPFRAM"));
+    wolfBoot_printf("RAM Function end   = 0x%p\n", __secend("RPFRAM"));
+    wolfBoot_printf("RAM Function size  = %d\n", n);
+    while(src < __secend("PFRAM")) {
+        *dst++ = *src++;
+    }
+}
+#endif
 int hal_flash_init(void)
 {
 #ifdef __CCRX__
-	unsigned char *src, *dst;
-	size_t n;
-
-	src = (unsigned char*)__sectop("PFRAM");
-	dst = (unsigned char*)__sectop("RPFRAM");
-
-	n = (size_t)((unsigned char*)__secend("PFRAM") -
-				 (unsigned char*)__sectop("PFRAM"));
-	wolfBoot_printf("RAM Function start = 0x%p\n", __sectop("RPFRAM"));
-	wolfBoot_printf("RAM Function end   = 0x%p\n", __secend("RPFRAM"));
-	wolfBoot_printf("RAM Function size  = %d\n", n);
-	memcpy(dst, src, n);
+    copyfuncs();
 #endif
     /* Flash Write Enable */
     FLASH_FWEPROR = FLASH_FWEPROR_FLWE;
@@ -549,17 +557,17 @@ int RAMFUNCTION hal_flash_write(uint32_t addr, const uint8_t *data, int len)
     int      ret;
 
     while (len > 0) {
-    	/* Align address to 128-byte boundary */
-    	block_base = addr & ~(FLASH_FACI_CODE_BLOCK_SZ - 1);
-    	offset = addr - block_base;
+        /* Align address to 128-byte boundary */
+        block_base = addr & ~(FLASH_FACI_CODE_BLOCK_SZ - 1);
+        offset = addr - block_base;
 
-    	memcpy(codeblock, (uint8_t*)block_base, FLASH_FACI_CODE_BLOCK_SZ);
-    	write_size = FLASH_FACI_CODE_BLOCK_SZ - offset;
-    	if (write_size > len)
-    		write_size = len;
+        memcpy(codeblock, (uint8_t*)block_base, FLASH_FACI_CODE_BLOCK_SZ);
+        write_size = FLASH_FACI_CODE_BLOCK_SZ - offset;
+        if (write_size > len)
+            write_size = len;
 
-    	memcpy(&codeblock[offset], data, write_size);
-    	data16 = (uint16_t*)codeblock;
+        memcpy(&codeblock[offset], data, write_size);
+        data16 = (uint16_t*)codeblock;
 
         FLASH_FSADDR = block_base;
         /* flash program command */
@@ -579,7 +587,7 @@ int RAMFUNCTION hal_flash_write(uint32_t addr, const uint8_t *data, int len)
         /* Wait for FCU operation to complete */
         while ((FLASH_FSTATR & FLASH_FSTATR_FRDY) == 0);
         if ((ret = flash_check_error()) != FLASH_OK) {
-        	return ret;
+            return ret;
         }
         len -= write_size;
         addr += write_size;