From c65656eb56e85632fae4a8b5b29d2075a819b764 Mon Sep 17 00:00:00 2001
From: "Peter D. Gray" <peter@conalgo.com>
Date: Fri, 14 Jan 2022 14:24:33 -0500
Subject: [PATCH] Removed submod

---
 stm32/mk4-bootloader/Makefile   | 17 ++++++-----------
 stm32/mk4-bootloader/hal        |  1 -
 stm32/mk4-bootloader/hal_glue.c | 10 +++++++++-
 3 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 160000 stm32/mk4-bootloader/hal

diff --git a/stm32/mk4-bootloader/Makefile b/stm32/mk4-bootloader/Makefile
index 0fb983c8..f1e46e32 100644
--- a/stm32/mk4-bootloader/Makefile
+++ b/stm32/mk4-bootloader/Makefile
@@ -20,6 +20,9 @@ MPY_TOP = ../../external/micropython
 PYTHON_MAKE_DFU = $(MPY_TOP)/tools/dfu.py
 PYTHON_DO_DFU = $(MPY_TOP)/tools/pydfu.py
 
+# Headers for chip stuff (stm32 family)
+STM32LIB_PATH = ../../external/micropython/lib
+
 # Basename of all targets
 TARGET_NAME = bootloader
 
@@ -36,14 +39,9 @@ OBJS += stm32l4xx_hal_rcc.o stm32l4xx_hal_rcc_ex.o
 OBJS += stm32l4xx_hal_hash.o stm32l4xx_hal_ospi.o stm32l4xx_hal_i2c.o
 OBJS += stm32l4xx_hal_sd.o stm32l4xx_ll_sdmmc.o
 
-#OBJS = $(addsuffix .o, $(basename $(C_SRCS) $(ASM_SRCS)))
-
 # Turn off some suprious warnings
 micro-ecc/uECC.o: c_flags += -Wno-undef -Wno-redundant-decls
 
-# Headers for chip stuff (assumes STM32L476 chip)
-#STM32LIB_PATH = ../../external/micropython/lib
-
 # Where we will end up in the memory map (at start of flash)
 # - reserve last 8k flash page for other purposes
 BL_FLASH_BASE = 0x08000000
@@ -77,12 +75,9 @@ CFLAGS += -D BL_NVROM_BASE=$(BL_NVROM_BASE) -D BL_NVROM_SIZE=$(BL_NVROM_SIZE)
 CFLAGS += -D BL_SRAM_BASE=$(BL_SRAM_BASE) -D BL_SRAM_SIZE=$(BL_SRAM_SIZE) 
 
 # Header file search path
-#INC_PATHS = $(STM32LIB_PATH)/stm32lib/CMSIS/STM32L4xx/Include \
-#			$(STM32LIB_PATH)/stm32lib/STM32L4xx_HAL_Driver/Inc \
-#			$(STM32LIB_PATH)/cmsis/inc
-INC_PATHS = hal/Drivers/CMSIS/Device/ST/STM32L4xx/Include \
-			hal/Drivers/STM32L4xx_HAL_Driver/Inc \
-			hal/Drivers/CMSIS/Include
+INC_PATHS = $(STM32LIB_PATH)/stm32lib/CMSIS/STM32L4xx/Include \
+			$(STM32LIB_PATH)/stm32lib/STM32L4xx_HAL_Driver/Inc \
+			$(STM32LIB_PATH)/cmsis/inc
 
 CFLAGS += $(foreach INC,$(INC_PATHS),-I$(INC))
 
diff --git a/stm32/mk4-bootloader/hal b/stm32/mk4-bootloader/hal
deleted file mode 160000
index 5e1553e0..00000000
--- a/stm32/mk4-bootloader/hal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5e1553e07706491bd11f4edd304e093b6e4b83a4
diff --git a/stm32/mk4-bootloader/hal_glue.c b/stm32/mk4-bootloader/hal_glue.c
index be10cac4..a3aa6adb 100644
--- a/stm32/mk4-bootloader/hal_glue.c
+++ b/stm32/mk4-bootloader/hal_glue.c
@@ -1,3 +1,11 @@
+/*
+ * (c) Copyright 2022 by Coinkite Inc. This file is covered by license found in COPYING-CC.
+ *
+ * hal_glue.c
+ *
+ * Patches, work arounds and similar for HAL of STM32 library.
+ *
+ */
 #include "stm32l4xx_hal.h"
 
 // HAL support garbage
@@ -184,4 +192,4 @@ __weak void HAL_SDEx_DriveTransceiver_1_8V_Callback(FlagStatus status)
     // unused?
 }
 
-
+// EOF