Commit 4a23a019 authored by Damien George's avatar Damien George
Browse files

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.
parent eff359e1
......@@ -16,7 +16,6 @@ APP_INC += -Isimplelink/oslib
APP_INC += -Itelnet
APP_INC += -Iutil
APP_INC += -Ibootmgr
APP_INC += -I$(PY_SRC)
APP_INC += -I$(BUILD)
APP_INC += -I$(BUILD)/genhdr
APP_INC += -I../lib/fatfs
......
......@@ -30,10 +30,8 @@
#include <stdio.h>
#include <stdint.h>
#include "mpconfig.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "py/mpconfig.h"
#include "py/obj.h"
#include "inc/hw_types.h"
#include "inc/hw_memmap.h"
#include "pybpin.h"
......
......@@ -10,7 +10,6 @@ BOOT_INC += -Isimplelink/oslib
BOOT_INC += -Iutil
BOOT_INC += -I..
BOOT_INC += -I.
BOOT_INC += -I$(PY_SRC)
BOOT_INC += -I$(BUILD)
BOOT_CPPDEFINES = -Dgcc -DBOOTLOADER -DTARGET_IS_CC3200 -DSL_TINY
......@@ -120,4 +119,3 @@ $(HEADER_BUILD)/qstrdefs.generated.h: | $(HEADER_BUILD)
# Create an empty "py-version.h" needed by py/mkrules.mk
$(HEADER_BUILD)/py-version.h: | $(HEADER_BUILD)
touch $@
\ No newline at end of file
......@@ -9,7 +9,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "mpconfig.h"
#include "py/mpconfig.h"
#include "diskio.h" /* FatFs lower layer API */
#include "sflash_diskio.h" /* Serial flash disk IO API */
#if MICROPY_HW_HAS_SDCARD
......
......@@ -37,15 +37,8 @@
//*****************************************************************************
#include <stdbool.h>
#include "mpconfig.h"
#include "py/mpconfig.h"
#include MICROPY_HAL_H
#include "misc.h"
#include "nlr.h"
#include "qstr.h"
#include "obj.h"
#include "objtuple.h"
#include "objlist.h"
#include "runtime.h"
#include "hw_types.h"
#include "hw_memmap.h"
#include "hw_ints.h"
......
......@@ -2,7 +2,7 @@
#include <stdbool.h>
#include "std.h"
#include "mpconfig.h"
#include "py/mpconfig.h"
#include MICROPY_HAL_H
#include "simplelink.h"
#include "diskio.h"
......
......@@ -27,10 +27,8 @@
#include <string.h>
#include <std.h>
#include "mpconfig.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "py/mpconfig.h"
#include "py/misc.h"
#include "ff.h"
#include "ffconf.h"
#include "diskio.h"
......
......@@ -3,7 +3,7 @@
/---------------------------------------------------------------------------*/
#include <stdint.h>
#include "mpconfig.h"
#include "py/mpconfig.h"
#include "FreeRTOS.h"
#include "task.h"
#include "semphr.h"
......
......@@ -3,12 +3,8 @@
/* (C)ChaN, 2014 */
/*------------------------------------------------------------------------*/
#include "mpconfig.h"
#include "py/mpconfig.h"
#include MICROPY_HAL_H
#include "misc.h"
#include "nlr.h"
#include "qstr.h"
#include "obj.h"
#include "ff.h"
......
......@@ -28,12 +28,9 @@
#include <ctype.h>
#include <std.h>
#include "mpconfig.h"
#include "py/mpconfig.h"
#include MICROPY_HAL_H
#include "misc.h"
#include "nlr.h"
#include "qstr.h"
#include "obj.h"
#include "py/obj.h"
#include "osi.h"
#include "inc/hw_types.h"
#include "inc/hw_ints.h"
......
......@@ -2,7 +2,7 @@
#include <stdbool.h>
#include "std.h"
#include "mpconfig.h"
#include "py/mpconfig.h"
#include MICROPY_HAL_H
#include "simplelink.h"
#include "flc.h"
......
......@@ -28,11 +28,8 @@
#include <string.h>
#include <ctype.h>
#include "mpconfig.h"
#include "py/mpconfig.h"
#include MICROPY_HAL_H
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "mptask.h"
#include "simplelink.h"
#include "osi.h"
......
......@@ -28,11 +28,9 @@
#include <stdio.h>
#include <string.h>
#include "mpconfig.h"
#include "py/mpconfig.h"
#include MICROPY_HAL_H
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "py/obj.h"
#include "inc/hw_memmap.h"
#include "pybuart.h"
#include "osi.h"
......
......@@ -27,11 +27,8 @@
#include <stdio.h>
#include "mpconfig.h"
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "py/mpconfig.h"
#include "py/obj.h"
STATIC const char help_text[] = "Welcome to Micro Python!\n"
"For online help please visit http://micropython.org/help/.\n"
......
......@@ -29,12 +29,9 @@
#include <stdint.h>
#include <string.h>
#include "mpconfig.h"
#include "py/mpconfig.h"
#include MICROPY_HAL_H
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "py/obj.h"
#include "inc/hw_memmap.h"
#include "pybuart.h"
#include "utils.h"
......
......@@ -30,11 +30,6 @@
#include <std.h>
#include "py/mpstate.h"
#include "mpconfig.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
#include "mpexception.h"
......
......@@ -25,11 +25,8 @@
* THE SOFTWARE.
*/
#include "mpconfig.h"
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "py/mpconfig.h"
#include "py/obj.h"
#include "inc/hw_types.h"
#include "inc/hw_gpio.h"
#include "inc/hw_ints.h"
......@@ -38,7 +35,6 @@
#include "gpio.h"
#include "pin.h"
#include "pybpin.h"
#include "runtime.h"
#include MICROPY_HAL_H
......
......@@ -29,15 +29,12 @@
#include <stdint.h>
#include <string.h>
#include "mpconfig.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "py/mpconfig.h"
#include "py/obj.h"
#include "inc/hw_types.h"
#include "inc/hw_ints.h"
#include "inc/hw_memmap.h"
#include "pybpin.h"
#include "runtime.h"
#include MICROPY_HAL_H
STATIC void pin_named_pins_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
......
......@@ -29,17 +29,10 @@
#include <stdint.h>
#include <string.h>
#include "mpconfig.h"
#include "py/mpstate.h"
#include MICROPY_HAL_H
#include "nlr.h"
#include "misc.h"
#include "qstr.h"
#include "obj.h"
#include "objlist.h"
#include "runtime.h"
#include "modnetwork.h"
#include "mpexception.h"
#include "mpstate.h"
/// \module network - network configuration
///
......
......@@ -30,14 +30,7 @@
#include <stdint.h>
#include "py/mpstate.h"
#include "mpconfig.h"
#include MICROPY_HAL_H
#include "misc.h"
#include "nlr.h"
#include "qstr.h"
#include "obj.h"
#include "gc.h"
#include "gccollect.h"
#include "irq.h"
#include "inc/hw_types.h"
#include "inc/hw_gpio.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment