From 6d0f9897b9214f3f4d9da25c6b7f9fdf5494a85c Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Tue, 27 Apr 2021 21:44:35 +1000
Subject: [PATCH] Adding MHP30 to makefile

---
 source/Core/BSP/MHP30/Power.cpp | 14 +-------------
 source/Core/BSP/MHP30/flash.c   |  3 ---
 source/Makefile                 | 11 ++++++++---
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/source/Core/BSP/MHP30/Power.cpp b/source/Core/BSP/MHP30/Power.cpp
index 27384a2c..913b9cf3 100644
--- a/source/Core/BSP/MHP30/Power.cpp
+++ b/source/Core/BSP/MHP30/Power.cpp
@@ -40,16 +40,4 @@ uint8_t usb_pd_detect() {
   return false;
 }
 
-bool getIsPoweredByDCIN() {
-#ifdef MODEL_TS80
-  return false;
-#endif
-
-#ifdef MODEL_TS80P
-  return false;
-#endif
-
-#ifdef MODEL_TS100
-  return true;
-#endif
-}
+bool getIsPoweredByDCIN() { return false; }
diff --git a/source/Core/BSP/MHP30/flash.c b/source/Core/BSP/MHP30/flash.c
index 559fe7c4..c320d687 100644
--- a/source/Core/BSP/MHP30/flash.c
+++ b/source/Core/BSP/MHP30/flash.c
@@ -13,7 +13,6 @@
 static uint16_t settings_page[512] __attribute__((section(".settings_page")));
 
 uint8_t flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
-  return; // TODO
   FLASH_EraseInitTypeDef pEraseInit;
   pEraseInit.TypeErase    = FLASH_TYPEERASE_PAGES;
   pEraseInit.Banks        = FLASH_BANK_1;
@@ -41,7 +40,5 @@ uint8_t flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
 
 void flash_read_buffer(uint8_t *buffer, const uint16_t length) {
   memset(buffer, 0, length);
-  return; // TODO
-
   memcpy(buffer, settings_page, length);
 }
diff --git a/source/Makefile b/source/Makefile
index 57273fea..56ba959b 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -29,18 +29,22 @@ MINIWARE_CMSIS_CORE_INC_DIR = ./Core/BSP/Miniware/Vendor/CMSIS/Include
 MINIWARE_HAL_INC_DIR = ./Core/BSP/Miniware/Vendor/STM32F1xx_HAL_Driver/Inc
 MINIWARE_HAL_LEGACY_INC_DIR = ./Core/BSP/Miniware/Vendor/STM32F1xx_HAL_Driver/Inc/Legacy
 MINIWARE_STARTUP_DIR = ./Startup
+MINIWARE_INC_DIR = ./Core/BSP/Miniware
+MINIWARE_LD_FILE = ./Core/BSP/Miniware/stm32f103.ld
+
 MHP30_INC_CMSIS_DEVICE = ./Core/BSP/MHP30/Vendor/CMSIS/Device/ST/STM32F1xx/Include
 MHP30_CMSIS_CORE_INC_DIR = ./Core/BSP/MHP30/Vendor/CMSIS/Include
 MHP30_HAL_INC_DIR = ./Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc
 MHP30_HAL_LEGACY_INC_DIR = ./Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/Legacy
 MHP30_STARTUP_DIR = ./Startup
+MHP30_INC_DIR = ./Core/BSP/MHP30
+MHP30_LD_FILE = ./Core/BSP/MHP30/stm32f103.ld
 
 FRTOS_CMIS_INC_DIR = ./Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS
 FRTOS_INC_DIR = ./Middlewares/Third_Party/FreeRTOS/Source/include
 DRIVER_INC_DIR =./Core/Drivers
 BSP_INC_DIR = ./Core/BSP
 THREADS_INC_DIR = ./Core/Threads
-MINIWARE_INC_DIR = ./Core/BSP/Miniware
 PINE_INC_DIR = ./Core/BSP/Pine64
 PINE_VENDOR_INC_DIR = ./Core/BSP/Pine64/Vendor/SoC/gd32vf103/Common/Include
 PINE_BOARD_INC_DIR = ./Core/BSP/Pine64/Vendor/SoC/gd32vf103/Board/pinecil/Include
@@ -69,7 +73,7 @@ DEVICE_INCLUDES = -I$(MINIWARE_INC_DIR) \
 	-I$(MINIWARE_HAL_LEGACY_INC_DIR)
 DEVICE_BSP_DIR = ./Core/BSP/Miniware
 S_SRCS := $(shell find $(MINIWARE_STARTUP_DIR) -type f -name '*.S')
-LDSCRIPT=stm32f103.ld
+LDSCRIPT=$(MINIWARE_LD_FILE)
 DEV_GLOBAL_DEFS= -D STM32F103T8Ux -D STM32F1 -D STM32 -D USE_HAL_DRIVER -D STM32F103xB -D USE_RTOS_SYSTICK -D GCC_ARMCM3		\
 		-D ARM_MATH_CM3 	\
 		-D STM32F10X_MD 
@@ -87,6 +91,7 @@ CPUFLAGS= -mcpu=cortex-m3     \
 flash_size=64k
 bootldr_size=0x4000
 endif
+
 ifeq ($(model),$(filter $(model),$(ALL_MHP30_MODELS)))
 $(info Building for MHP30 )
 DEVICE_INCLUDES = -I$(MHP30_INC_DIR) \
@@ -96,7 +101,7 @@ DEVICE_INCLUDES = -I$(MHP30_INC_DIR) \
 	-I$(MHP30_HAL_LEGACY_INC_DIR)
 DEVICE_BSP_DIR = ./Core/BSP/MHP30
 S_SRCS := $(shell find $(MHP30_STARTUP_DIR) -type f -name '*.S')
-LDSCRIPT=stm32f103.ld
+LDSCRIPT=$(MHP30_LD_FILE)
 DEV_GLOBAL_DEFS= -D STM32F103T8Ux -D STM32F1 -D STM32 -D USE_HAL_DRIVER -D STM32F103xB -D USE_RTOS_SYSTICK -D GCC_ARMCM3		\
 		-D ARM_MATH_CM3 	\
 		-D STM32F10X_MD