Merge branch 'master' into develop

3 files changed, 152 insertions, 0 deletions

diff --git a/hw/bsp/spresense/board.mk b/hw/bsp/spresense/board.mk
new file mode 100644
index 000000000..16421686a
--- /dev/null
+++ b/hw/bsp/spresense/board.mk
@@ -0,0 +1,47 @@
+SPRESENSE_SDK = $(TOP)/hw/mcu/sony/cxd56/spresense-exported-sdk
+
+INC += \
+	$(SPRESENSE_SDK)/nuttx/include \
+	$(SPRESENSE_SDK)/nuttx/arch \
+	$(SPRESENSE_SDK)/nuttx/arch/chip \
+	$(SPRESENSE_SDK)/sdk/bsp/include \
+	$(SPRESENSE_SDK)/sdk/bsp/include/sdk \
+
+CFLAGS += \
+	-DCONFIG_WCHAR_BUILTIN \
+	-DCONFIG_HAVE_DOUBLE \
+	-Dmain=spresense_main \
+	-pipe \
+	-std=gnu11 \
+	-mcpu=cortex-m4 \
+	-mthumb \
+	-mfpu=fpv4-sp-d16 \
+	-mfloat-abi=hard \
+	-mabi=aapcs \
+	-fno-builtin \
+	-fno-strength-reduce \
+	-fomit-frame-pointer \
+	-DCFG_TUSB_MCU=OPT_MCU_CXD56 \
+
+LIBS += \
+	$(SPRESENSE_SDK)/sdk/libs/libapps.a \
+	$(SPRESENSE_SDK)/sdk/libs/libsdk.a \
+
+LD_FILE = hw/mcu/sony/cxd56/spresense-exported-sdk/nuttx/build/ramconfig.ld
+
+LDFLAGS += \
+	-Xlinker --entry=__start \
+	-nostartfiles \
+	-nodefaultlibs \
+	-Wl,--defsym,__stack=_vectors+786432 \
+	-Wl,--gc-sections \
+	-u spresense_main \
+
+# For TinyUSB port source
+VENDOR = sony
+CHIP_FAMILY = cxd56
+
+# flash
+flash: 
+	$(SPRESENSE_SDK)/sdk/tools/linux/mkspk -c 2 $(BUILD)/spresense-firmware.elf nuttx $(BUILD)/spresense-firmware.spk
+	$(SPRESENSE_SDK)/sdk/tools/flash.sh -c /dev/ttyUSB0 $(BUILD)/spresense-firmware.spk
diff --git a/hw/bsp/spresense/board_spresense.c b/hw/bsp/spresense/board_spresense.c
new file mode 100644
index 000000000..256bccd15
--- /dev/null
+++ b/hw/bsp/spresense/board_spresense.c
@@ -0,0 +1,105 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright 2019 Sony Semiconductor Solutions Corporation
+ *
+ * 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 THE
+ * AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#include <sys/boardctl.h>
+#include <nuttx/arch.h>
+#include <arch/board/board.h>
+#include <arch/chip/pin.h>
+
+#include "bsp/board.h"
+
+/*------------------------------------------------------------------*/
+/* MACRO TYPEDEF CONSTANT ENUM
+ *------------------------------------------------------------------*/
+#define LED_PIN         PIN_I2S1_BCK
+
+#define BUTTON_PIN      PIN_HIF_IRQ_OUT
+
+// Initialize on-board peripherals : led, button, uart and USB
+void board_init(void)
+{
+  boardctl(BOARDIOC_INIT, 0);
+
+  board_gpio_write(PIN_I2S1_BCK, -1);
+  board_gpio_config(PIN_I2S1_BCK, 0, false, true, PIN_FLOAT);
+
+  board_gpio_write(PIN_HIF_IRQ_OUT, -1);
+  board_gpio_config(PIN_HIF_IRQ_OUT, 0, true, true, PIN_FLOAT);
+};
+
+//--------------------------------------------------------------------+
+// Board porting API
+//--------------------------------------------------------------------+
+
+// Turn LED on or off
+void board_led_write(bool state)
+{
+  board_gpio_write(LED_PIN, state);
+}
+
+// Get the current state of button
+// a '1' means active (pressed), a '0' means inactive.
+uint32_t board_button_read(void)
+{
+  if (board_gpio_read(BUTTON_PIN)) 
+  {
+    return 0;
+  }
+
+  return 1;
+}
+
+// Get characters from UART
+int board_uart_read(uint8_t *buf, int len)
+{
+  int r = read(0, buf, len);
+
+  return r;
+}
+
+// Send characters to UART
+int board_uart_write(void const *buf, int len)
+{
+  int r = write(1, buf, len);
+
+  return r;
+}
+
+// Get current milliseconds
+uint32_t board_millis(void)
+{
+  struct timespec tp;
+
+    /* Wait until RTC is available */
+    while (g_rtc_enabled == false);
+
+    if (clock_gettime(CLOCK_MONOTONIC, &tp)) 
+    {
+        return 0;
+    }
+
+    return (((uint64_t)tp.tv_sec) * 1000 + tp.tv_nsec / 1000000);
+}
diff --git a/hw/mcu/sony/cxd56/spresense-exported-sdk b/hw/mcu/sony/cxd56/spresense-exported-sdk
new file mode 160000
+Subproject b473b28a14a03f3d416b6e2c071bcfd4fb92cb6