Skip to content
This repository was archived by the owner on Oct 28, 2023. It is now read-only.

Commit 5387d95

Browse files
basvsbasvs
authored
Merge pull request SHA2017-badge#217 from SHA2017-badge/basvs-merge-upstream
Merge upstream
2 parents ea09061 + ded5c5e commit 5387d95

File tree

482 files changed

+1298
-1225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

482 files changed

+1298
-1225
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ before_script:
2020
# For teensy build
2121
- sudo apt-get install realpath
2222
# For coverage testing
23-
- sudo pip install cpp-coveralls
23+
# cpp-coveralls 0.4 conflicts with urllib3 preinstalled in Travis VM
24+
- sudo pip install cpp-coveralls==0.3.12
2425
- gcc --version
2526
- arm-none-eabi-gcc --version
2627
- python3 --version

‎bare-arm/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ include ../py/mkenv.mk
44
QSTR_DEFS = qstrdefsport.h
55

66
# include py core make definitions
7-
include ../py/py.mk
7+
include $(TOP)/py/py.mk
88

99
CROSS_COMPILE = arm-none-eabi-
1010

1111
INC += -I.
12-
INC += -I..
12+
INC += -I$(TOP)
1313
INC += -I$(BUILD)
1414

1515
CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
@@ -45,4 +45,4 @@ $(BUILD)/firmware.elf: $(OBJ)
4545
$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
4646
$(Q)$(SIZE) $@
4747

48-
include ../py/mkrules.mk
48+
include $(TOP)/py/mkrules.mk

‎bare-arm/mpconfigport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <stdint.h>
22

3-
// options to control how Micro Python is built
3+
// options to control how MicroPython is built
44

55
#define MICROPY_QSTR_BYTES_IN_HASH (1)
66
#define MICROPY_ALLOC_PATH_MAX (512)

‎cc3200/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ifeq ($(BTARGET), application)
3434
# qstr definitions (must come before including py.mk)
3535
QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
3636
# include MicroPython make definitions
37-
include ../py/py.mk
37+
include $(TOP)/py/py.mk
3838
include application.mk
3939
else
4040
ifeq ($(BTARGET), bootloader)
@@ -45,7 +45,7 @@ endif
4545
endif
4646

4747
# always include MicroPython make rules
48-
include ../py/mkrules.mk
48+
include $(TOP)/py/mkrules.mk
4949

5050
erase:
5151
cc3200tool -p $(PORT) format_flash --size $(FLASH_SIZE_$(BOARD))

‎cc3200/application.lds

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* This file is part of the Micro Python project, http://micropython.org/
2+
* This file is part of the MicroPython project, http://micropython.org/
33
*
44
* The MIT License (MIT)
55
*
@@ -37,7 +37,7 @@ ENTRY(ResetISR)
3737

3838
SECTIONS
3939
{
40-
/* place the FreeRTOS heap (the micropython stack will live here) */
40+
/* place the FreeRTOS heap (the MicroPython stack will live here) */
4141
.rtos_heap (NOLOAD) :
4242
{
4343
. = ALIGN(8);
@@ -83,7 +83,7 @@ SECTIONS
8383
} > SRAM
8484

8585
/* place here functions that are only called during boot up, */
86-
/* that way, we can re-use this area for the micropython heap */
86+
/* that way, we can re-use this area for the MicroPython heap */
8787
.boot :
8888
{
8989
. = ALIGN(8);
@@ -93,7 +93,7 @@ SECTIONS
9393
_eboot = .;
9494
} > SRAM
9595

96-
/* allocate the micropython heap */
96+
/* allocate the MicroPython heap */
9797
.heap :
9898
{
9999
. = ALIGN(8);

‎cc3200/application.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_INC = -I.
2-
APP_INC += -I..
2+
APP_INC += -I$(TOP)
33
APP_INC += -Ifatfs/src
44
APP_INC += -Ifatfs/src/drivers
55
APP_INC += -IFreeRTOS
@@ -10,15 +10,15 @@ APP_INC += -Ihal
1010
APP_INC += -Ihal/inc
1111
APP_INC += -Imisc
1212
APP_INC += -Imods
13-
APP_INC += -I../drivers/cc3100/inc
13+
APP_INC += -I$(TOP)/drivers/cc3100/inc
1414
APP_INC += -Isimplelink
1515
APP_INC += -Isimplelink/oslib
1616
APP_INC += -Itelnet
1717
APP_INC += -Iutil
1818
APP_INC += -Ibootmgr
1919
APP_INC += -I$(BUILD)
2020
APP_INC += -I$(BUILD)/genhdr
21-
APP_INC += -I../stmhal
21+
APP_INC += -I$(TOP)/stmhal
2222

2323
APP_CPPDEFINES = -Dgcc -DTARGET_IS_CC3200 -DSL_FULL -DUSE_FREERTOS
2424

‎cc3200/boards/LAUNCHXL/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* This file is part of the Micro Python project, http://micropython.org/
2+
* This file is part of the MicroPython project, http://micropython.org/
33
*
44
* The MIT License (MIT)
55
*

‎cc3200/boards/WIPY/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* This file is part of the Micro Python project, http://micropython.org/
2+
* This file is part of the MicroPython project, http://micropython.org/
33
*
44
* The MIT License (MIT)
55
*

‎cc3200/boards/cc3200_prefix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* This file is part of the Micro Python project, http://micropython.org/
2+
* This file is part of the MicroPython project, http://micropython.org/
33
*
44
* The MIT License (MIT)
55
*

‎cc3200/bootmgr/bootloader.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ BOOT_INC = -Ibootmgr
44
BOOT_INC += -Ibootmgr/sl
55
BOOT_INC += -Ihal
66
BOOT_INC += -Ihal/inc
7-
BOOT_INC += -I../drivers/cc3100/inc
7+
BOOT_INC += -I$(TOP)/drivers/cc3100/inc
88
BOOT_INC += -Imisc
99
BOOT_INC += -Imods
1010
BOOT_INC += -Isimplelink
1111
BOOT_INC += -Isimplelink/oslib
1212
BOOT_INC += -Iutil
13-
BOOT_INC += -I..
13+
BOOT_INC += -I$(TOP)
1414
BOOT_INC += -I.
1515
BOOT_INC += -I$(BUILD)
1616

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy