Skip to content

Commit 4a23a01

Browse files
dpgeorgedpgeorge
committed
cc3200: Add explicit py/ path-prefix for py includes.
This is how it should be, so one knows exactly where the includes are coming from.
1 parent eff359e commit 4a23a01

36 files changed

+64
-179
lines changed

‎cc3200/application.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ APP_INC += -Isimplelink/oslib
1616
APP_INC += -Itelnet
1717
APP_INC += -Iutil
1818
APP_INC += -Ibootmgr
19-
APP_INC += -I$(PY_SRC)
2019
APP_INC += -I$(BUILD)
2120
APP_INC += -I$(BUILD)/genhdr
2221
APP_INC += -I../lib/fatfs

‎cc3200/boards/cc3200_prefix.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030
#include <stdio.h>
3131
#include <stdint.h>
3232

33-
#include "mpconfig.h"
34-
#include "misc.h"
35-
#include "qstr.h"
36-
#include "obj.h"
33+
#include "py/mpconfig.h"
34+
#include "py/obj.h"
3735
#include "inc/hw_types.h"
3836
#include "inc/hw_memmap.h"
3937
#include "pybpin.h"

‎cc3200/bootmgr/bootloader.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ BOOT_INC += -Isimplelink/oslib
1010
BOOT_INC += -Iutil
1111
BOOT_INC += -I..
1212
BOOT_INC += -I.
13-
BOOT_INC += -I$(PY_SRC)
1413
BOOT_INC += -I$(BUILD)
1514

1615
BOOT_CPPDEFINES = -Dgcc -DBOOTLOADER -DTARGET_IS_CC3200 -DSL_TINY
@@ -120,4 +119,3 @@ $(HEADER_BUILD)/qstrdefs.generated.h: | $(HEADER_BUILD)
120119
# Create an empty "py-version.h" needed by py/mkrules.mk
121120
$(HEADER_BUILD)/py-version.h: | $(HEADER_BUILD)
122121
touch $@
123-

‎cc3200/fatfs/src/diskio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <stdint.h>
1010
#include <stdbool.h>
1111

12-
#include "mpconfig.h"
12+
#include "py/mpconfig.h"
1313
#include "diskio.h" /* FatFs lower layer API */
1414
#include "sflash_diskio.h" /* Serial flash disk IO API */
1515
#if MICROPY_HW_HAS_SDCARD

‎cc3200/fatfs/src/drivers/sd_diskio.c‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,8 @@
3737
//*****************************************************************************
3838
#include <stdbool.h>
3939

40-
#include "mpconfig.h"
40+
#include "py/mpconfig.h"
4141
#include MICROPY_HAL_H
42-
#include "misc.h"
43-
#include "nlr.h"
44-
#include "qstr.h"
45-
#include "obj.h"
46-
#include "objtuple.h"
47-
#include "objlist.h"
48-
#include "runtime.h"
4942
#include "hw_types.h"
5043
#include "hw_memmap.h"
5144
#include "hw_ints.h"

‎cc3200/fatfs/src/drivers/sflash_diskio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <stdbool.h>
33
#include "std.h"
44

5-
#include "mpconfig.h"
5+
#include "py/mpconfig.h"
66
#include MICROPY_HAL_H
77
#include "simplelink.h"
88
#include "diskio.h"

‎cc3200/fatfs/src/ffconf.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
#include <string.h>
2828
#include <std.h>
2929

30-
#include "mpconfig.h"
31-
#include "misc.h"
32-
#include "qstr.h"
33-
#include "obj.h"
30+
#include "py/mpconfig.h"
31+
#include "py/misc.h"
3432
#include "ff.h"
3533
#include "ffconf.h"
3634
#include "diskio.h"

‎cc3200/fatfs/src/ffconf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/---------------------------------------------------------------------------*/
44

55
#include <stdint.h>
6-
#include "mpconfig.h"
6+
#include "py/mpconfig.h"
77
#include "FreeRTOS.h"
88
#include "task.h"
99
#include "semphr.h"

‎cc3200/fatfs/src/option/syscall.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
/* (C)ChaN, 2014 */
44
/*------------------------------------------------------------------------*/
55

6-
#include "mpconfig.h"
6+
#include "py/mpconfig.h"
77
#include MICROPY_HAL_H
8-
#include "misc.h"
9-
#include "nlr.h"
10-
#include "qstr.h"
11-
#include "obj.h"
128
#include "ff.h"
139

1410

‎cc3200/ftp/ftp.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,9 @@
2828
#include <ctype.h>
2929
#include <std.h>
3030

31-
#include "mpconfig.h"
31+
#include "py/mpconfig.h"
3232
#include MICROPY_HAL_H
33-
#include "misc.h"
34-
#include "nlr.h"
35-
#include "qstr.h"
36-
#include "obj.h"
33+
#include "py/obj.h"
3734
#include "osi.h"
3835
#include "inc/hw_types.h"
3936
#include "inc/hw_ints.h"

0 commit comments

Comments
 (0)