Merge pull request #61 from YuzukiHD/dev

avaota-a1 add lcd warn info

Author: YuzukiTsuru

board/avaota-a1/extlinux_boot/main.c

@@ -125,6 +125,8 @@ static int fatfs_loadimage_size(char *filename, BYTE *dest, uint32_t *file_size)
     fret = f_open(&file, filename, FA_OPEN_EXISTING | FA_READ);
     if (fret != FR_OK) {
         printk(LOG_LEVEL_ERROR, "FATFS: open, filename: [%s]: error %d\n", filename, fret);
+        LCD_ShowString(0, 0, "WARN: Open file fail, filename:", SPI_LCD_COLOR_YELLOW, SPI_LCD_COLOR_BLACK, 12);
+        LCD_ShowString(10, 12, filename, SPI_LCD_COLOR_YELLOW, SPI_LCD_COLOR_BLACK, 12);
         ret = -1;
         goto open_fail;
     }
@@ -687,9 +689,10 @@ int main(void) {
     printk(LOG_LEVEL_INFO, "ATF: Kernel addr: 0x%08x\n", atf_head->nos_base);
     printk(LOG_LEVEL_INFO, "ATF: Kernel DTB addr: 0x%08x\n", atf_head->dtb_base);
 
-    LCD_ShowString(0, 0, "SyterKit Now Booting", SPI_LCD_COLOR_GREEN, SPI_LCD_COLOR_BLACK, 12);
-    LCD_ShowString(0, 12, "Kernel addr: 0x40800000", SPI_LCD_COLOR_GREEN, SPI_LCD_COLOR_BLACK, 12);
-    LCD_ShowString(0, 24, "DTB addr: 0x40400000", SPI_LCD_COLOR_GREEN, SPI_LCD_COLOR_BLACK, 12);
+    /* flush buffer */
+    LCD_ShowString(0, 0,  "SyterKit Now Booting Linux                    ", SPI_LCD_COLOR_GREEN, SPI_LCD_COLOR_BLACK, 12);
+    LCD_ShowString(0, 12, "Kernel Addr: 0x40800000                       ", SPI_LCD_COLOR_GREEN, SPI_LCD_COLOR_BLACK, 12);
+    LCD_ShowString(0, 24, "DTB Addr: 0x40400000                          ", SPI_LCD_COLOR_GREEN, SPI_LCD_COLOR_BLACK, 12);
 
     clean_syterkit_data();
 

board/avaota-a1/extlinux_boot/spi_lcd.c

@@ -50,16 +50,17 @@
 
 static sunxi_spi_t sunxi_spi0_lcd = {
         .base = SUNXI_R_SPI_BASE,
+        .clk_reg = {
+                .ccu_base = SUNXI_R_PRCM_BASE,
+                .spi_clk_reg_offest = SUNXI_S_SPI_CLK_REG,
+                .spi_bgr_reg_offset = SUNXI_S_SPI_BGR_REG,
+        },
         .id = 0,
         .clk_rate = 75 * 1000 * 1000,
         .gpio_cs = {GPIO_PIN(GPIO_PORTL, 10), GPIO_PERIPH_MUX6},
         .gpio_sck = {GPIO_PIN(GPIO_PORTL, 11), GPIO_PERIPH_MUX6},
         .gpio_mosi = {GPIO_PIN(GPIO_PORTL, 12), GPIO_PERIPH_MUX6},
-        .clk_reg = {
-                .ccu_base = SUNXI_R_PRCM_BASE,
-                .spi_clk_reg_offest = SUNXI_S_SPI_CLK_REG,
-                .spi_bgr_reg_offset = SUNXI_S_SPI_BGR_REG,
-        }};
+};
 
 static gpio_mux_t lcd_dc_pins = {
         .pin = GPIO_PIN(GPIO_PORTL, 13),
@@ -131,7 +132,7 @@ static void LCD_Open_BLK() {
 
 static void LCD_Fill_All(uint16_t color) {
     uint16_t i, j;
-    LCD_Address_Set(0, 0, LCD_W - 1, LCD_H - 1);// 设置显示范围
+    LCD_Address_Set(0, 0, LCD_W - 1, LCD_H - 1);
     uint16_t *video_mem = smalloc(LCD_W * LCD_H);
 
     for (uint32_t i = 0; i < LCD_W * LCD_H; i++) {
@@ -154,7 +155,7 @@ static void LCD_Init(void) {
         printk(LOG_LEVEL_ERROR, "SPI: init failed\n");
     }
 
-    LCD_Set_RES(0);//复位
+    LCD_Set_RES(0);
     mdelay(100);
     LCD_Set_RES(1);
     mdelay(100);
@@ -245,7 +246,7 @@ static void LCD_Init(void) {
 
 static void LCD_Show_Splash(uint8_t *splash_dest) {
     uint16_t i, j, k = 0;
-    LCD_Address_Set(SPLASH_START_X, SPLASH_START_Y, SPLASH_START_X + SPLASH_W - 1, SPLASH_START_Y + SPLASH_H - 1);// 设置显示范围
+    LCD_Address_Set(SPLASH_START_X, SPLASH_START_Y, SPLASH_START_X + SPLASH_W - 1, SPLASH_START_Y + SPLASH_H - 1);
 
     uint16_t *video_mem = smalloc(SPLASH_W * SPLASH_H);
 
@@ -383,7 +384,7 @@ void LCD_ShowChar(uint16_t x, uint16_t y, uint8_t num, uint16_t fc, uint16_t bc,
     }
 }
 
-void LCD_ShowString(uint16_t x, uint16_t y, const uint8_t *p, uint16_t fc, uint16_t bc, uint8_t sizey) {
+static void LCD_ShowString(uint16_t x, uint16_t y, const uint8_t *p, uint16_t fc, uint16_t bc, uint8_t sizey) {
     printk(LOG_LEVEL_DEBUG, "LCD: Show String: \"%s\"\n", p);
     while (*p != '\0') {
         LCD_ShowChar(x, y, *p, fc, bc, sizey);