From e99ff703dc7dc085edea6159de330ccadcbee354 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Sun, 1 Sep 2019 15:11:09 +0700
Subject: [PATCH] more lpc51u68 driver clean up

---
 hw/bsp/lpcxpresso51u68/board.mk | 22 ++++++++++++----------
 hw/mcu/nxp/lpc_driver           |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/hw/bsp/lpcxpresso51u68/board.mk b/hw/bsp/lpcxpresso51u68/board.mk
index 9a927918..fe150ddd 100644
--- a/hw/bsp/lpcxpresso51u68/board.mk
+++ b/hw/bsp/lpcxpresso51u68/board.mk
@@ -9,24 +9,26 @@ CFLAGS += \
   -DCFG_TUSB_MEM_SECTION='__attribute__((section(".data")))' \
   -DCFG_TUSB_MEM_ALIGN='__attribute__((aligned(64)))' 
 
+MCU_DIR = hw/mcu/nxp/lpc_driver/lpc51u6x/devices/LPC51U68
+
 # All source paths should be relative to the top level.
-LD_FILE = hw/mcu/nxp/lpc_driver/lpc51u6x/devices/LPC51U68/gcc/LPC51U68_flash.ld
+LD_FILE = $(MCU_DIR)/gcc/LPC51U68_flash.ld
 
 SRC_C += \
-	hw/mcu/nxp/lpc_driver/lpc51u6x/devices/LPC51U68/system_LPC51U68.c \
-	hw/mcu/nxp/lpc_driver/lpc51u6x/drivers/fsl_clock.c \
-	hw/mcu/nxp/lpc_driver/lpc51u6x/drivers/fsl_gpio.c \
-	hw/mcu/nxp/lpc_driver/lpc51u6x/drivers/fsl_power.c \
-	hw/mcu/nxp/lpc_driver/lpc51u6x/drivers/fsl_reset.c
+	$(MCU_DIR)/system_LPC51U68.c \
+	$(MCU_DIR)/drivers/fsl_clock.c \
+	$(MCU_DIR)/drivers/fsl_gpio.c \
+	$(MCU_DIR)/drivers/fsl_power.c \
+	$(MCU_DIR)/drivers/fsl_reset.c
 
 INC += \
 	$(TOP)/hw/mcu/nxp/lpc_driver/lpc51u6x/CMSIS/Include \
-	$(TOP)/hw/mcu/nxp/lpc_driver/lpc51u6x/devices/LPC51U68 \
-	$(TOP)/hw/mcu/nxp/lpc_driver/lpc51u6x/drivers
+	$(TOP)/$(MCU_DIR) \
+	$(TOP)/$(MCU_DIR)/drivers
 
-SRC_S += hw/mcu/nxp/lpc_driver/lpc51u6x/devices/LPC51U68/gcc/startup_LPC51U68.S
+SRC_S += $(MCU_DIR)/gcc/startup_LPC51U68.S
 
-LIBS += $(TOP)/hw/mcu/nxp/lpc_driver/lpc51u6x/devices/LPC51U68/gcc/libpower.a
+LIBS += $(TOP)/$(MCU_DIR)/gcc/libpower.a
 
 # For TinyUSB port source
 VENDOR = nxp
diff --git a/hw/mcu/nxp/lpc_driver b/hw/mcu/nxp/lpc_driver
index 7bada68d..6634dc80 160000
--- a/hw/mcu/nxp/lpc_driver
+++ b/hw/mcu/nxp/lpc_driver
@@ -1 +1 @@
-Subproject commit 7bada68d143a17c2a60197f469e56ad60ef2357d
+Subproject commit 6634dc80d48ca461df46dc593e9c39f467f62329