From 8a630baea8806ab98da0a5c08ef8e28bbc06dfc2 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 20 Jul 2009 17:23:25 +0200 Subject: Finish rename to 'miniblink'. --- examples/miniblink/Makefile | 2 +- examples/miniblink/README | 2 +- examples/miniblink/blink.c | 62 ----------------------------------------- examples/miniblink/blink.ld | 57 ------------------------------------- examples/miniblink/miniblink.c | 62 +++++++++++++++++++++++++++++++++++++++++ examples/miniblink/miniblink.ld | 57 +++++++++++++++++++++++++++++++++++++ 6 files changed, 121 insertions(+), 121 deletions(-) delete mode 100644 examples/miniblink/blink.c delete mode 100644 examples/miniblink/blink.ld create mode 100644 examples/miniblink/miniblink.c create mode 100644 examples/miniblink/miniblink.ld diff --git a/examples/miniblink/Makefile b/examples/miniblink/Makefile index 58281ec..4ffcff8 100644 --- a/examples/miniblink/Makefile +++ b/examples/miniblink/Makefile @@ -17,7 +17,7 @@ ## along with this program. If not, see . ## -BINARY = blink +BINARY = miniblink # PREFIX ?= arm-none-eabi PREFIX ?= arm-elf diff --git a/examples/miniblink/README b/examples/miniblink/README index a46e75a..edcd536 100644 --- a/examples/miniblink/README +++ b/examples/miniblink/README @@ -40,7 +40,7 @@ Or you can do the same manually via: $ telnet localhost 4444 > init > reset halt - > flash write_image erase blink.bin 0x08000000 + > flash write_image erase miniblink.bin 0x08000000 > resume 0x08000000 Replace the "jtagkey-tiny.cfg" with whatever JTAG device you are using. diff --git a/examples/miniblink/blink.c b/examples/miniblink/blink.c deleted file mode 100644 index 7c7da78..0000000 --- a/examples/miniblink/blink.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This file is part of the libopenstm32 project. - * - * Copyright (C) 2009 Uwe Hermann - * - * 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 . - */ - -#include - -int main(void) -{ - int i; - - /* Enable GPIOC clock. */ - RCC_APB2ENR = IOPCEN; - - /* Set GPIO12 (in GPIO port C) to 'output push-pull'. */ - /* Manually: */ - // GPIOC_CRH = (GPIO_CNF_OUTPUT_PUSHPULL << (((12 - 8) * 4) + 2)); - // GPIOC_CRH |= (GPIO_MODE_OUTPUT_2_MHZ << ((12 - 8) * 4)); - /* Using API functions: */ - gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, - GPIO_CNF_OUTPUT_PUSHPULL, GPIO12); - - /* Blink the LED (PC12) on the board. */ - while (1) { - /* Manually: */ - // GPIOC_BSRR = GPIO12; /* LED off */ - // for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ - // GPIOC_BRR = GPIO12; /* LED on */ - // for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ - - /* Using API functions gpio_set()/gpio_clear(): */ - // gpio_set(GPIOC, GPIO12); /* LED off */ - // for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ - // gpio_clear(GPIOC, GPIO12); /* LED on */ - // for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ - - /* Using API function gpio_toggle(): */ - gpio_toggle(GPIOC, GPIO12); /* LED on/off */ - for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ - } - - return 0; -} - -u32 *vector_table[2] __attribute__ ((section(".vectors"))) = { - (u32 *)0x20000800, /* Use 2 KB stack (0x800 bytes). */ - (u32 *)main, /* Use main() as reset vector for now. */ -}; diff --git a/examples/miniblink/blink.ld b/examples/miniblink/blink.ld deleted file mode 100644 index bfae3bd..0000000 --- a/examples/miniblink/blink.ld +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the libopenstm32 project. - * - * Copyright (C) 2009 Uwe Hermann - * - * 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 . - */ - -/* Linker script for Olimex STM32-H103 (STM32F103RBT6, 128K flash, 20K RAM). */ - -/* Define memory regions. */ -MEMORY -{ - rom (rx) : ORIGIN = 0x00000000, LENGTH = 128K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K -} - -/* Define sections. */ -SECTIONS -{ - . = ORIGIN(rom); - - .text : { - *(.vectors) /* Vector table */ - *(.text) /* Program code */ - *(.rodata) /* Read-only data */ - } >rom - - . = ORIGIN(ram); - - .data : { - *(.data) /* Read-write initialized data */ - } >ram AT >rom - - .bss : { - *(.bss) /* Read-write zero initialized data */ - } >ram AT >rom - - /* Discard useless sections. */ - /DISCARD/ : { - *(.comment) - *(.comment.*) - *(.note) - *(.note.*) - } -} diff --git a/examples/miniblink/miniblink.c b/examples/miniblink/miniblink.c new file mode 100644 index 0000000..7c7da78 --- /dev/null +++ b/examples/miniblink/miniblink.c @@ -0,0 +1,62 @@ +/* + * This file is part of the libopenstm32 project. + * + * Copyright (C) 2009 Uwe Hermann + * + * 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 . + */ + +#include + +int main(void) +{ + int i; + + /* Enable GPIOC clock. */ + RCC_APB2ENR = IOPCEN; + + /* Set GPIO12 (in GPIO port C) to 'output push-pull'. */ + /* Manually: */ + // GPIOC_CRH = (GPIO_CNF_OUTPUT_PUSHPULL << (((12 - 8) * 4) + 2)); + // GPIOC_CRH |= (GPIO_MODE_OUTPUT_2_MHZ << ((12 - 8) * 4)); + /* Using API functions: */ + gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, + GPIO_CNF_OUTPUT_PUSHPULL, GPIO12); + + /* Blink the LED (PC12) on the board. */ + while (1) { + /* Manually: */ + // GPIOC_BSRR = GPIO12; /* LED off */ + // for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ + // GPIOC_BRR = GPIO12; /* LED on */ + // for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ + + /* Using API functions gpio_set()/gpio_clear(): */ + // gpio_set(GPIOC, GPIO12); /* LED off */ + // for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ + // gpio_clear(GPIOC, GPIO12); /* LED on */ + // for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ + + /* Using API function gpio_toggle(): */ + gpio_toggle(GPIOC, GPIO12); /* LED on/off */ + for (i = 0; i < 80000; i++); /* Wait (needs -O0 CFLAGS). */ + } + + return 0; +} + +u32 *vector_table[2] __attribute__ ((section(".vectors"))) = { + (u32 *)0x20000800, /* Use 2 KB stack (0x800 bytes). */ + (u32 *)main, /* Use main() as reset vector for now. */ +}; diff --git a/examples/miniblink/miniblink.ld b/examples/miniblink/miniblink.ld new file mode 100644 index 0000000..bfae3bd --- /dev/null +++ b/examples/miniblink/miniblink.ld @@ -0,0 +1,57 @@ +/* + * This file is part of the libopenstm32 project. + * + * Copyright (C) 2009 Uwe Hermann + * + * 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 . + */ + +/* Linker script for Olimex STM32-H103 (STM32F103RBT6, 128K flash, 20K RAM). */ + +/* Define memory regions. */ +MEMORY +{ + rom (rx) : ORIGIN = 0x00000000, LENGTH = 128K + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K +} + +/* Define sections. */ +SECTIONS +{ + . = ORIGIN(rom); + + .text : { + *(.vectors) /* Vector table */ + *(.text) /* Program code */ + *(.rodata) /* Read-only data */ + } >rom + + . = ORIGIN(ram); + + .data : { + *(.data) /* Read-write initialized data */ + } >ram AT >rom + + .bss : { + *(.bss) /* Read-write zero initialized data */ + } >ram AT >rom + + /* Discard useless sections. */ + /DISCARD/ : { + *(.comment) + *(.comment.*) + *(.note) + *(.note.*) + } +} -- cgit v1.2.3