electronics
/
libopencm3
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lm4f: Remove erroneous references to lm3s 

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Alexandru Gagniuc 2012-11-22 16:04:32 -06:00
parent c02fba51a4
commit b2ac2ffc4b
7 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/lm4f/Makefile.include
View File

@ -38,7 +38,7 @@ endif
endif
CFLAGS += -O0 -g3 -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
-mcpu=cortex-m3 -mthumb -MD -DLM3S
-mcpu=cortex-m3 -mthumb -MD -DLM4F
LDSCRIPT ?= $(BINARY).ld
LDFLAGS += -L$(TOOLCHAIN_DIR)/lib \
-T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections
@ -85,9 +85,9 @@ flash: $(BINARY).flash
@#printf " OBJDUMP $(*).list\n"
$(Q)$(OBJDUMP) -S $(*).elf > $(*).list
%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_lm3s.a
%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_lm4f.a
@#printf " LD $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(LD) $(LDFLAGS) -o $(*).elf $(OBJS) -lopencm3_lm3s
$(Q)$(LD) $(LDFLAGS) -o $(*).elf $(OBJS) -lopencm3_lm4f
%.o: %.c Makefile
@#printf " CC $(subst $(shell pwd)/,,$(@))\n"

32
include/libopencm3/lm4f/doc-lm3s.h
View File

@ -1,32 +0,0 @@
/** @mainpage libopencm3 LM3S
@version 1.0.0
@date 14 September 2012
API documentation for TI Stellaris LM3S Cortex M3 series.
LGPL License Terms @ref lgpl_license
*/
/** @defgroup LM3S LM3S
Libraries for TI Stellaris LM3S series.
@version 1.0.0
@date 7 September 2012
LGPL License Terms @ref lgpl_license
*/
/** @defgroup LM3S_defines LM3S Defines
@brief Defined Constants and Types for the LM3S series
@version 1.0.0
@date 14 September 2012
LGPL License Terms @ref lgpl_license
*/

32
include/libopencm3/lm4f/doc-lm4f.h Normal file
View File

@ -0,0 +1,32 @@
/** @mainpage libopencm3 LM4F
@version 1.0.0
@date 22 November 2012
API documentation for TI Stellaris LM4F Cortex M4F series.
LGPL License Terms @ref lgpl_license
*/
/** @defgroup LM4F LM4F
Libraries for TI Stellaris LM4F series.
@version 1.0.0
@date 22 November 2012
LGPL License Terms @ref lgpl_license
*/
/** @defgroup LM4F_defines LM4F Defines
@brief Defined Constants and Types for the LM4F series
@version 1.0.0
@date 22 November 2012
LGPL License Terms @ref lgpl_license
*/

6
include/libopencm3/lm4f/gpio.h
View File

@ -17,11 +17,11 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LM3S_GPIO_H
#define LM3S_GPIO_H
#ifndef LM4F_GPIO_H
#define LM4F_GPIO_H
#include <libopencm3/cm3/common.h>
#include <libopencm3/lm3s/memorymap.h>
#include <libopencm3/lm4f/memorymap.h>
/* --- Convenience macros -------------------------------------------------- */

6
include/libopencm3/lm4f/memorymap.h
View File

@ -17,12 +17,12 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LM3S_MEMORYMAP_H
#define LM3S_MEMORYMAP_H
#ifndef LM4F_MEMORYMAP_H
#define LM4F_MEMORYMAP_H
#include <libopencm3/cm3/common.h>
/* --- LM3S specific peripheral definitions ----------------------------- */
/* --- LM4F specific peripheral definitions ----------------------------- */
#define GPIOA_APB_BASE (0x40004000)
#define GPIOB_APB_BASE (0x40005000)

4
include/libopencm3/lm4f/systemcontrol.h
View File

@ -17,8 +17,8 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LM3S_SYSTEMCONTROL_H
#define LM3S_SYSTEMCONTROL_H
#ifndef LM4F_SYSTEMCONTROL_H
#define LM4F_SYSTEMCONTROL_H
#include <libopencm3/cm3/common.h>

2
lib/lm4f/gpio.c
View File

@ -17,7 +17,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include <libopencm3/lm3s/gpio.h>
#include <libopencm3/lm4f/gpio.h>
void gpio_set(u32 gpioport, u8 gpios)
{