Renaming KINETIS -> MCUXPRESSO

pull/7/head
Daniele Lacamera 2021-04-07 16:49:00 +02:00
parent a5cc82170d
commit 715bc3bc3b
3 changed files with 17 additions and 17 deletions

View File

@ -4,10 +4,10 @@ LD:=$(CROSS_COMPILE)gcc
AS:=$(CROSS_COMPILE)gcc AS:=$(CROSS_COMPILE)gcc
OBJCOPY:=$(CROSS_COMPILE)objcopy OBJCOPY:=$(CROSS_COMPILE)objcopy
SIZE:=$(CROSS_COMPILE)size SIZE:=$(CROSS_COMPILE)size
KINETIS?=$(HOME)/src/FRDM-K64F MCUXPRESSO?=$(HOME)/src/FRDM-K64F
KINETIS_DRIVERS?=$(KINETIS)/devices/MK64F12 MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12
KINETIS_CMSIS?=$(KINETIS)/CMSIS MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
PHY=$(KINETIS)/components/phyksz8081 PHY=$(MCUXPRESSO)/components/phyksz8081
FREERTOS_PORT:=freeRTOS/portable/GCC/ARM_CM4F FREERTOS_PORT:=freeRTOS/portable/GCC/ARM_CM4F
WOLFBOOT:=../wolfBoot WOLFBOOT:=../wolfBoot
WOLFSSL_ROOT:=../wolfBoot/lib/wolfssl WOLFSSL_ROOT:=../wolfBoot/lib/wolfssl
@ -34,19 +34,19 @@ else
endif endif
CFLAGS+=-I$(KINETIS_DRIVERS)/drivers -I$(KINETIS_DRIVERS) -DCPU_MK64FN1M0VLL12 -I$(KINETIS_CMSIS)/Include -I$(PHY) -DDEBUG_CONSOLE_ASSERT_DISABLE=1 CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/drivers -I$(MCUXPRESSO_DRIVERS) -DCPU_MK64FN1M0VLL12 -I$(MCUXPRESSO_CMSIS)/Include -I$(PHY) -DDEBUG_CONSOLE_ASSERT_DISABLE=1
LDFLAGS=$(CFLAGS) -Wl,-gc-sections -ffreestanding -nostartfiles -lc -lnosys -Wl,-Map=image.map -specs=nano.specs LDFLAGS=$(CFLAGS) -Wl,-gc-sections -ffreestanding -nostartfiles -lc -lnosys -Wl,-Map=image.map -specs=nano.specs
OBJS:= \ OBJS:= \
$(KINETIS_DRIVERS)/drivers/fsl_clock.o \ $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o \
$(KINETIS_DRIVERS)/drivers/fsl_ftfx_flash.o \ $(MCUXPRESSO_DRIVERS)/drivers/fsl_ftfx_flash.o \
$(KINETIS_DRIVERS)/drivers/fsl_ftfx_cache.o \ $(MCUXPRESSO_DRIVERS)/drivers/fsl_ftfx_cache.o \
$(KINETIS_DRIVERS)/drivers/fsl_ftfx_controller.o \ $(MCUXPRESSO_DRIVERS)/drivers/fsl_ftfx_controller.o \
$(KINETIS_DRIVERS)/drivers/fsl_enet.o \ $(MCUXPRESSO_DRIVERS)/drivers/fsl_enet.o \
$(KINETIS_DRIVERS)/drivers/fsl_sysmpu.o \ $(MCUXPRESSO_DRIVERS)/drivers/fsl_sysmpu.o \
$(WOLFBOOT)/src/libwolfboot.o \ $(WOLFBOOT)/src/libwolfboot.o \
$(WOLFBOOT)/hal/kinetis.o \ $(WOLFBOOT)/hal/kinetis.o \
$(WOLFSSH_ROOT)/src/internal.o \ $(WOLFSSH_ROOT)/src/internal.o \
@ -136,14 +136,14 @@ wolfboot-align.bin:CFLAGS=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ff
-IfreeRTOS -IfreeRTOS/include -I build/include -I$(WOLFBOOT)/include -I$(WOLFBOOT) \ -IfreeRTOS -IfreeRTOS/include -I build/include -I$(WOLFBOOT)/include -I$(WOLFBOOT) \
-DWOLFSSL_USER_SETTINGS -I$(WOLFSSL_ROOT) -DPICO_PORT_CUSTOM \ -DWOLFSSL_USER_SETTINGS -I$(WOLFSSL_ROOT) -DPICO_PORT_CUSTOM \
-mthumb -mlittle-endian -mthumb-interwork -ffreestanding -fno-exceptions -mthumb -mlittle-endian -mthumb-interwork -ffreestanding -fno-exceptions
wolfboot-align.bin:CFLAGS+=-I$(KINETIS_DRIVERS)/drivers -I$(KINETIS_DRIVERS) -DCPU_MK64FN1M0VLL12 -I$(KINETIS_CMSIS)/Include -I$(PHY) -DDEBUG_CONSOLE_ASSERT_DISABLE=1 -mcpu=cortex-m3 -DNVM_FLASH_WRITEONCE=1 wolfboot-align.bin:CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/drivers -I$(MCUXPRESSO_DRIVERS) -DCPU_MK64FN1M0VLL12 -I$(MCUXPRESSO_CMSIS)/Include -I$(PHY) -DDEBUG_CONSOLE_ASSERT_DISABLE=1 -mcpu=cortex-m3 -DNVM_FLASH_WRITEONCE=1
wolfboot-align.bin:LDFLAGS=$(CFLAGS) -Wl,-gc-sections -ffreestanding -nostartfiles -lc -lnosys -Wl,-Map=image.map -specs=nano.specs wolfboot-align.bin:LDFLAGS=$(CFLAGS) -Wl,-gc-sections -ffreestanding -nostartfiles -lc -lnosys -Wl,-Map=image.map -specs=nano.specs
wolfboot-align.bin: wolfboot_target wolfboot-align.bin: wolfboot_target
rm -f ../wolfBoot/hal/kinetis.o rm -f ../wolfBoot/hal/kinetis.o
rm -f ../wolfBoot/src/*.o rm -f ../wolfBoot/src/*.o
rm -f $(KINETIS_DRIVERS)/drivers/*.o rm -f $(MCUXPRESSO_DRIVERS)/drivers/*.o
cp src/wolfboot.config ../wolfBoot/.config cp src/wolfboot.config ../wolfBoot/.config
make -C ../wolfBoot wolfboot-align.bin make -C ../wolfBoot wolfboot-align.bin MCUXPRESSO=$(MCUXPRESSO)
cp ../wolfBoot/wolfboot-align.bin . cp ../wolfBoot/wolfboot-align.bin .
standalone:LSCRIPT:=k64f_standalone.ld standalone:LSCRIPT:=k64f_standalone.ld

View File

@ -34,9 +34,9 @@ Kinetis SDK `FRDM-K64F` (can be downloaded from NXP website).
### Compiling ### Compiling
The path to the Kinetis SDK directory must be passed to make through the `KINETIS=` variable. The path to the Kinetis SDK directory must be passed to make through the `MCUXPRESSO=` variable.
Running `make KINETIS=/path/to/FRDM-K64F` assembles the following images: Running `make MCUXPRESSO=/path/to/FRDM-K64F` assembles the following images:
- wolfBoot compiled to run on FRDM-K64F - wolfBoot compiled to run on FRDM-K64F
- freeRTOS with automatic start-up of the firmware update process, in a signed image that can be verified by wolfBoot during start-up - freeRTOS with automatic start-up of the firmware update process, in a signed image that can be verified by wolfBoot during start-up

@ -1 +1 @@
Subproject commit 61da2d8d3d68421c753785a06134d0c886ad86e4 Subproject commit 75a7e57279b1c70ca741111705e98aff6307c333