More path and name changes.

This commit is contained in:
Uwe Hermann 2010-12-30 02:57:44 +01:00
parent 7c53b252a3
commit 8e5acecc6e
37 changed files with 378 additions and 36 deletions

View File

@ -36,12 +36,16 @@ all: build
build: lib examples
lib:
@printf " BUILD lib\n"
@printf " BUILD lib/stm32\n"
$(Q)$(MAKE) -C lib/stm32 all
@printf " BUILD lib/lpc13xx\n"
$(Q)$(MAKE) -C lib/lpc13xx all
examples: lib
@printf " BUILD examples\n"
@printf " BUILD examples/stm32\n"
$(Q)$(MAKE) -C examples/stm32 all
@printf " BUILD examples/lpc13xx\n"
$(Q)$(MAKE) -C examples/lpc13xx all
install: build
@printf " INSTALL headers\n"
@ -59,6 +63,8 @@ install: build
clean:
$(Q)$(MAKE) -C examples/stm32 clean
$(Q)$(MAKE) -C lib/stm32 clean
$(Q)$(MAKE) -C examples/lpc13xx clean
$(Q)$(MAKE) -C lib/lpc13xx clean
.PHONY: build lib examples install clean

38
examples/lpc13xx/Makefile Normal file
View File

@ -0,0 +1,38 @@
##
## This file is part of the libopenstm32 project.
##
## Copyright (C) 2010 Piotr Esden-Tempski <piotr@esden.net>
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
# Be silent per default, but 'make V=1' will show all compiler calls.
ifneq ($(V),1)
Q := @
# Do not print "Entering directory ...".
MAKEFLAGS += --no-print-directory
endif
all: lpc-p1343
lpc-p1343:
@printf " BUILD examples/lpc13xx/lpc-p1343\n"
$(Q)$(MAKE) -C lpc-p1343
clean:
@printf " CLEAN examples/lpc13xx/lpc-p1343\n"
$(Q)$(MAKE) -C lpc-p1343 clean
.PHONY: lpc-p1343 clean

View File

@ -0,0 +1,118 @@
## This file is part of the libopenstm32 project.
##
## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
## Copyright (C) 2010 Piotr Esden-Tempski <piotr@esden.net>
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
# PREFIX ?= arm-none-eabi
PREFIX ?= arm-elf
CC = $(PREFIX)-gcc
LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
# Uncomment this line if you want to use the installed (not local) library.
# TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
TOOLCHAIN_DIR = ../../../..
CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
-mcpu=cortex-m3 -mthumb
LDSCRIPT = $(BINARY).ld
LDFLAGS += -L$(TOOLCHAIN_DIR)/lib/lpc13xx -T$(LDSCRIPT) -nostartfiles \
-Wl,--gc-sections
OBJS += $(BINARY).o
OOCD ?= openocd
OOCD_INTERFACE ?= flossjtag
OOCD_BOARD ?= olimex_stm32_h103
# Be silent per default, but 'make V=1' will show all compiler calls.
ifneq ($(V),1)
Q := @
NULL := 2>/dev/null
else
LDFLAGS += -Wl,--print-gc-sections
endif
.SUFFIXES: .elf .bin .hex .srec .list .images
.SECONDEXPANSION:
.SECONDARY:
all: images
images: $(BINARY).images
flash: $(BINARY).flash
%.images: %.bin %.hex %.srec %.list
@#echo "*** $* images generated ***"
%.bin: %.elf
@#printf " OBJCOPY $(*).bin\n"
$(Q)$(OBJCOPY) -Obinary $(*).elf $(*).bin
%.hex: %.elf
@#printf " OBJCOPY $(*).hex\n"
$(Q)$(OBJCOPY) -Oihex $(*).elf $(*).hex
%.srec: %.elf
@#printf " OBJCOPY $(*).srec\n"
$(Q)$(OBJCOPY) -Osrec $(*).elf $(*).srec
%.list: %.elf
@#printf " OBJDUMP $(*).list\n"
$(Q)$(OBJDUMP) -S $(*).elf > $(*).list
%.elf: $(OBJS) $(LDSCRIPT)
@#printf " LD $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(LD) $(LDFLAGS) -o $(*).elf $(OBJS) -lopencm3_lpc13xx
%.o: %.c Makefile
@#printf " CC $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(CC) $(CFLAGS) -o $@ -c $<
clean:
$(Q)rm -f *.o
$(Q)rm -f *.elf
$(Q)rm -f *.bin
$(Q)rm -f *.hex
$(Q)rm -f *.srec
$(Q)rm -f *.list
ifeq ($(OOCD_SERIAL),)
%.flash: %.hex
@printf " FLASH $<\n"
@# IMPORTANT: Don't use "resume", only "reset" will work correctly!
$(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \
-f board/$(OOCD_BOARD).cfg \
-c "init" -c "reset init" \
-c "stm32x mass_erase 0" \
-c "flash write_image $(*).hex" \
-c "reset" \
-c "shutdown" $(NULL)
else
%.flash: %.hex
@printf " FLASH $<\n"
@# IMPORTANT: Don't use "resume", only "reset" will work correctly!
$(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \
-f board/$(OOCD_BOARD).cfg \
-c "ft2232_serial $(OOCD_SERIAL)" \
-c "init" -c "reset init" \
-c "stm32x mass_erase 0" \
-c "flash write_image $(*).hex" \
-c "reset" \
-c "shutdown" $(NULL)
endif
.PHONY: images clean

View File

@ -0,0 +1,38 @@
##
## This file is part of the libopenstm32 project.
##
## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
# Be silent per default, but 'make V=1' will show all compiler calls.
ifneq ($(V),1)
Q := @
# Do not print "Entering directory ...".
MAKEFLAGS += --no-print-directory
endif
all: miniblink
miniblink:
@printf " BUILD examples/lpc13xx/lpc-p1343/miniblink\n"
$(Q)$(MAKE) -C miniblink
clean:
@printf " CLEAN examples/lpc13xx/lpc-p1343/miniblink\n"
$(Q)$(MAKE) -C miniblink clean
.PHONY: miniblink clean

View File

@ -19,5 +19,5 @@
BINARY = miniblink
include ../../../Makefile.include
include ../../Makefile.include

View File

@ -26,8 +26,6 @@ MEMORY
ram (rwx) : ORIGIN = 0x10000000, LENGTH = 8K
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
/* FIXME: _stack is incorrect in that file, refactor! */
/* Include the common ld script. */
INCLUDE lpc13xx.ld

View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -28,5 +28,5 @@ MEMORY
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -28,5 +28,5 @@ MEMORY
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -28,5 +28,5 @@ MEMORY
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

View File

@ -28,5 +28,5 @@ MEMORY
/* Include the common ld script from libopenstm32. */
INCLUDE libopenstm32.ld
INCLUDE stm32.ld

56
lib/lpc13xx/Makefile Normal file
View File

@ -0,0 +1,56 @@
##
## This file is part of the libopenstm32 project.
##
## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
LIBNAME = libopencm3_lpc13xx
# PREFIX ?= arm-none-eabi
PREFIX ?= arm-elf
CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar
CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \
-mcpu=cortex-m3 -mthumb -Wstrict-prototypes \
-ffunction-sections -fdata-sections
# ARFLAGS = rcsv
ARFLAGS = rcs
OBJS = gpio.o
# VPATH += ../usb
# Be silent per default, but 'make V=1' will show all compiler calls.
ifneq ($(V),1)
Q := @
endif
all: $(LIBNAME).a
$(LIBNAME).a: $(OBJS)
@printf " AR $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(AR) $(ARFLAGS) $@ $^
%.o: %.c
@printf " CC $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(CC) $(CFLAGS) -o $@ -c $<
clean:
@printf " CLEAN lib/lpc13xx\n"
$(Q)rm -f *.o
$(Q)rm -f $(LIBNAME).a
.PHONY: clean

25
lib/lpc13xx/gpio.c Normal file
View File

@ -0,0 +1,25 @@
/*
* This file is part of the libopenstm32 project.
*
* Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <lpc13xx/gpio.h>
void gpio_set(u32 gpioport, u16 gpios)
{
GPIO_DATA(gpioport) = gpios;
}

63
lib/lpc13xx/lpc13xx.ld Normal file
View File

@ -0,0 +1,63 @@
/*
* This file is part of the libopenstm32 project.
*
* Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Generic linker script for LPC13XX targets using libopenstm32. */
/* Memory regions must be defined in the ld script which includes this one. */
/* Enforce emmition of the vector table */
EXTERN (vector_table)
/* Define sections. */
SECTIONS
{
. = ORIGIN(rom);
.text : {
*(.vectors) /* Vector table */
*(.text*) /* Program code */
*(.rodata*) /* Read-only data */
_etext = .;
} >rom
. = ORIGIN(ram);
.data : {
_data = .;
*(.data*) /* Read-write initialized data */
_edata = .;
} >ram AT >rom
.bss : {
*(.bss*) /* Read-write zero initialized data */
*(COMMON)
_ebss = .;
} >ram AT >rom
/*
* The .eh_frame section appears to be used for C++ exception handling.
* You may need to fix this if you're using C++.
*/
/DISCARD/ : { *(.eh_frame) }
end = .;
}
PROVIDE(_stack = 0x10000800);

View File

@ -17,7 +17,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
LIBNAME = libopenstm32
LIBNAME = libopencm3_stm32
# PREFIX ?= arm-none-eabi
PREFIX ?= arm-elf
@ -50,7 +50,7 @@ $(LIBNAME).a: $(OBJS)
$(Q)$(CC) $(CFLAGS) -o $@ -c $<
clean:
@printf " CLEAN lib\n"
@printf " CLEAN lib/stm32\n"
$(Q)rm -f *.o
$(Q)rm -f $(LIBNAME).a