From: Keith Packard <keithp@keithp.com>
Date: Fri, 16 May 2014 05:46:41 +0000 (-0600)
Subject: altos: stm and lpc ao_boot.h were identical. move to kernel.
X-Git-Tag: 1.3.2.2~90
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6833e466d7d77765199bf4d21437c34a4eceb044

altos: stm and lpc ao_boot.h were identical. move to kernel.

These two files were absolutely identical, so share them by moving
under kernel instead.x

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

diff --git a/src/kernel/ao_boot.h b/src/kernel/ao_boot.h
new file mode 100644
index 00000000..62392d25
--- /dev/null
+++ b/src/kernel/ao_boot.h
@@ -0,0 +1,41 @@
+/*
+ * 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_BOOT_H_
+#define _AO_BOOT_H_
+
+void
+ao_boot_chain(uint32_t *base);
+
+void
+ao_boot_check_pin(void);
+
+/* Return true to switch to application (if present) */
+int
+ao_boot_check_chain(void);
+
+void
+ao_boot_reboot(uint32_t *base);
+
+#define AO_BOOT_FORCE_LOADER	((uint32_t *) 0)
+
+static inline void
+ao_boot_loader(void) {
+	ao_boot_reboot(AO_BOOT_FORCE_LOADER);
+}
+
+#endif /* _AO_BOOT_H_ */
diff --git a/src/lpc/ao_boot.h b/src/lpc/ao_boot.h
deleted file mode 100644
index 62392d25..00000000
--- a/src/lpc/ao_boot.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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_BOOT_H_
-#define _AO_BOOT_H_
-
-void
-ao_boot_chain(uint32_t *base);
-
-void
-ao_boot_check_pin(void);
-
-/* Return true to switch to application (if present) */
-int
-ao_boot_check_chain(void);
-
-void
-ao_boot_reboot(uint32_t *base);
-
-#define AO_BOOT_FORCE_LOADER	((uint32_t *) 0)
-
-static inline void
-ao_boot_loader(void) {
-	ao_boot_reboot(AO_BOOT_FORCE_LOADER);
-}
-
-#endif /* _AO_BOOT_H_ */
diff --git a/src/stm/ao_boot.h b/src/stm/ao_boot.h
deleted file mode 100644
index 62392d25..00000000
--- a/src/stm/ao_boot.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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_BOOT_H_
-#define _AO_BOOT_H_
-
-void
-ao_boot_chain(uint32_t *base);
-
-void
-ao_boot_check_pin(void);
-
-/* Return true to switch to application (if present) */
-int
-ao_boot_check_chain(void);
-
-void
-ao_boot_reboot(uint32_t *base);
-
-#define AO_BOOT_FORCE_LOADER	((uint32_t *) 0)
-
-static inline void
-ao_boot_loader(void) {
-	ao_boot_reboot(AO_BOOT_FORCE_LOADER);
-}
-
-#endif /* _AO_BOOT_H_ */