lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dartuino][bootloader] Changes as per code review.

Browse Source
This commit is contained in:
Gurjant Kalsi
2016-03-11 12:58:39 -08:00
parent b28f754f78
commit 7dd294a62d
16 changed files with 118 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
target/dartuinoP0/bootloader/bootloader_stubs.c → target/dartuinoP0/projects/bootloader/bootloader_stubs.c
View File

@@ -1,5 +1,6 @@
/*
* Copyright (c) 2016 Gurjant Kalsi <me@gurjantkalsi.com>
* Copyright 2016 Google Inc. All Rights Reserved.
* Author: gkalsi@google.com (Gurjant Kalsi)
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files
@@ -30,7 +31,8 @@ static char bootloader_mount_point[] = "/spifs";
#include <app/moot/stubs.h>
#include <stdio.h>
#define BOOTLOADER_LENGTH_KB (64)
#define BOOTLOADER_SIZE_KB (64)
#define SYSTEM_FLASH_SIZE_KB (1024)
status_t moot_mount_default_fs(char **mount_path, char **device_name)
{
@@ -42,8 +44,8 @@ status_t moot_mount_default_fs(char **mount_path, char **device_name)
const moot_sysinfo_t moot_system_info = {
.sys_base_addr = 0x00210000,
.btldr_offset = 0x0,
.bootloader_len = 1024 * BOOTLOADER_LENGTH_KB,
.system_offset = 1024 * BOOTLOADER_LENGTH_KB,
.system_len = (1024 * (1024 - BOOTLOADER_LENGTH_KB)),
.bootloader_len = 1024 * BOOTLOADER_SIZE_KB,
.system_offset = 1024 * BOOTLOADER_SIZE_KB,
.system_len = (1024 * (SYSTEM_FLASH_SIZE_KB - BOOTLOADER_SIZE_KB)),
.system_flash_name = bootloader_primary_flash_name,
};

0
target/dartuinoP0/bootloader/rules.mk → target/dartuinoP0/projects/bootloader/rules.mk
View File

8
target/dartuinoP0/projects/system/rules.mk Normal file
View File

@@ -0,0 +1,8 @@
LOCAL_DIR := $(GET_LOCAL_DIR)
MODULE := $(LOCAL_DIR)
MODULE_SRCS += \
$(LOCAL_DIR)/system_stubs.c
include make/module.mk

28
target/dartuinoP0/projects/system/system_stubs.c Normal file
View File

@@ -0,0 +1,28 @@
/*
* Copyright 2016 Google Inc. All Rights Reserved.
* Author: gkalsi@google.com (Gurjant Kalsi)
*
* 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.
*/
void append_usb_interfaces(void)
{
// no-op
}

4
target/dartuinoP0/usb.c
View File

@@ -36,6 +36,8 @@
#define W(w) (w & 0xff), (w >> 8)
#define W3(w) (w & 0xff), ((w >> 8) & 0xff), ((w >> 16) & 0xff)
extern void append_usb_interfaces(void);
/* top level device descriptor */
static const uint8_t dev_descr[] = {
0x12, /* descriptor length */
@@ -98,7 +100,9 @@ usb_config config = {
void target_usb_setup(void)
{
usb_setup(&config);
printf("appending interfaces\n");
append_usb_interfaces();
usb_add_string("LK", 1);
usb_add_string("LK Industries", 2);