Some more file/path restructuring.
All #includes now explicitly use the "<libopencm3/stm32/rcc.h>" format. If you want to get rid of the "libopencm3" prefix in your local project you can add a respective -I entry in your Makefile (not recommended though). All .ld files and .a libs are installed in $(TOOLCHAIN_DIR)/lib directly (as before), but are now renamed to avoid potential conflicts now or in the future. Examples: libopencm3_lpc13xx.a libopencm3_lpc13xx.ld libopencm3_stm32.a libopencm3_stm32.ld
This commit is contained in:
@@ -18,12 +18,12 @@
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <stm32/rcc.h>
|
||||
#include <stm32/gpio.h>
|
||||
#include <stm32/flash.h>
|
||||
#include <stm32/scb.h>
|
||||
#include <usb/usbd.h>
|
||||
#include <usb/dfu.h>
|
||||
#include <libopencm3/stm32/rcc.h>
|
||||
#include <libopencm3/stm32/gpio.h>
|
||||
#include <libopencm3/stm32/flash.h>
|
||||
#include <libopencm3/stm32/scb.h>
|
||||
#include <libopencm3/usb/usbd.h>
|
||||
#include <libopencm3/usb/dfu.h>
|
||||
|
||||
#define APP_ADDRESS 0x08002000
|
||||
|
||||
|
||||
@@ -25,5 +25,5 @@ MEMORY
|
||||
}
|
||||
|
||||
/* Include the common ld script. */
|
||||
INCLUDE stm32.ld
|
||||
INCLUDE libopencm3_stm32.ld
|
||||
|
||||
|
||||
@@ -18,18 +18,18 @@
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stm32/rcc.h>
|
||||
#include <stm32/gpio.h>
|
||||
#include <stm32/systick.h>
|
||||
#include <usb/usbd.h>
|
||||
#include <usb/hid.h>
|
||||
#include <libopencm3/stm32/rcc.h>
|
||||
#include <libopencm3/stm32/gpio.h>
|
||||
#include <libopencm3/stm32/systick.h>
|
||||
#include <libopencm3/usb/usbd.h>
|
||||
#include <libopencm3/usb/hid.h>
|
||||
|
||||
/* Define this to include the DFU APP interface. */
|
||||
#define INCLUDE_DFU_INTERFACE
|
||||
|
||||
#ifdef INCLUDE_DFU_INTERFACE
|
||||
#include <stm32/scb.h>
|
||||
#include <usb/dfu.h>
|
||||
#include <libopencm3/stm32/scb.h>
|
||||
#include <libopencm3/usb/dfu.h>
|
||||
#endif
|
||||
|
||||
const struct usb_device_descriptor dev = {
|
||||
|
||||
@@ -28,5 +28,5 @@ MEMORY
|
||||
|
||||
|
||||
/* Include the common ld script. */
|
||||
INCLUDE stm32.ld
|
||||
INCLUDE libopencm3_stm32.ld
|
||||
|
||||
|
||||
Reference in New Issue
Block a user