giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up CCFG file handling

Browse Source
This commit is contained in:
Edvard Pettersen 2018-07-25 15:16:45 +02:00
parent 813543b569
commit 210db77835
3 changed files with 25 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx
View File

@ -25,9 +25,9 @@ endif
# Clean up the path.
CORE_SDK := $(realpath $(CORE_SDK))
# Both ccfg.c and startup_cc13xx_cc26xx_gcc.c is located locally in
# Both ccfg-conf.c and startup_cc13xx_cc26xx_gcc.c is located locally in
# the arch/cpu/cc13xx-cc26xx folder.
CPU_START_SOURCEFILES += ccfg.c startup_cc13xx_cc26xx_gcc.c
CPU_START_SOURCEFILES += ccfg-conf.c startup_cc13xx_cc26xx_gcc.c
################################################################################
### Device Family
@ -107,7 +107,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES) $(DEBUG_IO_SOURCEFILES)
################################################################################
### Linker configuration
# Linker flag
# Linker flags
LDFLAGS += --entry resetISR
LDFLAGS += -static
LDFLAGS += --specs=nano.specs
@ -117,16 +117,17 @@ LDSCRIPT := $(CONTIKI_CPU)/$(SUBFAMILY)/$(SUBFAMILY).lds
################################################################################
### Specialized build targets
# Always re-build ieee-addr.o in case the command line passes a new NODEID
.PHONY: FORCE
FORCE:
# Always re-build ieee-addr.o in case the command line passes a new NODEID
$(OBJECTDIR)/ieee-addr.o: ieee-addr.c FORCE | $(OBJECTDIR)
$(TRACE_CC)
$(Q)$(CC) $(CFLAGS) -c $< -o $@
# Always re-build ccfg.c so changes to ccfg-conf.h will apply without having
# to make clean first
$(OBJECTDIR)/ccfg.o: ccfg.c FORCE | $(OBJECTDIR)
# Always re-build ccfg-conf.c so any changes to CCFG configuration
# always applies
$(OBJECTDIR)/ccfg-conf.o: ccfg-conf.c FORCE | $(OBJECTDIR)
$(TRACE_CC)
$(Q)$(CC) $(CFLAGS) -c $< -o $@

25
arch/cpu/cc13xx-cc26xx/ccfg-conf.h → arch/cpu/cc13xx-cc26xx/ccfg-conf.c
View File

@ -27,19 +27,20 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
/**
* \addtogroup cc13xx-cc26xx-cpu
* @{
*
* \defgroupt cc13xx-cc26xx-ccfg Customer Configuration (CCFG)
*
* @{
*
* \file
* Customer Configuration (CCFG) for the CC13xx/CC26xx CPU family.
* Configuration of CCFG.
* \author
* Edvard Pettersen <e.pettersen@ti.com>
*/
/*---------------------------------------------------------------------------*/
#ifndef CCFG_CONF_H_
#define CCFG_CONF_H_
/*---------------------------------------------------------------------------*/
#include "contiki-conf.h"
/*---------------------------------------------------------------------------*/
/**
@ -58,7 +59,7 @@
#define SET_CCFG_CCFG_TAP_DAP_1_PBIST2_TAP_ENABLE 0x00
#define SET_CCFG_CCFG_TAP_DAP_1_PBIST1_TAP_ENABLE 0x00
#define SET_CCFG_CCFG_TAP_DAP_1_WUC_TAP_ENABLE 0x00
#endif
#endif /* CCFG_CONF_JTAG_INTERFACE_DISABLE */
/** @} */
/*---------------------------------------------------------------------------*/
/**
@ -92,11 +93,19 @@
#define SET_CCFG_BL_CONFIG_BL_PIN_NUMBER CCFG_CONF_BL_PIN_NUMBER
#endif
#define SET_CCFG_BL_CONFIG_BL_ENABLE 0xC5
#endif
#endif /* CCFG_CONF_ROM_BOOTLOADER_ENABLE */
/** @} */
/*---------------------------------------------------------------------------*/
#endif /* CCFG_CONF_H_ */
/**
* \name Include the device-specific CCFG file from the SDK.
*
* @{
*/
#include <ti/devices/DeviceFamily.h>
#include DeviceFamily_constructPath(startup_files/ccfg.c)
/** @} */
/*---------------------------------------------------------------------------*/
/**
* @}
* @}
*/

50
arch/cpu/cc13xx-cc26xx/ccfg.c
View File

@ -1,50 +0,0 @@
/*
* Copyright (c) 2018, Texas Instruments Incorporated - http://www.ti.com/
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* \addtogroup cc13xx-cc26xx-cpu
* @{
*
* \file
* Customer Configuration (CCFG).
* \author
* Edvard Pettersen <e.pettersen@ti.com>
*/
/*---------------------------------------------------------------------------*/
/**
* Customer Configuration for CC13xx/CC26xx devices. This file is used to
* configure Boot ROM, start-up code, and SW radio behaviour.
*
* Configuration is done in ccfg-conf.h.
*/
#include "ccfg-conf.h"
#include <ti/devices/DeviceFamily.h>
#include DeviceFamily_constructPath(startup_files/ccfg.c)
/*---------------------------------------------------------------------------*/