From 78744c4f7a368e74e8aff81320a8e1bb3265346e Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Thu, 28 May 2015 13:22:26 +0200 Subject: [PATCH] cc3200: Remove WIPY-SD variant, and make the WiPy the default board. --- cc3200/Makefile | 5 +-- cc3200/boards/WIPY-SD/mpconfigboard.h | 47 --------------------------- cc3200/boards/WIPY-SD/pins.csv | 25 -------------- cc3200/boards/WIPY/mpconfigboard.h | 2 +- 4 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 cc3200/boards/WIPY-SD/mpconfigboard.h delete mode 100644 cc3200/boards/WIPY-SD/pins.csv diff --git a/cc3200/Makefile b/cc3200/Makefile index 29318d44ec..d86b983268 100644 --- a/cc3200/Makefile +++ b/cc3200/Makefile @@ -1,10 +1,11 @@ # Select the board to build for: if not given on the command line, -# then default to LAUNCHXL -BOARD ?= LAUNCHXL +# then default to WIPY +BOARD ?= WIPY ifeq ($(wildcard boards/$(BOARD)/.),) $(error Invalid BOARD specified) endif +# Make 'release' the default build type BTYPE ?= release # If the build directory is not given, make it reflect the board name. diff --git a/cc3200/boards/WIPY-SD/mpconfigboard.h b/cc3200/boards/WIPY-SD/mpconfigboard.h deleted file mode 100644 index dc05c2829a..0000000000 --- a/cc3200/boards/WIPY-SD/mpconfigboard.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of the Micro Python project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2013, 2014 Damien P. George - * Copyright (c) 2015 Daniel Campora - * - * 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. - */ - -#define WIPY_SD - -#define MICROPY_HW_BOARD_NAME "WiPy-SD" -#define MICROPY_HW_MCU_NAME "CC3200" - -#define MICROPY_HW_HAS_SDCARD (1) -#define MICROPY_HW_ENABLE_RNG (1) -#define MICROPY_HW_ENABLE_RTC (1) - -#define MICROPY_SYS_LED_PRCM PRCM_GPIOA3 -#define MICROPY_SAFE_BOOT_PRCM PRCM_GPIOA3 -#define MICROPY_SYS_LED_PORT GPIOA3_BASE -#define MICROPY_SAFE_BOOT_PORT GPIOA3_BASE -#define MICROPY_SYS_LED_GPIO pin_GPIO25 -#define MICROPY_SYS_LED_PIN_NUM PIN_21 // GPIO25 (SOP2) -#define MICROPY_SAFE_BOOT_PIN_NUM PIN_18 // GPIO28 -#define MICROPY_SYS_LED_PORT_PIN GPIO_PIN_1 -#define MICROPY_SAFE_BOOT_PORT_PIN GPIO_PIN_4 - -#define MICROPY_PORT_SFLASH_BLOCK_COUNT 96 diff --git a/cc3200/boards/WIPY-SD/pins.csv b/cc3200/boards/WIPY-SD/pins.csv deleted file mode 100644 index 760bb15f98..0000000000 --- a/cc3200/boards/WIPY-SD/pins.csv +++ /dev/null @@ -1,25 +0,0 @@ -L2,GPIO2 -L3,GPIO1 -L4,GPIO23 -L5,GPIO24 -L6,GPIO11 -L7,GPIO12 -L8,GPIO13 -L9,GPIO14 -L10,GPIO15 -L11,GPIO16 -L12,GPIO17 -L13,GPIO22 -L14,GPIO28 -R4,GPIO10 -R5,GPIO9 -R6,GPIO8 -R7,GPIO7 -R8,GPIO6 -R9,GPIO30 -R10,GPIO31 -R11,GPIO3 -R12,GPIO0 -R13,GPIO4 -R14,GPIO5 -HBL,GPIO25 diff --git a/cc3200/boards/WIPY/mpconfigboard.h b/cc3200/boards/WIPY/mpconfigboard.h index 6ff6fe35bf..c7036710eb 100644 --- a/cc3200/boards/WIPY/mpconfigboard.h +++ b/cc3200/boards/WIPY/mpconfigboard.h @@ -30,7 +30,7 @@ #define MICROPY_HW_BOARD_NAME "WiPy" #define MICROPY_HW_MCU_NAME "CC3200" -#define MICROPY_HW_HAS_SDCARD (0) +#define MICROPY_HW_HAS_SDCARD (1) #define MICROPY_HW_ENABLE_RNG (1) #define MICROPY_HW_ENABLE_RTC (1)