From cbb0f31e1914164ab57871c270871d8e8202fb6a Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Sat, 15 Jun 2019 22:29:05 +0200
Subject: [PATCH] fix(bootloader): remove old makefile, fix .gdbinit

---
 bootloader/.gdbinit |   2 +-
 bootloader/Makefile | 132 --------------------------------------------
 2 files changed, 1 insertion(+), 133 deletions(-)
 delete mode 100644 bootloader/Makefile

diff --git a/bootloader/.gdbinit b/bootloader/.gdbinit
index 85b92cf79..6f3712683 100644
--- a/bootloader/.gdbinit
+++ b/bootloader/.gdbinit
@@ -1,3 +1,3 @@
-file build/max32665.elf
+file ../build/bootloader/bootloader.elf
 target remote localhost:3333
 
diff --git a/bootloader/Makefile b/bootloader/Makefile
deleted file mode 100644
index 65d7b58b8..000000000
--- a/bootloader/Makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-################################################################################
- # Copyright (C) 2017 Maxim Integrated Products, Inc., All Rights Reserved.
- #
- # Permission is hereby granted, free of charge, to any person obtaining a
- # copy of this software and associated documentation files (the "Software"),
- # to deal in the Software without restriction, including without limitation
- # the rights to use, copy, modify, merge, publish, distribute, sublicense,
- # and/or sell copies of the Software, and to permit persons to whom the
- # Software is furnished to do so, subject to the following conditions:
- #
- # The above copyright notice and this permission notice shall be included
- # in all copies or substantial portions of the Software.
- #
- # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- # IN NO EVENT SHALL MAXIM INTEGRATED BE LIABLE FOR ANY CLAIM, DAMAGES
- # OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- # OTHER DEALINGS IN THE SOFTWARE.
- #
- # Except as contained in this notice, the name of Maxim Integrated
- # Products, Inc. shall not be used except as stated in the Maxim Integrated
- # Products, Inc. Branding Policy.
- #
- # The mere transfer of this software does not imply any licenses
- # of trade secrets, proprietary technology, copyrights, patents,
- # trademarks, maskwork rights, or any other form of intellectual
- # property whatsoever. Maxim Integrated Products, Inc. retains all
- # ownership rights.
- #
- # $Date: 2018-08-10 21:35:48 +0000 (Fri, 10 Aug 2018) $ 
- # $Revision: 36863 $
- #
- ###############################################################################
-
-# This is the name of the build output file
-ifeq "$(PROJECT)" ""
-PROJECT=max32665
-endif
-
-# Specify the target processor
-ifeq "$(TARGET)" ""
-TARGET=MAX32665
-endif
-
-# Create Target name variables
-TARGET_UC:=$(shell echo $(TARGET) | tr a-z A-Z)
-TARGET_LC:=$(shell echo $(TARGET) | tr A-Z a-z)
-
-# Select 'GCC' or 'IAR' compiler
-COMPILER=GCC
-
-# Specify the board used
-ifeq "$(BOARD)" ""
-#BOARD=EvKit_V1
-BOARD=card10
-endif
-
-# This is the path to the CMSIS root directory
-ifeq "$(MAXIM_PATH)" ""
-LIBS_DIR=../lib/sdk/Libraries
-else
-LIBS_DIR=/$(subst \,/,$(subst :,,$(MAXIM_PATH))/Firmware/$(TARGET_UC)/Libraries)
-endif
-CMSIS_ROOT=$(LIBS_DIR)/CMSIS
-
-# Source files for this test (add path to VPATH below)
-SRCS  = main.c
-SRCS += mscmem.c
-SRCS += bootloader-usb.c
-SRCS += crc16-ccitt.c
-SRCS += ../lib/card10/mx25lba.c
-
-# Where to find source files for this test
-VPATH = . 
-
-# Where to find header files for this test
-IPATH = .
-
-IPATH += ../lib/card10
-VPATH += ../lib/card10
-
-# Enable assertion checking for development
-PROJ_CFLAGS+=-DMXC_ASSERT_ENABLE
-
-# Specify the target revision to override default
-# "A2" in ASCII
-# TARGET_REV=0x4132
-
-# Use this variables to specify and alternate tool path
-#TOOL_DIR=/opt/gcc-arm-none-eabi-4_8-2013q4/bin
-
-# Use these variables to add project specific tool options
-#PROJ_CFLAGS+=--specs=nano.specs
-#PROJ_LDFLAGS+=--specs=nano.specs
-
-# Point this variable to a startup file to override the default file
-#STARTUPFILE=start.S
-
-# Set MXC_OPTIMIZE to override the default optimization level
-#MXC_OPTIMIZE_CFLAGS=-Og
-
-# Point this variable to a linker file to override the default file
-LINKERFILE=$(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/GCC/$(TARGET_LC)_boot.ld
-
-################################################################################
-# Include external library makefiles here
-
-# Include the BSP
-BOARD_DIR=$(LIBS_DIR)/Boards/$(BOARD)
-include $(BOARD_DIR)/board.mk
-
-# Include the peripheral driver
-PERIPH_DRIVER_DIR=$(LIBS_DIR)/$(TARGET_UC)PeriphDriver
-include $(PERIPH_DRIVER_DIR)/periphdriver.mk
-
-#include the FAT32 libraries
-FAT32_DRIVER_DIR=../lib/ff13
-include $(FAT32_DRIVER_DIR)/fat32.mk
-
-MAXUSB_DIR=$(LIBS_DIR)/MAXUSB
-include $(MAXUSB_DIR)/maxusb.mk
-
-################################################################################
-# Include the rules for building for this target. All other makefiles should be
-# included before this one.
-include $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/$(COMPILER)/$(TARGET_LC).mk
-
-# The rule to clean out all the build products.
-distclean: clean
-	$(MAKE) -C ${PERIPH_DRIVER_DIR} clean
-- 
GitLab