Restructure the repository.

This commit is contained in:
iabdalkader 2020-12-13 23:46:09 +02:00
parent fee119f5c6
commit 13a6ccd123
1131 changed files with 29 additions and 30 deletions

View File

@ -80,7 +80,7 @@ jobs:
name: WINC1500_WORKSPACE # workspace names are escaped.
paths: ~/build/$TARGET
script:
- cp -rf src/winc1500/firmware ~/build/$TARGET
- cp -rf src/drivers/winc1500/firmware ~/build/$TARGET
- stage: build
env: TARGET=CYW4343
@ -89,7 +89,7 @@ jobs:
name: CYW4343_WORKSPACE # workspace names are escaped.
paths: ~/build/$TARGET
script:
- cp -rf src/cyw4343/firmware ~/build/$TARGET
- cp -rf src/drivers/cyw4343/firmware ~/build/$TARGET
- stage: deploy
git:

View File

@ -46,19 +46,18 @@ FIRMWARE = firmware
TOP_DIR=$(shell pwd)
BUILD=$(TOP_DIR)/build
FW_DIR=$(BUILD)/bin
CMSIS_DIR=cmsis
STUSB_DIR=stusb
MICROPY_DIR=micropython
OMV_DIR=omv
LEPTON_DIR=lepton
MLX_DIR=mlx
ST_DIR=st
TENSORFLOW_DIR=libtf
WINC1500_DIR=winc1500
BOOTLDR_DIR=bootloader
UVC_DIR=uvc
BOOTLDR_DIR=bootloader
CUBEAI_DIR=stm32cubeai
LIBPDM_DIR=libpdm
CMSIS_DIR=hal/cmsis
MICROPY_DIR=micropython
MLX_DIR=drivers/mlx
LEPTON_DIR=drivers/lepton
LSM6DS3_DIR=drivers/lsm6ds3
WINC1500_DIR=drivers/winc1500
LIBPDM_DIR=lib/libpdm
TENSORFLOW_DIR=lib/libtf
OMV_BOARD_CONFIG_DIR=$(TOP_DIR)/$(OMV_DIR)/boards/$(TARGET)/
MP_BOARD_CONFIG_DIR=$(TOP_DIR)/$(MICROPY_DIR)/ports/stm32/boards/$(TARGET)/
MPY_LIB_DIR=$(TOP_DIR)/../scripts/libraries
@ -109,8 +108,8 @@ CFLAGS += $(OMV_BOARD_EXTRA_CFLAGS)
ST_CFLAGS += -I. -Iinclude
ST_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include/
ST_CFLAGS += -I$(TOP_DIR)/$(CMSIS_DIR)/include/st
ST_CFLAGS += -I$(TOP_DIR)/$(STHAL_DIR)/include/
ST_CFLAGS += -I$(TOP_DIR)/$(STHAL_DIR)/include/Legacy/
ST_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/include/
ST_CFLAGS += -I$(TOP_DIR)/$(HAL_DIR)/include/Legacy/
MP_CFLAGS += -I$(BUILD)/$(MICROPY_DIR)/
MP_CFLAGS += -I$(TOP_DIR)/$(MICROPY_DIR)/
@ -163,7 +162,7 @@ OMV_CFLAGS += -I$(TOP_DIR)/$(OMV_DIR)/img/
OMV_CFLAGS += -I$(OMV_BOARD_CONFIG_DIR)
OMV_CFLAGS += -I$(TOP_DIR)/$(LEPTON_DIR)/include/
OMV_CFLAGS += -I$(TOP_DIR)/$(MLX_DIR)/include/
OMV_CFLAGS += -I$(TOP_DIR)/$(ST_DIR)/include/
OMV_CFLAGS += -I$(TOP_DIR)/$(LSM6DS3_DIR)/include/
OMV_CFLAGS += -I$(TOP_DIR)/$(TENSORFLOW_DIR)/$(CPU)/
OMV_CFLAGS += -I$(TOP_DIR)/$(WINC1500_DIR)/include/
OMV_CFLAGS += -I$(TOP_DIR)/$(LIBPDM_DIR)/
@ -212,11 +211,11 @@ ifeq ($(CUBEAI),)
FIRM_OBJ += $(wildcard $(BUILD)/$(CMSIS_DIR)/src/nn/ConvolutionFunctions/*.o)
endif
FIRM_OBJ += $(wildcard $(BUILD)/$(STHAL_DIR)/src/*.o)
FIRM_OBJ += $(wildcard $(BUILD)/$(HAL_DIR)/src/*.o)
FIRM_OBJ += $(wildcard $(BUILD)/$(LEPTON_DIR)/src/*.o)
FIRM_OBJ += $(wildcard $(BUILD)/$(MLX_DIR)/src/*.o)
ifeq ($(MICROPY_PY_IMU), 1)
FIRM_OBJ += $(wildcard $(BUILD)/$(ST_DIR)/src/*.o)
FIRM_OBJ += $(wildcard $(BUILD)/$(LSM6DS3_DIR)/src/*.o)
endif
ifeq ($(MICROPY_PY_WINC1500), 1)
FIRM_OBJ += $(wildcard $(BUILD)/$(WINC1500_DIR)/src/*.o)
@ -566,7 +565,7 @@ FIRM_OBJ += $(wildcard $(TOP_DIR)/$(TENSORFLOW_DIR)/$(CPU)/*.a)
# Bootloader object files
BOOT_OBJ += $(wildcard $(BUILD)/$(BOOTLDR_DIR)/src/*.o)
BOOT_OBJ += $(wildcard $(BUILD)/$(STHAL_DIR)/src/*.o)
BOOT_OBJ += $(wildcard $(BUILD)/$(HAL_DIR)/src/*.o)
BOOT_OBJ += $(addprefix $(BUILD)/$(CMSIS_DIR)/src/st/,\
$(STARTUP).o \
system_stm32fxxx.o \
@ -574,7 +573,7 @@ BOOT_OBJ += $(addprefix $(BUILD)/$(CMSIS_DIR)/src/st/,\
# UVC object files
UVC_OBJ += $(wildcard $(BUILD)/$(UVC_DIR)/src/*.o)
UVC_OBJ += $(wildcard $(BUILD)/$(STHAL_DIR)/src/*.o)
UVC_OBJ += $(wildcard $(BUILD)/$(HAL_DIR)/src/*.o)
UVC_OBJ += $(addprefix $(BUILD)/$(CMSIS_DIR)/src/st/,\
$(STARTUP).o \
system_stm32fxxx.o \
@ -613,7 +612,7 @@ UVC_OBJ += $(addprefix $(BUILD)/$(OMV_DIR)/img/,\
UVC_OBJ += $(wildcard $(BUILD)/$(LEPTON_DIR)/src/*.o)
UVC_OBJ += $(wildcard $(BUILD)/$(MLX_DIR)/src/*.o)
ifeq ($(MICROPY_PY_IMU), 1)
UVC_OBJ += $(wildcard $(BUILD)/$(ST_DIR)/src/*.o)
UVC_OBJ += $(wildcard $(BUILD)/$(LSM6DS3_DIR)/src/*.o)
endif
###################################################
@ -646,12 +645,12 @@ $(FW_DIR):
FIRMWARE_OBJS: | $(BUILD) $(FW_DIR)
$(MAKE) -C $(CMSIS_DIR) BUILD=$(BUILD)/$(CMSIS_DIR) CFLAGS="$(CFLAGS) -fno-strict-aliasing -MMD"
$(MAKE) -C $(STHAL_DIR) BUILD=$(BUILD)/$(STHAL_DIR) CFLAGS="$(CFLAGS) -MMD"
$(MAKE) -C $(HAL_DIR) BUILD=$(BUILD)/$(HAL_DIR) CFLAGS="$(CFLAGS) -MMD"
$(MAKE) -C $(MICROPY_DIR)/ports/stm32 BUILD=$(BUILD)/$(MICROPY_DIR) $(MICROPY_ARGS)
$(MAKE) -C $(LEPTON_DIR) BUILD=$(BUILD)/$(LEPTON_DIR) CFLAGS="$(CFLAGS) -MMD"
$(MAKE) -C $(MLX_DIR) BUILD=$(BUILD)/$(MLX_DIR) CFLAGS="$(CFLAGS) -MMD"
ifeq ($(MICROPY_PY_IMU), 1)
$(MAKE) -C $(ST_DIR) BUILD=$(BUILD)/$(ST_DIR) CFLAGS="$(CFLAGS) -MMD"
$(MAKE) -C $(LSM6DS3_DIR) BUILD=$(BUILD)/$(LSM6DS3_DIR) CFLAGS="$(CFLAGS) -MMD"
endif
ifeq ($(MICROPY_PY_WINC1500), 1)
$(MAKE) -C $(WINC1500_DIR) BUILD=$(BUILD)/$(WINC1500_DIR) CFLAGS="$(CFLAGS) -MMD"

Some files were not shown because too many files have changed in this diff Show More