diff --git a/hw/bsp/embedded_artists/ea4357/board_ea4357.h b/hw/bsp/embedded_artists/ea4357/board_ea4357.h index 4d61df4e5..e241a2bfd 100644 --- a/hw/bsp/embedded_artists/ea4357/board_ea4357.h +++ b/hw/bsp/embedded_artists/ea4357/board_ea4357.h @@ -51,8 +51,7 @@ #include "lpc43xx_i2c.h" -#include "../oem_base_board/pca9532.h" // LEDs -//#include "../oem_board/nand.h"a +#include "oem_base_board/pca9532.h" // LEDs //#define CFG_PRINTF_TARGET PRINTF_TARGET_SWO diff --git a/hw/bsp/embedded_artists/oem_base_board/acc.c b/hw/bsp/embedded_artists/ea4357/oem_base_board/acc.c similarity index 99% rename from hw/bsp/embedded_artists/oem_base_board/acc.c rename to hw/bsp/embedded_artists/ea4357/oem_base_board/acc.c index a53634980..ad4859356 100644 --- a/hw/bsp/embedded_artists/oem_base_board/acc.c +++ b/hw/bsp/embedded_artists/ea4357/oem_base_board/acc.c @@ -21,7 +21,7 @@ /****************************************************************************** * Includes *****************************************************************************/ -#include "../../board.h" +#include "../../../board.h" #if BOARD == BOARD_EA4357 diff --git a/hw/bsp/embedded_artists/oem_base_board/acc.h b/hw/bsp/embedded_artists/ea4357/oem_base_board/acc.h similarity index 100% rename from hw/bsp/embedded_artists/oem_base_board/acc.h rename to hw/bsp/embedded_artists/ea4357/oem_base_board/acc.h diff --git a/hw/bsp/embedded_artists/oem_base_board/base_eeprom.c b/hw/bsp/embedded_artists/ea4357/oem_base_board/base_eeprom.c similarity index 99% rename from hw/bsp/embedded_artists/oem_base_board/base_eeprom.c rename to hw/bsp/embedded_artists/ea4357/oem_base_board/base_eeprom.c index 7571744a6..f6e60586c 100644 --- a/hw/bsp/embedded_artists/oem_base_board/base_eeprom.c +++ b/hw/bsp/embedded_artists/ea4357/oem_base_board/base_eeprom.c @@ -24,7 +24,7 @@ /****************************************************************************** * Includes *****************************************************************************/ -#include "../../board.h" +#include "../../../board.h" #if BOARD == BOARD_EA4357 diff --git a/hw/bsp/embedded_artists/oem_base_board/base_eeprom.h b/hw/bsp/embedded_artists/ea4357/oem_base_board/base_eeprom.h similarity index 100% rename from hw/bsp/embedded_artists/oem_base_board/base_eeprom.h rename to hw/bsp/embedded_artists/ea4357/oem_base_board/base_eeprom.h diff --git a/hw/bsp/embedded_artists/oem_base_board/lm75a.c b/hw/bsp/embedded_artists/ea4357/oem_base_board/lm75a.c similarity index 99% rename from hw/bsp/embedded_artists/oem_base_board/lm75a.c rename to hw/bsp/embedded_artists/ea4357/oem_base_board/lm75a.c index db8234405..72adcdcd4 100644 --- a/hw/bsp/embedded_artists/oem_base_board/lm75a.c +++ b/hw/bsp/embedded_artists/ea4357/oem_base_board/lm75a.c @@ -24,7 +24,7 @@ /****************************************************************************** * Includes *****************************************************************************/ -#include "../../board.h" +#include "../../../board.h" #if BOARD == BOARD_EA4357 diff --git a/hw/bsp/embedded_artists/oem_base_board/lm75a.h b/hw/bsp/embedded_artists/ea4357/oem_base_board/lm75a.h similarity index 100% rename from hw/bsp/embedded_artists/oem_base_board/lm75a.h rename to hw/bsp/embedded_artists/ea4357/oem_base_board/lm75a.h diff --git a/hw/bsp/embedded_artists/oem_base_board/memreg.c b/hw/bsp/embedded_artists/ea4357/oem_base_board/memreg.c similarity index 99% rename from hw/bsp/embedded_artists/oem_base_board/memreg.c rename to hw/bsp/embedded_artists/ea4357/oem_base_board/memreg.c index 51bcada4b..778b5c86b 100644 --- a/hw/bsp/embedded_artists/oem_base_board/memreg.c +++ b/hw/bsp/embedded_artists/ea4357/oem_base_board/memreg.c @@ -21,7 +21,7 @@ /****************************************************************************** * Includes *****************************************************************************/ -#include "../../board.h" +#include "../../../board.h" #if BOARD == BOARD_EA4357 diff --git a/hw/bsp/embedded_artists/oem_base_board/memreg.h b/hw/bsp/embedded_artists/ea4357/oem_base_board/memreg.h similarity index 100% rename from hw/bsp/embedded_artists/oem_base_board/memreg.h rename to hw/bsp/embedded_artists/ea4357/oem_base_board/memreg.h diff --git a/hw/bsp/embedded_artists/oem_base_board/norflash.c b/hw/bsp/embedded_artists/ea4357/oem_base_board/norflash.c similarity index 99% rename from hw/bsp/embedded_artists/oem_base_board/norflash.c rename to hw/bsp/embedded_artists/ea4357/oem_base_board/norflash.c index 0baf62c49..560161d3d 100644 --- a/hw/bsp/embedded_artists/oem_base_board/norflash.c +++ b/hw/bsp/embedded_artists/ea4357/oem_base_board/norflash.c @@ -21,7 +21,7 @@ /****************************************************************************** * Includes *****************************************************************************/ -#include "../../board.h" +#include "../../../board.h" #if BOARD == BOARD_EA4357 diff --git a/hw/bsp/embedded_artists/oem_base_board/norflash.h b/hw/bsp/embedded_artists/ea4357/oem_base_board/norflash.h similarity index 100% rename from hw/bsp/embedded_artists/oem_base_board/norflash.h rename to hw/bsp/embedded_artists/ea4357/oem_base_board/norflash.h diff --git a/hw/bsp/embedded_artists/oem_base_board/pca9532.c b/hw/bsp/embedded_artists/ea4357/oem_base_board/pca9532.c similarity index 99% rename from hw/bsp/embedded_artists/oem_base_board/pca9532.c rename to hw/bsp/embedded_artists/ea4357/oem_base_board/pca9532.c index 05e73cc2e..5390f6e0b 100644 --- a/hw/bsp/embedded_artists/oem_base_board/pca9532.c +++ b/hw/bsp/embedded_artists/ea4357/oem_base_board/pca9532.c @@ -24,7 +24,7 @@ /****************************************************************************** * Includes *****************************************************************************/ -#include "../../board.h" +#include "../../../board.h" #if BOARD == BOARD_EA4357 diff --git a/hw/bsp/embedded_artists/oem_base_board/pca9532.h b/hw/bsp/embedded_artists/ea4357/oem_base_board/pca9532.h similarity index 100% rename from hw/bsp/embedded_artists/oem_base_board/pca9532.h rename to hw/bsp/embedded_artists/ea4357/oem_base_board/pca9532.h diff --git a/hw/bsp/embedded_artists/oem_base_board/uda1380.c b/hw/bsp/embedded_artists/ea4357/oem_base_board/uda1380.c similarity index 99% rename from hw/bsp/embedded_artists/oem_base_board/uda1380.c rename to hw/bsp/embedded_artists/ea4357/oem_base_board/uda1380.c index 654e4eb9a..1168bb8b6 100644 --- a/hw/bsp/embedded_artists/oem_base_board/uda1380.c +++ b/hw/bsp/embedded_artists/ea4357/oem_base_board/uda1380.c @@ -1,4 +1,4 @@ -#include "../../board.h" +#include "../../../board.h" #if BOARD == BOARD_EA4357 diff --git a/hw/bsp/embedded_artists/oem_base_board/uda1380.h b/hw/bsp/embedded_artists/ea4357/oem_base_board/uda1380.h similarity index 100% rename from hw/bsp/embedded_artists/oem_base_board/uda1380.h rename to hw/bsp/embedded_artists/ea4357/oem_base_board/uda1380.h diff --git a/hw/bsp/microbuilder/board_lpc4357usb.c b/hw/bsp/microbuilder/board_lpc4357usb.c deleted file mode 100644 index 033d9a375..000000000 --- a/hw/bsp/microbuilder/board_lpc4357usb.c +++ /dev/null @@ -1,130 +0,0 @@ -/**************************************************************************/ -/*! - @file board_lpc4357usb.c - @author hathach (tinyusb.org) - - @section LICENSE - - Software License Agreement (BSD License) - - Copyright (c) 2013, hathach (tinyusb.org) - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This file is part of the tinyusb stack. -*/ -/**************************************************************************/ - -#include "../board.h" - -#if BOARD == BOARD_LPC4357USB - -#define BOARD_UART_PORT (LPC_USART0) -#define BOARD_UART_PIN_PORT (0x0F) -#define BOARD_UART_PIN_TX (10) // PF.10 : UART0_TXD -#define BOARD_UART_PIN_RX (11) // PF.11 : UART0_RXD - -#define BOARD_LED0_PORT (0x0C) -#define BOARD_LED0_PIN (2) // PC.2 = User LED -#define BOARD_LED0_FUNCTION (4) // GPIO multiplexed as function 4 on PC.2 -#define BOARD_LED0_GPIO_PORT (6) -#define BOARD_LED0_GPIO_PIN (1) // PC.2 = GPIO 6[1] - -void board_init(void) -{ - CGU_Init(); - - /* Setup the systick time for 1ms ticks */ - SysTick_Config(CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE) / TUSB_CFG_TICKS_HZ); - - /* Configure LED0 as GPIO */ - scu_pinmux(BOARD_LED0_PORT, BOARD_LED0_PIN, MD_PDN, BOARD_LED0_FUNCTION); - GPIO_SetDir(BOARD_LED0_GPIO_PORT, (1 << BOARD_LED0_GPIO_PIN), 1); - - /* Configure TRACE pins */ - scu_pinmux(0xF, 4, MD_PDN, 0x2); /* PF_4 = TRACECLK */ - scu_pinmux(0x7, 4, MD_PDN, 0x5); /* P7_4 = TRACEDATA[0] */ - scu_pinmux(0x7, 5, MD_PDN, 0x5); /* P7_5 = TRACEDATA[1] */ - scu_pinmux(0x7, 6, MD_PDN, 0x5); /* P7_6 = TRACEDATA[2] */ - scu_pinmux(0x7, 7, MD_PDN, 0x5); /* P7_7 = TRACEDATA[3] */ - - // USB0 Power: EA4357 channel B U20 GPIO26 active low (base board), P2_3 on LPC4357 - scu_pinmux(0x2, 3, MD_PUP | MD_EZI, FUNC7); // USB0 VBus Power - - // 1.5Kohm pull-up resistor is needed on the USB DP data signal. GPIO28 (base), P9_5 (LPC4357) controls - //scu_pinmux(0x9, 5, MD_PUP|MD_EZI|MD_ZI, FUNC4); // GPIO5[18] - //GPIO_SetDir(5, BIT_(18), 1); // output - //GPIO_ClearValue(5, BIT_(18)); - - /* Init I2C @ 400kHz */ - I2C_Init(LPC_I2C0, 400000); - I2C_Cmd(LPC_I2C0, ENABLE); - -#if CFG_UART_ENABLE - //------------- UART init -------------// - scu_pinmux(BOARD_UART_PIN_PORT, BOARD_UART_PIN_TX, MD_PDN , FUNC1); - scu_pinmux(BOARD_UART_PIN_PORT, BOARD_UART_PIN_RX, MD_PLN|MD_EZI|MD_ZI, FUNC1); - - UART_CFG_Type UARTConfigStruct; - UART_ConfigStructInit(&UARTConfigStruct); - UARTConfigStruct.Baud_rate = CFG_UART_BAUDRATE; - UARTConfigStruct.Clock_Speed = 0; - - UART_Init(BOARD_UART_PORT, &UARTConfigStruct); - UART_TxCmd(BOARD_UART_PORT, ENABLE); // Enable UART Transmit -#endif -} - -//--------------------------------------------------------------------+ -// LEDS -//--------------------------------------------------------------------+ -void board_leds(uint32_t on_mask, uint32_t off_mask) -{ - if (on_mask & 0x01) - { - LPC_GPIO_PORT->SET[BOARD_LED0_GPIO_PORT] = (1 << BOARD_LED0_GPIO_PIN); - } - - if (off_mask & 0x01) - { - LPC_GPIO_PORT->CLR[BOARD_LED0_GPIO_PORT] = (1 << BOARD_LED0_GPIO_PIN); - } -} - -//--------------------------------------------------------------------+ -// UART -//--------------------------------------------------------------------+ -#if CFG_UART_ENABLE -uint32_t board_uart_send(uint8_t *buffer, uint32_t length) -{ - return UART_Send(BOARD_UART_PORT, buffer, length, BLOCKING); -} - -uint32_t board_uart_recv(uint8_t *buffer, uint32_t length) -{ - return UART_Receive(BOARD_UART_PORT, buffer, length, BLOCKING); -} -#endif - -#endif diff --git a/hw/bsp/microbuilder/board_lpc4357usb.h b/hw/bsp/microbuilder/board_lpc4357usb.h deleted file mode 100644 index 5529dd15c..000000000 --- a/hw/bsp/microbuilder/board_lpc4357usb.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************/ -/*! - @file board_lpc4357usb.h - @author hathach (tinyusb.org) - - @section LICENSE - - Software License Agreement (BSD License) - - Copyright (c) 2013, hathach (tinyusb.org) - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This file is part of the tinyusb stack. -*/ -/**************************************************************************/ - -#ifndef _TUSB_BOARD_LPC4357USB_H_ -#define _TUSB_BOARD_LPC4357USB_H_ - -#ifdef __cplusplus - extern "C" { -#endif - -#include "LPC43xx.h" -#include "lpc43xx_scu.h" -#include "lpc43xx_cgu.h" -#include "lpc43xx_gpio.h" -#include "lpc43xx_uart.h" -#include "lpc43xx_i2c.h" - -#define CFG_PRINTF_TARGET PRINTF_TARGET_SWO -//#define CFG_PRINTF_TARGET PRINTF_TARGET_UART - -#ifdef __cplusplus - } -#endif - -#endif /* _TUSB_BOARD_LPC4357USB_H_ */ diff --git a/hw/bsp/microbuilder/board_lpc4357usb_etminit.ini b/hw/bsp/microbuilder/board_lpc4357usb_etminit.ini deleted file mode 100644 index 67aed412e..000000000 --- a/hw/bsp/microbuilder/board_lpc4357usb_etminit.ini +++ /dev/null @@ -1,31 +0,0 @@ -/*------------------------------------------------------------------- -** Define the function to enable the trace port -**-----------------------------------------------------------------*/ -FUNC void EnableTPIU(void) { - - /* Configure TRACE pins for MCB4357 */ - //_WDWORD(0x40086790, 0x000000B2); // LPC_SCU->SFSPF_4 = 2; - //_WDWORD(0x40086794, 0x000000B3); // LPC_SCU->SFSPF_5 = 3; - //_WDWORD(0x40086798, 0x000000B3); // LPC_SCU->SFSPF_6 = 3; - //_WDWORD(0x4008679C, 0x000000B3); // LPC_SCU->SFSPF_7 = 3; - //_WDWORD(0x400867A0, 0x000000B3); // LPC_SCU->SFSPF_8 = 3; - - /* Configure TRACE pins for LPC4357USB */ - _WDWORD(0x40086790, 0x000000B2); // LPC_SCU->SFSPF_4 = 2 - TRACECLK - _WDWORD(0x40086390, 0x000000B5); // LPC_SCU->SFSP7_4 = 5 - TRACEDATA[0] - _WDWORD(0x40086394, 0x000000B5); // LPC_SCU->SFSP7_5 = 5 - TRACEDATA[1] - _WDWORD(0x40086398, 0x000000B5); // LPC_SCU->SFSP7_6 = 5 - TRACEDATA[2] - _WDWORD(0x4008639C, 0x000000B5); // LPC_SCU->SFSP7_7 = 5 - TRACEDATA[3] -} - -/*------------------------------------------------------------------- -** Invoke the function at debugger startup -**-----------------------------------------------------------------*/ -EnableTPIU(); - -/*------------------------------------------------------------------- -** Execute upon software RESET -**-----------------------------------------------------------------*/ -FUNC void OnResetExec(void) { - EnableTPIU(); -}