Pulling in some of the makefile changes that are in master into this

branch to make merging easier later on.

examples/stm32/f4/stm32f4-disco/lcd-serial/lcd-spi.h

@@ -0,0 +1,61 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2014 Chuck McManis <cmcmanis@mcmanis.com>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LCD_SPI_H
+#define LCD_SPI_H
+
+/*
+ * prototypes for the LCD example
+ *
+ * This is a very basic API, initialize, a function which will show the
+ * frame, and a function which will draw a pixel in the framebuffer.
+ */
+
+void lcd_spi_init(void);
+void lcd_show_frame(void);
+void lcd_draw_pixel(int x, int y, uint16_t color);
+
+// Color definitions
+#define	LCD_BLACK   0x0000
+#define	LCD_BLUE    0x1F00
+#define	LCD_RED     0x00F8
+#define	LCD_GREEN   0xE007
+#define LCD_CYAN    0xFF07
+#define LCD_MAGENTA 0x1FF8
+#define LCD_YELLOW  0xE0FF  
+#define LCD_WHITE   0xFFFF
+#define LCD_GREY    0xc339
+
+/*
+ * SPI Port and GPIO Defined - for STM32F4-Disco
+ */
+// #define LCD_RESET   PA3  not used
+#define LCD_CS      PC2     // CH 1
+#define LCD_SCK     PF7     // CH 2
+#define LCD_DC      PD13     // CH 4
+#define LCD_MOSI    PF9     // CH 3
+
+#define LCD_SPI     SPI5
+
+#define LCD_WIDTH   240
+#define LCD_HEIGHT  320
+
+#define FRAME_SIZE  (LCD_WIDTH * LCD_HEIGHT)
+#define FRAME_SIZE_BYTES    (FRAME_SIZE * 2)
+#endif