Psoc6: fixes for correct device bring-up

Author: danielinux

.gdbinit

@@ -1,4 +1,5 @@
 tar rem:3333
 file wolfboot.elf
 foc c
+mon psoc6 reset_halt
 

arch.mk

@@ -153,6 +153,7 @@ endif
 
 ifeq ($(TARGET),psoc6)
     CORTEX_M0=1
+    OBJS+=hal/psoc6_02_cm0plus.o
     PKA_EXTRA_OBJS+= $(CYPRESS_PDL)/drivers/source/cy_flash.o \
 					 $(CYPRESS_PDL)/drivers/source/cy_ipc_pipe.o \
 					 $(CYPRESS_PDL)/drivers/source/cy_ipc_sema.o \

hal/psoc6.c

@@ -21,6 +21,7 @@
 
 #include <stdint.h>
 #include <target.h>
+#include <string.h>
 #include "image.h"
 
 #include "cy_device_headers.h"
@@ -31,9 +32,12 @@
 #include "cy_syslib.h"
 #include "cy_ipc_drv.h"
 
-#define ROW_SIZE (0x200)
+#define ROW_SIZE (0x1000)
+#define FLASH_BASE_ADDRESS (0x10000000)
 #define CPU_FREQ (100000000)
 
+uint8_t psoc6_write_buffer[ROW_SIZE];
+
 #ifndef NVM_FLASH_WRITEONCE
 #   error "wolfBoot psoc6 HAL: no WRITEONCE support detected. Please define NVM_FLASH_WRITEONCE"
 #endif
@@ -67,10 +71,9 @@ static const cy_stc_pll_manual_config_t srss_0_clock_0_pll_0_pllConfig =
     .outputMode = CY_SYSCLK_FLLPLL_OUTPUT_AUTO,
 };
 
-void hal_init(void)
+#define MPU_CTL *((volatile uint32_t *)(0xE000ED90))
+static void hal_set_pll(void)
 {
-    SystemInit();
-#if 0
     /*Set clock path 1 source to IMO, this feeds PLL1*/
     Cy_SysClk_ClkPathSetSource(1U, CY_SYSCLK_CLKPATH_IN_IMO);
 
@@ -97,8 +100,15 @@ void hal_init(void)
         while(1)
             ;
     }
-#endif
+}
+
+void hal_init(void)
+{
+    MPU_CTL = 0;
+    //SystemInit();
+    Cy_PDL_Init(CY_DEVICE_CFG);
     Cy_Flash_Init();
+    //hal_set_pll();
 }
 
 void hal_prepare_boot(void)
@@ -114,10 +124,18 @@ void hal_prepare_boot(void)
  */
 int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
 {
+    const uint8_t *src = data;
     if (len < NVM_CACHE_SIZE)
         return -1;
+    if ((((uint32_t)data) & FLASH_BASE_ADDRESS) == FLASH_BASE_ADDRESS) {
+        if (len != ROW_SIZE) {
+            return -1;
+        }
+        memcpy(psoc6_write_buffer, data, len);
+        src = psoc6_write_buffer;
+    }
     while (len) {
-        Cy_Flash_WriteRow(address, (const uint32_t *) data);
+        Cy_Flash_ProgramRow(address, (const uint32_t *) src);
         len -= NVM_CACHE_SIZE;
         if ((len > 0) && (len < NVM_CACHE_SIZE))
             return -1;

hal/psoc6.ld

@@ -12,13 +12,15 @@ SECTIONS
         _start_text = .;
         __Vectors = .;
         KEEP(*(.isr_vector))
+        KEEP(*(.vectors))
         . = ALIGN(0x400);
         *(.text*)
         *(.rodata*)
         *(.init*)
         *(.fini*)
         . = ALIGN(4);
         _end_text = .;
+        __etext = .;
     } > FLASH
 
     .edidx :
@@ -32,25 +34,63 @@ SECTIONS
     .data : AT (_stored_data)
     {
         _start_data = .;
+        __data_start__ = .;
+
         KEEP(*(.data*))
         . = ALIGN(4);
+        KEEP(*(.ramcode))
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        KEEP(*(SORT(.fini_array.*)))
+        KEEP(*(.fini_array))
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        KEEP(*(.jcr*))
+        . = ALIGN(4);
+
+        KEEP(*(.cy_ramfunc*))
+        . = ALIGN(4);
+
         _end_data = .;
+        __data_end__ = .;
+
     } > RAM
 
     .bss (NOLOAD) :
     {
         _start_bss = .;
         __bss_start__ = .;
+        __zero_table_start__ = .;
         *(.bss*)
         *(COMMON)
         . = ALIGN(4);
         _end_bss = .;
         __bss_end__ = .;
+        __zero_table_end__ = .;
         _end = .;
+        . = ALIGN(0x100);
         __ramVectors = .;
     } > RAM
     . = ALIGN(4);
 }
 
 END_STACK = ORIGIN(RAM) + LENGTH(RAM);
 
+__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+__StackLimit = __StackTop - 0x4000;
+PROVIDE(__stack = __StackTop);
+