altos: Add ChaosKey v1.0 product

Much like ChaosKey v0.1, just different SoC package and a few wiring changes.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/Makefile b/src/Makefile
index ebe1df9c18285f1a999f309844fc70fb6103b352..98607031a8c0a871b5e2d2b7dd3232a11ac285b9 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -43,7 +43,8 @@ ARMM3DIRS=\
 
 ARMM0DIRS=\
        easymini-v1.0 easymini-v1.0/flash-loader \
 
 ARMM0DIRS=\
        easymini-v1.0 easymini-v1.0/flash-loader \

-       chaoskey-v0.1 chaoskey-v0.1/flash-loader
+       chaoskey-v0.1 chaoskey-v0.1/flash-loader \
+       chaoskey-v1.0 chaoskey-v1.0/flash-loader

 
 AVRDIRS=\
        telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1 microkite
 
 AVRDIRS=\
        telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1 microkite

diff --git a/src/chaoskey-v1.0/.gitignore b/src/chaoskey-v1.0/.gitignore
new file mode 100644 (file)
index 0000000..b0adba2
--- /dev/null
+++ b/src/chaoskey-v1.0/.gitignore
@@ -0,0 +1,2 @@
+ao_product.h
+chaoskey-*

diff --git a/src/chaoskey-v1.0/Makefile b/src/chaoskey-v1.0/Makefile
new file mode 100644 (file)
index 0000000..d9944a1
--- /dev/null
+++ b/src/chaoskey-v1.0/Makefile
@@ -0,0 +1,73 @@
+#
+# AltOS build
+#
+#
+
+include ../stmf0/Makefile.defs
+
+INC = \
+       ao.h \
+       ao_arch.h \
+       ao_arch_funcs.h \
+       ao_pins.h \
+       ao_product.h \
+       ao_task.h \
+       ao_adc_fast.h \
+       ao_power.h \
+       stm32f0.h
+
+#
+# Common AltOS sources
+#
+ALTOS_SRC = \
+       ao_interrupt.c \
+       ao_timer.c \
+       ao_panic.c \
+       ao_mutex.c \
+       ao_dma_stm.c \
+       ao_adc_fast.c \
+       ao_crc_stm.c \
+       ao_stdio.c \
+       ao_led.c \
+       ao_romconfig.c \
+       ao_boot_chain.c \
+       ao_usb_stm.c \
+       ao_trng_send.c \
+       ao_task.c \
+       ao_power.c \
+       ao_gpio.c \
+       ao_product.c
+
+PRODUCT=ChaosKey-hw-1.0-sw-$(VERSION)
+PRODUCT_DEF=-DCHAOSKEY_V_1_0
+IDVENDOR=0x1d50
+IDPRODUCT=0x60c6
+
+CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os
+
+PROGNAME=chaoskey-v1.0
+PROG=$(PROGNAME)-$(VERSION).elf
+HEX=$(PROGNAME)-$(VERSION).ihx
+
+SRC=$(ALTOS_SRC) ao_chaoskey.c
+OBJ=$(SRC:.c=.o)
+
+all: $(PROG) $(HEX)
+
+$(PROG): Makefile $(OBJ) altos.ld
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
+
+ao_product.h: ao-make-product.5c ../Version
+       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -V $(IDVENDOR) -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) -o $@
+
+$(OBJ): $(INC)
+
+distclean:     clean
+
+clean:
+       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
+       rm -f ao_product.h
+
+install:
+
+uninstall:

diff --git a/src/chaoskey-v1.0/ao_chaoskey.c b/src/chaoskey-v1.0/ao_chaoskey.c
new file mode 100644 (file)
index 0000000..f887e60
--- /dev/null
+++ b/src/chaoskey-v1.0/ao_chaoskey.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2014 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 <ao.h>
+#include <ao_adc_fast.h>
+#include <ao_crc.h>
+#include <ao_trng_send.h>
+
+void main(void)
+{
+       ao_led_init(LEDS_AVAILABLE);
+       ao_clock_init();
+       ao_task_init();
+       ao_timer_init();
+       ao_dma_init();
+       ao_adc_init();
+       ao_crc_init();
+
+       ao_usb_init();
+
+       ao_trng_send_init();
+
+       ao_start_scheduler();
+}

diff --git a/src/chaoskey-v1.0/ao_pins.h b/src/chaoskey-v1.0/ao_pins.h
new file mode 100644 (file)
index 0000000..89a2cb0
--- /dev/null
+++ b/src/chaoskey-v1.0/ao_pins.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2015 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.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#define LED_PORT_ENABLE        STM_RCC_AHBENR_IOPBEN
+#define LED_PORT       (&stm_gpiob)
+#define LED_PIN_RED    4
+#define AO_LED_RED     (1 << LED_PIN_RED)
+
+#define LEDS_AVAILABLE (AO_LED_RED)
+
+#define AO_POWER_MANAGEMENT    1
+#define AO_LED_POWER           AO_LED_RED
+
+#define HAS_BEEP       0
+
+/* 48MHz clock based on USB */
+#define AO_HSI48       1
+
+/* HCLK = 48MHz */
+#define AO_AHB_PRESCALER       1
+#define AO_RCC_CFGR_HPRE_DIV   STM_RCC_CFGR_HPRE_DIV_1
+
+/* APB = 48MHz */
+#define AO_APB_PRESCALER       1
+#define AO_RCC_CFGR_PPRE_DIV   STM_RCC_CFGR_PPRE_DIV_1
+
+#define HAS_USB                                1
+#define AO_USB_DIRECTIO                        1
+#define AO_PA11_PA12_RMP               1
+#define AO_USB_DEVICE_CLASS            0xff
+#define AO_USB_INTERFACE_CLASS_DATA    0xff
+#define AO_USB_HAS_OUT                 0
+#define AO_USB_HAS_IN                  1
+#define AO_USB_HAS_IN2                 1
+#define AO_USB_HAS_INT                 0
+#define AO_USB_SELF_POWER              0
+#define AO_USB_DEVICE_ID_SERIAL                1
+#define AO_USB_START_DISABLED          1
+#define USE_USB_STDIO                  0
+
+#define IS_FLASH_LOADER        0
+
+/* ADC */
+
+#define AO_ADC_PIN0_PORT       (&stm_gpioa)
+#define AO_ADC_PIN0_PIN                0
+#define AO_ADC_PIN0_CH         0
+
+#define AO_ADC_RCC_AHBENR      ((1 << STM_RCC_AHBENR_IOPAEN))
+
+#define AO_NUM_ADC             1
+
+/* TRNG enable */
+
+#define AO_TRNG_ENABLE_PORT    (&stm_gpioa)
+#define AO_TRNG_ENABLE_BIT     1
+
+/* CRC */
+#define AO_CRC_WIDTH   32
+#define AO_CRC_INIT    0xffffffff
+
+/* Mode pin */
+#define AO_RAW_PORT            (&stm_gpioa)
+#define AO_RAW_BIT             15
+
+#endif /* _AO_PINS_H_ */

diff --git a/src/chaoskey-v1.0/flash-loader/.gitignore b/src/chaoskey-v1.0/flash-loader/.gitignore
new file mode 100644 (file)
index 0000000..a60a494
--- /dev/null
+++ b/src/chaoskey-v1.0/flash-loader/.gitignore
@@ -0,0 +1,2 @@
+ao_product.h
+chaoskey*

diff --git a/src/chaoskey-v1.0/flash-loader/Makefile b/src/chaoskey-v1.0/flash-loader/Makefile
new file mode 100644 (file)
index 0000000..4f84014
--- /dev/null
+++ b/src/chaoskey-v1.0/flash-loader/Makefile
@@ -0,0 +1,8 @@
+#
+# AltOS flash loader build
+#
+#
+
+TOPDIR=../..
+HARDWARE=chaoskey-v1.0
+include $(TOPDIR)/stmf0/Makefile-flash.defs

diff --git a/src/chaoskey-v1.0/flash-loader/ao_pins.h b/src/chaoskey-v1.0/flash-loader/ao_pins.h
new file mode 100644 (file)
index 0000000..570800c
--- /dev/null
+++ b/src/chaoskey-v1.0/flash-loader/ao_pins.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2013 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.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#include <ao_flash_stm_pins.h>
+
+/* Pin 5 on debug connector */
+
+#define AO_BOOT_PIN                    1
+#define AO_BOOT_APPLICATION_GPIO       stm_gpioa
+#define AO_BOOT_APPLICATION_PIN                15
+#define AO_BOOT_APPLICATION_VALUE      1
+#define AO_BOOT_APPLICATION_MODE       AO_EXTI_MODE_PULL_UP
+
+/* USB */
+#define HAS_USB                        1
+#define AO_USB_DIRECTIO                0
+#define AO_PA11_PA12_RMP       1
+
+#endif /* _AO_PINS_H_ */