From 9279fd42793123784ce83ca151df6f4630487722 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 16 Mar 2012 20:21:09 -0700
Subject: Add STM platform and stm-bringup demo program

The stm-bringup doesn't run altos, it just initializes the device and
writes stuff over a serial port. Works on the STM32L Discovery board
at least, should do stuff on other boards too.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/stm-bringup/Makefile  |  35 ++++++
 src/stm-bringup/bringup.c | 306 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 341 insertions(+)
 create mode 100644 src/stm-bringup/Makefile
 create mode 100644 src/stm-bringup/bringup.c

(limited to 'src/stm-bringup')

diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile
new file mode 100644
index 00000000..49966a4f
--- /dev/null
+++ b/src/stm-bringup/Makefile
@@ -0,0 +1,35 @@
+CC=arm-none-eabi-gcc
+OBJCOPY=arm-none-eabi-objcopy
+
+C_LIB=/local/src/pdclib/pdclib.a
+C_INC=-I/local/src/pdclib/includes -I/local/src/pdclib/internals
+
+DEF_CFLAGS=-g -std=gnu99 -O0 -mlittle-endian -mthumb -ffreestanding -nostdlib -I../../src/stm $(C_INC)
+
+# to run from SRAM
+LD_FLAGS_RAM=-Wl,-Taltos-ram.ld
+LD_FLAGS=-Wl,-Taltos.ld
+
+CFLAGS=$(DEF_CFLAGS) -mcpu=cortex-m3 -DCONFIG_STM32L_DISCOVERY
+
+OBJS=bringup.o
+
+all: bringup-ram.elf bringup.elf
+
+%.bin: %.elf
+	$(OBJCOPY) -O binary $^ $@
+
+bringup.elf: $(OBJS) $(C_LIB) altos.ld
+	$(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJS) $(C_LIB) -lgcc
+
+bringup-ram.elf: $(OBJS) $(C_LIB) altos-ram.ld
+	$(CC) $(CFLAGS) $(LD_FLAGS_RAM) -o $@ $(OBJS) $(C_LIB) -lgcc
+
+bringup.o: bringup.c
+	$(CC) -c $(CFLAGS) bringup.c
+
+clean:
+	rm -rf *.elf
+	rm -rf *.bin
+
+.PHONY: all clean
diff --git a/src/stm-bringup/bringup.c b/src/stm-bringup/bringup.c
new file mode 100644
index 00000000..b6fe458d
--- /dev/null
+++ b/src/stm-bringup/bringup.c
@@ -0,0 +1,306 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <string.h>
+
+#include <stdio.h>
+#include "stm32l.h"
+
+void delay(void);
+
+static void
+set_clock(void)
+{
+	uint32_t	cfgr;
+	uint32_t	cr;
+	
+	/* Set flash latency to tolerate 32MHz SYSCLK  -> 1 wait state */
+	uint32_t	acr = stm_flash.acr;
+
+	/* Enable 64-bit access and prefetch */
+	acr |= (1 << STM_FLASH_ACR_ACC64) | (1 << STM_FLASH_ACR_PRFEN);
+	stm_flash.acr = acr;
+
+	/* Enable 1 wait state so the CPU can run at 32MHz */
+	/* (haven't managed to run the CPU at 32MHz yet, it's at 16MHz) */
+	acr |= (1 << STM_FLASH_ACR_LATENCY);
+	stm_flash.acr = acr;
+
+	/* HCLK to 16MHz -> AHB prescaler = /1 */
+	cfgr = stm_rcc.cfgr;
+	cfgr &= ~(STM_RCC_CFGR_HPRE_MASK << STM_RCC_CFGR_HPRE);
+	cfgr |= (STM_RCC_CFGR_HPRE_DIV_1 << STM_RCC_CFGR_HPRE);
+	stm_rcc.cfgr = cfgr;
+	while ((stm_rcc.cfgr & (STM_RCC_CFGR_HPRE_MASK << STM_RCC_CFGR_HPRE)) !=
+	       (STM_RCC_CFGR_HPRE_DIV_1 << STM_RCC_CFGR_HPRE))
+		asm ("nop");
+#define STM_AHB_PRESCALER	1
+
+	/* PCLK1 to 16MHz -> APB1 Prescaler = 1 */
+	cfgr = stm_rcc.cfgr;
+	cfgr &= ~(STM_RCC_CFGR_PPRE1_MASK << STM_RCC_CFGR_PPRE1);
+	cfgr |= (STM_RCC_CFGR_PPRE1_DIV_1 << STM_RCC_CFGR_PPRE1);
+	stm_rcc.cfgr = cfgr;
+#define STM_APB1_PRESCALER	1
+
+	/* PCLK2 to 16MHz -> APB2 Prescaler = 1 */
+	cfgr = stm_rcc.cfgr;
+	cfgr &= ~(STM_RCC_CFGR_PPRE2_MASK << STM_RCC_CFGR_PPRE2);
+	cfgr |= (STM_RCC_CFGR_PPRE2_DIV_1 << STM_RCC_CFGR_PPRE2);
+	stm_rcc.cfgr = cfgr;
+#define STM_APB2_PRESCALER	1
+
+	/* Enable power interface clock */
+	stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_PWREN);
+
+	/* Set voltage range to 1.8V */
+
+	/* poll VOSF bit in PWR_CSR. Wait until it is reset to 0 */
+	while ((stm_pwr.csr & (1 << STM_PWR_CSR_VOSF)) != 0)
+		asm("nop");
+
+	/* Configure voltage scaling range */
+	cr = stm_pwr.cr;
+	cr &= ~(STM_PWR_CR_VOS_MASK << STM_PWR_CR_VOS);
+	cr |= (STM_PWR_CR_VOS_1_8 << STM_PWR_CR_VOS);
+	stm_pwr.cr = cr;
+
+	/* poll VOSF bit in PWR_CSR. Wait until it is reset to 0 */
+	while ((stm_pwr.csr & (1 << STM_PWR_CSR_VOSF)) != 0)
+		asm("nop");
+
+	/* Enable HSI RC clock 16MHz */
+	if (!(stm_rcc.cr & (1 << STM_RCC_CR_HSIRDY))) {
+		stm_rcc.cr |= (1 << STM_RCC_CR_HSION);
+		while (!(stm_rcc.cr & (1 << STM_RCC_CR_HSIRDY)))
+			asm("nop");
+	}
+#define STM_HSI 16000000
+
+	/* Switch to direct HSI for SYSCLK */
+	if ((stm_rcc.cfgr & (STM_RCC_CFGR_SWS_MASK << STM_RCC_CFGR_SWS)) !=
+	    (STM_RCC_CFGR_SWS_HSI << STM_RCC_CFGR_SWS)) {
+		cfgr = stm_rcc.cfgr;
+		cfgr &= ~(STM_RCC_CFGR_SW_MASK << STM_RCC_CFGR_SW);
+		cfgr |= (STM_RCC_CFGR_SW_HSI << STM_RCC_CFGR_SW);
+		stm_rcc.cfgr = cfgr;
+		while ((stm_rcc.cfgr & (STM_RCC_CFGR_SWS_MASK << STM_RCC_CFGR_SWS)) !=
+		       (STM_RCC_CFGR_SWS_HSI << STM_RCC_CFGR_SWS))
+			asm("nop");
+	}
+
+	/* Disable the PLL */
+	stm_rcc.cr &= ~(1 << STM_RCC_CR_PLLON);
+	while (stm_rcc.cr & (1 << STM_RCC_CR_PLLRDY))
+		asm("nop");
+	
+	/* PLLVCO to 96MHz (for USB) -> PLLMUL = 6, PLLDIV = 4 */
+	cfgr = stm_rcc.cfgr;
+	cfgr &= ~(STM_RCC_CFGR_PLLMUL_MASK << STM_RCC_CFGR_PLLMUL);
+	cfgr &= ~(STM_RCC_CFGR_PLLDIV_MASK << STM_RCC_CFGR_PLLDIV);
+
+//	cfgr |= (STM_RCC_CFGR_PLLMUL_6 << STM_RCC_CFGR_PLLMUL);
+//	cfgr |= (STM_RCC_CFGR_PLLDIV_3 << STM_RCC_CFGR_PLLDIV);
+
+	cfgr |= (STM_RCC_CFGR_PLLMUL_6 << STM_RCC_CFGR_PLLMUL);
+	cfgr |= (STM_RCC_CFGR_PLLDIV_4 << STM_RCC_CFGR_PLLDIV);
+
+#define STM_PLLMUL	6
+#define STM_PLLDIV	4
+
+	/* PLL source to HSI */
+	cfgr &= ~(1 << STM_RCC_CFGR_PLLSRC);
+
+#define STM_PLLSRC	STM_HSI
+
+	stm_rcc.cfgr = cfgr;
+
+	/* Enable the PLL and wait for it */
+	stm_rcc.cr |= (1 << STM_RCC_CR_PLLON);
+	while (!(stm_rcc.cr & (1 << STM_RCC_CR_PLLRDY)))
+		asm("nop");
+
+	/* Switch to the PLL for the system clock */
+
+	cfgr = stm_rcc.cfgr;
+	cfgr &= ~(STM_RCC_CFGR_SW_MASK << STM_RCC_CFGR_SW);
+	cfgr |= (STM_RCC_CFGR_SW_PLL << STM_RCC_CFGR_SW);
+	stm_rcc.cfgr = cfgr;
+	for (;;) {
+		uint32_t	c, part, mask, val;
+
+		c = stm_rcc.cfgr;
+		mask = (STM_RCC_CFGR_SWS_MASK << STM_RCC_CFGR_SWS);
+		val = (STM_RCC_CFGR_SWS_PLL << STM_RCC_CFGR_SWS);
+		part = c & mask;
+		if (part == val)
+			break;
+	}
+}
+
+#define STM_PLLVCO	(STM_PLLSRC * STM_PLLMUL)
+#define STM_SYSCLK 	(STM_PLLVCO / STM_PLLDIV)
+#define STM_HCLK	(STM_SYSCLK / STM_AHB_PRESCALER)
+#define STM_APB1	(STM_HCLK / STM_APB1_PRESCALER)
+#define STM_APB2	(STM_HCLK / STM_APB2_PRESCALER)
+
+#define BAUD_9600 (STM_APB2 / 9600)
+
+void
+set_serial()
+{
+	uint32_t	moder, afr;
+
+	/* Enable GPIOA */
+	stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOAEN);
+	
+	/* Hook PA9, PA10 to USART1 (AFIO7) */
+	stm_moder_set(&stm_gpioa, 9, STM_MODER_ALTERNATE);
+	stm_moder_set(&stm_gpioa, 10, STM_MODER_ALTERNATE);
+	stm_afr_set(&stm_gpioa, 9, STM_AFR_AF7);
+	stm_afr_set(&stm_gpioa, 10, STM_AFR_AF7);
+
+	/* Enable USART1 */
+	stm_rcc.apb2enr |= (1 << STM_RCC_APB2ENR_USART1EN);
+	
+	/* 9.6KBps. PCLK1 = 16MHz. OVER8 = 0 */
+
+	/* USARTDIV = PCLK1 / (16 * 9600) = 104.1{6}
+	 * round to 104.1875 (1667 / 16)
+	 *
+	 * actual baud rate = 16e6 / (16 * 104.1875) = 9598Bps
+	 */
+
+	stm_usart1.brr = BAUD_9600;
+
+	stm_usart1.cr1 = ((0 << STM_USART_CR1_OVER8) |
+			  (1 << STM_USART_CR1_UE) |
+			  (0 << STM_USART_CR1_M) |
+			  (0 << STM_USART_CR1_WAKE) |
+			  (0 << STM_USART_CR1_PCE) |
+			  (0 << STM_USART_CR1_PS) |
+			  (0 << STM_USART_CR1_PEIE) |
+			  (0 << STM_USART_CR1_TXEIE) |
+			  (0 << STM_USART_CR1_TCIE) |
+			  (0 << STM_USART_CR1_RXNEIE) |
+			  (0 << STM_USART_CR1_IDLEIE) |
+			  (1 << STM_USART_CR1_TE) |
+			  (1 << STM_USART_CR1_RE) |
+			  (0 << STM_USART_CR1_RWU) |
+			  (0 << STM_USART_CR1_SBK));
+
+	stm_usart1.cr2 = ((0 << STM_USART_CR2_LINEN) |
+			  (STM_USART_CR2_STOP_1 << STM_USART_CR2_STOP) |
+			  (0 << STM_USART_CR2_CLKEN) |
+			  (0 << STM_USART_CR2_CPOL) |
+			  (0 << STM_USART_CR2_CPHA) |
+			  (0 << STM_USART_CR2_LBCL) |
+			  (0 << STM_USART_CR2_LBDIE) |
+			  (0 << STM_USART_CR2_LBDL) |
+			  (0 << STM_USART_CR2_ADD));
+
+	stm_usart1.cr3 = ((0 << STM_USART_CR3_ONEBITE) |
+			  (0 << STM_USART_CR3_CTSIE) |
+			  (0 << STM_USART_CR3_CTSE) |
+			  (0 << STM_USART_CR3_RTSE) |
+			  (0 << STM_USART_CR3_DMAT) |
+			  (0 << STM_USART_CR3_DMAR) |
+			  (0 << STM_USART_CR3_SCEN) |
+			  (0 << STM_USART_CR3_NACK) |
+			  (0 << STM_USART_CR3_HDSEL) |
+			  (0 << STM_USART_CR3_IRLP) |
+			  (0 << STM_USART_CR3_IREN) |
+			  (0 << STM_USART_CR3_EIE));
+}
+
+void
+outbyte(char c)
+{
+	if (c == '\n')
+		outbyte('\r');
+	while (!(stm_usart1.sr & (1 << STM_USART_SR_TXE)))
+		;
+	stm_usart1.dr = c;
+}
+
+int putc( int c, FILE * stream ) {
+	outbyte(c);
+}
+
+void
+serial_string(char *string)
+{
+	char	c;
+
+	while (c = *string++)
+		outbyte(c);
+}
+
+void
+set_timer6(void)
+{
+	/* Turn on timer 6 */
+	stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_TIM6EN);
+
+	
+}
+
+void
+main (void)
+{
+	set_clock();
+	set_serial();
+	set_timer6();
+	stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOBEN);
+	stm_moder_set(&stm_gpiob, 7, STM_MODER_OUTPUT);
+	stm_moder_set(&stm_gpiob, 6, STM_MODER_OUTPUT);
+	for (;;) {
+		stm_gpiob.odr = (1 << 7);
+		printf ("hello, ");
+		delay();
+		stm_gpiob.odr = (1 << 6);
+		printf ("world\n");
+		delay();
+	}
+}
+
+void
+delay(void)
+{
+	int i;
+	for (i = 0; i < 1000000; i++)
+		__asm__ __volatile__ ("nop\n\t":::"memory");
+}
+
+static int x = 7;
+
+extern char __stack__;
+extern char __text_start__, __text_end__;
+extern char __data_start__, __data_end__;
+extern char __bss_start__, __bss_end__;
+
+void start(void) {
+	memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
+	memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
+	main();
+}
+
+__attribute__ ((section(".interrupt")))
+static const void *interrupt[] = {
+	&__stack__,
+	start,
+};
-- 
cgit v1.2.3


From b8100ea5042013bb4eed67907b4e9d4e5c196df2 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 16 Mar 2012 20:23:31 -0700
Subject: Add stm bringup timers and move most of the setup code to the stm dir

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/stm-bringup/Makefile  | 33 +++++++++++++++++-----------
 src/stm-bringup/bringup.c | 56 +++++++++++++++++++++++++++++------------------
 2 files changed, 55 insertions(+), 34 deletions(-)

(limited to 'src/stm-bringup')

diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile
index 49966a4f..1ba480ba 100644
--- a/src/stm-bringup/Makefile
+++ b/src/stm-bringup/Makefile
@@ -1,34 +1,41 @@
+vpath % ..:../core:../product:../drivers:../stm
+vpath ao-make-product.5c ../util
+
+ifndef VERSION
+include ../Version
+endif
+
 CC=arm-none-eabi-gcc
 OBJCOPY=arm-none-eabi-objcopy
 
-C_LIB=/local/src/pdclib/pdclib.a
-C_INC=-I/local/src/pdclib/includes -I/local/src/pdclib/internals
+PDCLIB=/home/keithp/sat
+C_LIB=$(PDCLIB)/lib/pdclib.a
+C_INC=-I$(PDCLIB)/include
 
-DEF_CFLAGS=-g -std=gnu99 -O0 -mlittle-endian -mthumb -ffreestanding -nostdlib -I../../src/stm $(C_INC)
+DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I../../src/stm $(C_INC)
 
 # to run from SRAM
-LD_FLAGS_RAM=-Wl,-Taltos-ram.ld
-LD_FLAGS=-Wl,-Taltos.ld
+LD_FLAGS_RAM=-L../stm -Wl,-Taltos-ram.ld
+LD_FLAGS=-L../stm -Wl,-Taltos.ld
 
 CFLAGS=$(DEF_CFLAGS) -mcpu=cortex-m3 -DCONFIG_STM32L_DISCOVERY
 
-OBJS=bringup.o
+SRC=bringup.c ao_interrupt.c
+OBJ=$(SRC:.c=.o)
 
 all: bringup-ram.elf bringup.elf
 
 %.bin: %.elf
 	$(OBJCOPY) -O binary $^ $@
 
-bringup.elf: $(OBJS) $(C_LIB) altos.ld
-	$(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJS) $(C_LIB) -lgcc
-
-bringup-ram.elf: $(OBJS) $(C_LIB) altos-ram.ld
-	$(CC) $(CFLAGS) $(LD_FLAGS_RAM) -o $@ $(OBJS) $(C_LIB) -lgcc
+bringup.elf: $(OBJ) $(C_LIB) altos.ld
+	$(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJ) $(C_LIB) -lgcc
 
-bringup.o: bringup.c
-	$(CC) -c $(CFLAGS) bringup.c
+bringup-ram.elf: $(OBJ) $(C_LIB) altos-ram.ld
+	$(CC) $(CFLAGS) $(LD_FLAGS_RAM) -o $@ $(OBJ) $(C_LIB) -lgcc
 
 clean:
+	rm -f *.o
 	rm -rf *.elf
 	rm -rf *.bin
 
diff --git a/src/stm-bringup/bringup.c b/src/stm-bringup/bringup.c
index b6fe458d..c5fad4a3 100644
--- a/src/stm-bringup/bringup.c
+++ b/src/stm-bringup/bringup.c
@@ -250,13 +250,46 @@ serial_string(char *string)
 		outbyte(c);
 }
 
+volatile uint16_t	tick_count;
+
+void
+stm_tim6_isr(void)
+{
+	if (stm_tim6.sr & (1 << STM_TIM67_SR_UIF)) {
+		stm_tim6.sr = 0;
+		++tick_count;
+	}
+}
+
+#define TIMER_10kHz	(STM_APB1 / 10000)
+
 void
 set_timer6(void)
 {
+	stm_nvic_set_enable(STM_ISR_TIM6_POS);
+	stm_nvic_set_priority(STM_ISR_TIM6_POS, 1);
+
 	/* Turn on timer 6 */
 	stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_TIM6EN);
 
-	
+	stm_tim6.psc = TIMER_10kHz;
+	stm_tim6.arr = 100;
+	stm_tim6.cnt = 0;
+
+	/* Enable update interrupt */
+	stm_tim6.dier = (1 << STM_TIM67_DIER_UIE);
+
+	/* Poke timer to reload values */
+	stm_tim6.egr |= (1 << STM_TIM67_EGR_UG);
+
+	stm_tim6.cr2 = (STM_TIM67_CR2_MMS_RESET << STM_TIM67_CR2_MMS);
+
+	/* And turn it on */
+	stm_tim6.cr1 = ((0 << STM_TIM67_CR1_ARPE) |
+			(0 << STM_TIM67_CR1_OPM) |
+			(1 << STM_TIM67_CR1_URS) |
+			(0 << STM_TIM67_CR1_UDIS) |
+			(1 << STM_TIM67_CR1_CEN));
 }
 
 void
@@ -273,7 +306,7 @@ main (void)
 		printf ("hello, ");
 		delay();
 		stm_gpiob.odr = (1 << 6);
-		printf ("world\n");
+		printf ("world %d\n", tick_count);
 		delay();
 	}
 }
@@ -285,22 +318,3 @@ delay(void)
 	for (i = 0; i < 1000000; i++)
 		__asm__ __volatile__ ("nop\n\t":::"memory");
 }
-
-static int x = 7;
-
-extern char __stack__;
-extern char __text_start__, __text_end__;
-extern char __data_start__, __data_end__;
-extern char __bss_start__, __bss_end__;
-
-void start(void) {
-	memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
-	memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
-	main();
-}
-
-__attribute__ ((section(".interrupt")))
-static const void *interrupt[] = {
-	&__stack__,
-	start,
-};
-- 
cgit v1.2.3


From 7662a0096a860cddac413a310305fe842830c3b5 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 18 Mar 2012 22:29:51 -0700
Subject: Add .gitignore file to stm-bringup

Ignore generated binaries

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/stm-bringup/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/stm-bringup/.gitignore

(limited to 'src/stm-bringup')

diff --git a/src/stm-bringup/.gitignore b/src/stm-bringup/.gitignore
new file mode 100644
index 00000000..50992530
--- /dev/null
+++ b/src/stm-bringup/.gitignore
@@ -0,0 +1 @@
+*.elf
-- 
cgit v1.2.3


From 5f63065a16b65618b39314880c72074f0a8b5550 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 7 Apr 2012 00:22:02 -0700
Subject: altos: Add fake install/uninstall targets for stm-bringup

Keep global 'make install' from failing.
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/stm-bringup/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/stm-bringup')

diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile
index 1ba480ba..01c80614 100644
--- a/src/stm-bringup/Makefile
+++ b/src/stm-bringup/Makefile
@@ -40,3 +40,7 @@ clean:
 	rm -rf *.bin
 
 .PHONY: all clean
+
+install:
+
+uninstall:
-- 
cgit v1.2.3


From a5d873d47b3b16ca32559b4de668bf07b25eddb0 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 17 Jul 2012 01:24:52 -0700
Subject: altos: Place STM config values at fixed addresses for re-use

Just like cc1111, stick the serial number and radio calibration values
at known fixed addresses so that when re-flashing the board, we can go
find the existing values.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 ao-tools/ao-load/ao-load.c    |  2 +-
 src/avr/ao_arch.h             |  6 +++++-
 src/avr/ao_romconfig.c        |  2 +-
 src/cc1111/ao_arch.h          | 10 ++++++----
 src/core/ao_product.c         |  2 +-
 src/drivers/ao_cc1120.c       |  2 +-
 src/drivers/ao_companion.c    |  4 +++-
 src/megametrum-v0.1/Makefile  |  2 +-
 src/megametrum-v0.1/ao_pins.h |  4 ++++
 src/stm-bringup/Makefile      |  4 ++--
 src/stm/altos.ld              | 21 +++++++++++----------
 src/stm/ao_arch.h             | 12 ++++++++++++
 src/stm/ao_romconfig.c        |  7 ++++++-
 13 files changed, 54 insertions(+), 24 deletions(-)

(limited to 'src/stm-bringup')

diff --git a/ao-tools/ao-load/ao-load.c b/ao-tools/ao-load/ao-load.c
index 1b729d39..e3cef4a5 100644
--- a/ao-tools/ao-load/ao-load.c
+++ b/ao-tools/ao-load/ao-load.c
@@ -197,7 +197,7 @@ main (int argc, char **argv)
 
 	serial = strtoul(serial_string, NULL, 0);
 	if (!serial)
-(argv[0]);
+		usage(argv[0]);
 
 	serial_int[0] = serial & 0xff;
 	serial_int[1] = (serial >> 8) & 0xff;
diff --git a/src/avr/ao_arch.h b/src/avr/ao_arch.h
index c775dab6..a14d0ade 100644
--- a/src/avr/ao_arch.h
+++ b/src/avr/ao_arch.h
@@ -67,7 +67,11 @@ extern void putchar(char c);
 extern char getchar(void);
 extern void ao_avr_stdio_init(void);
 
-extern const uint16_t ao_serial_number;
+#define AO_ROMCONFIG_VERSION	2
+
+#define AO_ROMCONFIG_SYMBOL(a) const
+
+extern AO_ROMCONFIG_SYMBOL(0) uint16_t ao_serial_number;
 
 #define AVR_PUSH8(stack, val)	(*((stack)--) = (val))
 
diff --git a/src/avr/ao_romconfig.c b/src/avr/ao_romconfig.c
index bbb677e2..ecc19c76 100644
--- a/src/avr/ao_romconfig.c
+++ b/src/avr/ao_romconfig.c
@@ -17,4 +17,4 @@
 
 #include "ao.h"
 
-const uint16_t ao_serial_number = 0;
+AO_ROMCONFIG_SYMBOL (0) uint16_t ao_serial_number = 0;
diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 8d9e4952..06b04b93 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -59,10 +59,12 @@
 
 #define AO_ROMCONFIG_VERSION	2
 
-extern __code __at (0x00a0) uint16_t ao_romconfig_version;
-extern __code __at (0x00a2) uint16_t ao_romconfig_check;
-extern __code __at (0x00a4) uint16_t ao_serial_number;
-extern __code __at (0x00a6) uint32_t ao_radio_cal;
+#define AO_ROMCONFIG_SYMBOL(a) __code __at(a)
+
+extern AO_ROMCONFIG_SYMBOL(0x00a0) uint16_t ao_romconfig_version;
+extern AO_ROMCONFIG_SYMBOL(0x00a2) uint16_t ao_romconfig_check;
+extern AO_ROMCONFIG_SYMBOL(0x00a4) uint16_t ao_serial_number;
+extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
 
 #ifndef HAS_USB
 #error Please define HAS_USB
diff --git a/src/core/ao_product.c b/src/core/ao_product.c
index 67ec6793..ec91b978 100644
--- a/src/core/ao_product.c
+++ b/src/core/ao_product.c
@@ -29,7 +29,7 @@ const char ao_product[] = AO_iProduct_STRING;
 #if HAS_USB
 #include "ao_usb.h"
 /* USB descriptors in one giant block of bytes */
-__code __at(0x00aa) uint8_t ao_usb_descriptors [] =
+AO_ROMCONFIG_SYMBOL(0x00aa) uint8_t ao_usb_descriptors [] =
 {
 	/* Device descriptor */
 	0x12,
diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index 569df3b7..97a434d8 100644
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -29,7 +29,7 @@ uint8_t ao_radio_in_recv;
 #define CC1120_DEBUG	AO_FEC_DEBUG
 #define CC1120_TRACE	0
 
-const uint32_t	ao_radio_cal = 0x6ca333;
+extern const uint32_t	ao_radio_cal;
 
 #define FOSC	32000000
 
diff --git a/src/drivers/ao_companion.c b/src/drivers/ao_companion.c
index 6e0bd2ec..c749adea 100644
--- a/src/drivers/ao_companion.c
+++ b/src/drivers/ao_companion.c
@@ -68,7 +68,7 @@ ao_companion_get_setup(void)
 	ao_spi_recv(&ao_companion_setup, sizeof (ao_companion_setup), AO_COMPANION_SPI_BUS);
 	COMPANION_DESELECT();
 	return (ao_companion_setup.board_id ==
-		~ao_companion_setup.board_id_inverse);
+		(uint16_t) ~ao_companion_setup.board_id_inverse);
 }
 
 static void
@@ -116,6 +116,8 @@ ao_companion_status(void) __reentrant
 {
 	uint8_t	i;
 	printf("Companion running: %d\n", ao_companion_running);
+	if (!ao_companion_running)
+		return;
 	printf("device: %d\n", ao_companion_setup.board_id);
 	printf("update period: %d\n", ao_companion_setup.update_period);
 	printf("channels: %d\n", ao_companion_setup.channels);
diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index a519609e..4a4c983a 100644
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -92,7 +92,7 @@ OBJ=$(SRC:.c=.o)
 
 all: $(PROG)
 
-$(PROG): Makefile $(OBJ)
+$(PROG): Makefile $(OBJ) altos.ld
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
 
 ../altitude.h: make-altitude
diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index 2c438f6c..6b0f9832 100644
--- a/src/megametrum-v0.1/ao_pins.h
+++ b/src/megametrum-v0.1/ao_pins.h
@@ -268,6 +268,10 @@ struct ao_adc {
  * Radio (cc1120)
  */
 
+/* gets pretty close to 434.550 */
+
+#define AO_RADIO_CAL_DEFAULT 	0x6ca333
+
 #define AO_FEC_DEBUG		0
 #define AO_CC1120_SPI_CS_PORT	(&stm_gpioc)
 #define AO_CC1120_SPI_CS_PIN	5
diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile
index 01c80614..d45e836d 100644
--- a/src/stm-bringup/Makefile
+++ b/src/stm-bringup/Makefile
@@ -16,7 +16,7 @@ DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I
 
 # to run from SRAM
 LD_FLAGS_RAM=-L../stm -Wl,-Taltos-ram.ld
-LD_FLAGS=-L../stm -Wl,-Taltos.ld
+LD_FLAGS=-L../stm -Wl,-Tbringup.ld
 
 CFLAGS=$(DEF_CFLAGS) -mcpu=cortex-m3 -DCONFIG_STM32L_DISCOVERY
 
@@ -28,7 +28,7 @@ all: bringup-ram.elf bringup.elf
 %.bin: %.elf
 	$(OBJCOPY) -O binary $^ $@
 
-bringup.elf: $(OBJ) $(C_LIB) altos.ld
+bringup.elf: $(OBJ) $(C_LIB) bringup.ld
 	$(CC) $(CFLAGS) $(LD_FLAGS) -o $@ $(OBJ) $(C_LIB) -lgcc
 
 bringup-ram.elf: $(OBJ) $(C_LIB) altos-ram.ld
diff --git a/src/stm/altos.ld b/src/stm/altos.ld
index f5a84f4c..f78a45d6 100644
--- a/src/stm/altos.ld
+++ b/src/stm/altos.ld
@@ -25,18 +25,22 @@ INCLUDE registers.ld
 EXTERN (stm_interrupt_vector)
 
 SECTIONS {
-	. = ORIGIN(rom);
-
 	/*
 	 * Rom contents
 	 */
 
-	__text_start__ = .;
-
-	.text : {
+	.text ORIGIN(rom) : {
+		__text_start__ = .;
 		*(.interrupt)	/* Interrupt vectors */
+
+		. = ORIGIN(rom) + 0x100;
+
+		ao_romconfig.o(.romconfig*)
+		ao_product.o(.romconfig*)
+
 		*(.text*)	/* Executable code */
 		*(.rodata*)	/* Constants */
+
 	} > rom
 
 	.ARM.exidx : {
@@ -44,12 +48,10 @@ SECTIONS {
 		__text_end__ = .;
 	} > rom
 
-	. = ORIGIN(ram);
-	__data_start__ = .;
-
 	/* Data -- relocated to RAM, but written to ROM
 	 */
-	.data : AT (ADDR(.ARM.exidx) + SIZEOF (.ARM.exidx)) {
+	.data ORIGIN(ram) : AT (ADDR(.ARM.exidx) + SIZEOF (.ARM.exidx)) {
+		__data_start__ = .;
 		*(.data)	/* initialized data */
 		__data_end__ = .;
 		__bss_start__ = .;
@@ -63,7 +65,6 @@ SECTIONS {
 
 	PROVIDE(__stack__ = ORIGIN(ram) + LENGTH(ram));
 	PROVIDE(end = .);
-
 }
 
 ENTRY(start);
diff --git a/src/stm/ao_arch.h b/src/stm/ao_arch.h
index d8fa3e89..484ce89e 100644
--- a/src/stm/ao_arch.h
+++ b/src/stm/ao_arch.h
@@ -59,7 +59,19 @@ extern void putchar(char c);
 extern char getchar(void);
 extern void ao_avr_stdio_init(void);
 
+
+/*
+ * ao_romconfig.c
+ */
+
+#define AO_ROMCONFIG_VERSION	2
+
+#define AO_ROMCONFIG_SYMBOL(a) __attribute__((section(".romconfig"))) const
+
+extern const uint16_t ao_romconfig_version;
+extern const uint16_t ao_romconfig_check;
 extern const uint16_t ao_serial_number;
+extern const uint32_t ao_radio_cal;
 
 #define ARM_PUSH32(stack, val)	(*(--(stack)) = (val))
 
diff --git a/src/stm/ao_romconfig.c b/src/stm/ao_romconfig.c
index 84317458..cbb922ec 100644
--- a/src/stm/ao_romconfig.c
+++ b/src/stm/ao_romconfig.c
@@ -17,4 +17,9 @@
 
 #include "ao.h"
 
-const uint16_t ao_serial_number = 58;
+AO_ROMCONFIG_SYMBOL (0) uint16_t ao_romconfig_version = AO_ROMCONFIG_VERSION;
+AO_ROMCONFIG_SYMBOL (0) uint16_t ao_romconfig_check = ~AO_ROMCONFIG_VERSION;
+AO_ROMCONFIG_SYMBOL (0) uint16_t ao_serial_number = 0;
+#ifdef AO_RADIO_CAL_DEFAULT
+AO_ROMCONFIG_SYMBOL (0) uint32_t ao_radio_cal = AO_RADIO_CAL_DEFAULT;
+#endif
-- 
cgit v1.2.3


From 354c1fed7f06c2c45c661e7265c2ac4bc47e2750 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 30 Aug 2012 16:22:51 -0500
Subject: altos: Add a bunch of .gitignore entries

Clean up the git status output

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 ao-tools/ao-stmload/.gitignore |  1 +
 src/spiradio-v0.1/.gitignore   |  2 ++
 src/stm-bringup/bringup.ld     | 69 ++++++++++++++++++++++++++++++++++++++++++
 src/telefire-v0.1/.gitignore   |  2 ++
 src/test/.gitignore            |  3 ++
 5 files changed, 77 insertions(+)
 create mode 100644 ao-tools/ao-stmload/.gitignore
 create mode 100644 src/spiradio-v0.1/.gitignore
 create mode 100644 src/stm-bringup/bringup.ld
 create mode 100644 src/telefire-v0.1/.gitignore

(limited to 'src/stm-bringup')

diff --git a/ao-tools/ao-stmload/.gitignore b/ao-tools/ao-stmload/.gitignore
new file mode 100644
index 00000000..dedb0094
--- /dev/null
+++ b/ao-tools/ao-stmload/.gitignore
@@ -0,0 +1 @@
+ao-stmload
diff --git a/src/spiradio-v0.1/.gitignore b/src/spiradio-v0.1/.gitignore
new file mode 100644
index 00000000..8e39138e
--- /dev/null
+++ b/src/spiradio-v0.1/.gitignore
@@ -0,0 +1,2 @@
+spiradio-*
+ao_product.h
diff --git a/src/stm-bringup/bringup.ld b/src/stm-bringup/bringup.ld
new file mode 100644
index 00000000..10d50cd6
--- /dev/null
+++ b/src/stm-bringup/bringup.ld
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+MEMORY {
+	rom (rx) : ORIGIN = 0x08000000, LENGTH = 128K
+	ram (!w) : ORIGIN = 0x20000000, LENGTH = 16K
+}
+
+INCLUDE registers.ld
+
+EXTERN (stm_interrupt_vector)
+
+SECTIONS {
+	/*
+	 * Rom contents
+	 */
+
+	.text ORIGIN(rom) : {
+		__text_start__ = .;
+		*(.interrupt)	/* Interrupt vectors */
+
+		*(.text*)	/* Executable code */
+		*(.rodata*)	/* Constants */
+	} > rom
+
+	.ARM.exidx : {
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+		__text_end__ = .;
+	} > rom
+
+	. = ORIGIN(ram);
+	__data_start__ = .;
+
+	/* Data -- relocated to RAM, but written to ROM
+	 */
+	.data : AT (ADDR(.ARM.exidx) + SIZEOF (.ARM.exidx)) {
+		*(.data)	/* initialized data */
+		__data_end__ = .;
+		__bss_start__ = .;
+	} >ram
+
+	.bss : {
+		*(.bss)
+		*(COMMON)
+		__bss_end__ = .;
+	} >ram
+
+	PROVIDE(__stack__ = ORIGIN(ram) + LENGTH(ram));
+	PROVIDE(end = .);
+
+}
+
+ENTRY(start);
+
+
diff --git a/src/telefire-v0.1/.gitignore b/src/telefire-v0.1/.gitignore
new file mode 100644
index 00000000..4d4f4200
--- /dev/null
+++ b/src/telefire-v0.1/.gitignore
@@ -0,0 +1,2 @@
+telefire-*
+ao_product.h
diff --git a/src/test/.gitignore b/src/test/.gitignore
index 33c7ef35..5d528ab9 100644
--- a/src/test/.gitignore
+++ b/src/test/.gitignore
@@ -4,3 +4,6 @@ ao_flight_test_accel
 ao_gps_test
 ao_gps_test_skytraq
 ao_convert_test
+ao_convert_pa_test
+ao_fec_test
+ao_flight_test_noisy_accel
-- 
cgit v1.2.3