From 2396515f8587acfc4683204ea1adf602c2d7b9e1 Mon Sep 17 00:00:00 2001 From: Hao Zhu Date: Tue, 11 Dec 2018 08:24:04 +0800 Subject: [PATCH] =?UTF-8?q?[bsp][stm32]=20=E6=B7=BB=E5=8A=A0=E9=87=8E?= =?UTF-8?q?=E7=81=ABstm32f767=E5=BC=80=E5=8F=91=E6=9D=BFbsp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...73\345\212\240\346\225\231\347\250\213.md" | 1 + bsp/stm32/stm32f767-fire-challenger/README.md | 4 +-- .../stm32f767-fire-challenger/board/Kconfig | 33 ------------------ .../board/ports/fal_cfg.h | 34 ------------------- .../board/ports/sdram_port.h | 22 ++++++------ .../board/ports/spi_flash_init.c | 31 ----------------- 6 files changed, 14 insertions(+), 111 deletions(-) delete mode 100644 bsp/stm32/stm32f767-fire-challenger/board/ports/fal_cfg.h delete mode 100644 bsp/stm32/stm32f767-fire-challenger/board/ports/spi_flash_init.c diff --git "a/bsp/stm32/docs/STM32\347\263\273\345\210\227BSP\346\267\273\345\212\240\346\225\231\347\250\213.md" "b/bsp/stm32/docs/STM32\347\263\273\345\210\227BSP\346\267\273\345\212\240\346\225\231\347\250\213.md" index 2ac0f6b48..4d45a7ecd 100644 --- "a/bsp/stm32/docs/STM32\347\263\273\345\210\227BSP\346\267\273\345\212\240\346\225\231\347\250\213.md" +++ "b/bsp/stm32/docs/STM32\347\263\273\345\210\227BSP\346\267\273\345\212\240\346\225\231\347\250\213.md" @@ -59,6 +59,7 @@ STM32 BSP 由三部分组成，分别是 (1) 通用库、(2) BSP 模板和 (3) | ------- | ---- | | libraries/templates/stm32f10x | F1系列芯片模板 | | libraries/templates/stm32f4xx | F4系列芯片模板 | +| libraries/templates/stm32f7xx | F7系列芯片模板 | | libraries/templates/stm32l4xx | L4系列芯片模板 | 拷贝 `stm32/libraries/templates/stm32f10x` 文件夹并改名为 `stm32/stm32f103-atk-nano` 。如下图所示： diff --git a/bsp/stm32/stm32f767-fire-challenger/README.md b/bsp/stm32/stm32f767-fire-challenger/README.md index 1e037f579..aef6ba8a3 100644 --- a/bsp/stm32/stm32f767-fire-challenger/README.md +++ b/bsp/stm32/stm32f767-fire-challenger/README.md @@ -40,8 +40,8 @@ | **板载外设** | **支持情况** | **备注** | | :----------------- | :----------: | :------------------------------------- | | USB 转串口 | 支持 | | -| SPI Flash | 支持 | | -| 以太网 | 支持 | | +| QSPI Flash | 暂不支持 | | +| 以太网 | 暂不支持 | | | SD卡 | 暂不支持 | | | CAN | 暂不支持 | | | **片上外设** | **支持情况** | **备注** | diff --git a/bsp/stm32/stm32f767-fire-challenger/board/Kconfig b/bsp/stm32/stm32f767-fire-challenger/board/Kconfig index 292d2c3c9..e0c9ac386 100644 --- a/bsp/stm32/stm32f767-fire-challenger/board/Kconfig +++ b/bsp/stm32/stm32f767-fire-challenger/board/Kconfig @@ -17,39 +17,6 @@ menu "Onboard Peripheral Drivers" select BSP_USING_UART2 default n - config BSP_USING_SDRAM - bool "Enable SDRAM" - default n - - config BSP_USING_SPI_FLASH - bool "Enable SPI FLASH (W25Q128 spi5)" - select BSP_USING_SPI5 - select RT_USING_SFUD - select RT_SFUD_USING_SFDP - default n - - config BSP_USING_MPU6050 - bool "Enable MPU6050 (i2c1)" - select BSP_USING_I2C1 - select PKG_USING_MPU6XXX - default n - - config BSP_USING_ETH - bool "Enable Ethernet" - default n - select RT_USING_LWIP - if BSP_USING_ETH - config EXTERNAL_PHY_ADDRESS - hex - default 0x00 - endif - - config BSP_USING_POT - bool "Enable potentiometer" - select BSP_USING_ADC - select BSP_USING_ADC1 - default n - endmenu menu "On-chip Peripheral Drivers" diff --git a/bsp/stm32/stm32f767-fire-challenger/board/ports/fal_cfg.h b/bsp/stm32/stm32f767-fire-challenger/board/ports/fal_cfg.h deleted file mode 100644 index 3f014dbc9..000000000 --- a/bsp/stm32/stm32f767-fire-challenger/board/ports/fal_cfg.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2006-2018, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2018-12-5 SummerGift first version - */ - -#ifndef _FAL_CFG_H_ -#define _FAL_CFG_H_ - -#include -#include - -extern const struct fal_flash_dev stm32_onchip_flash; - -/* flash device table */ -#define FAL_FLASH_DEV_TABLE \ -{ \ - &stm32_onchip_flash, \ -} -/* ====================== Partition Configuration ========================== */ -#ifdef FAL_PART_HAS_TABLE_CFG - -/* partition table */ -#define FAL_PART_TABLE \ -{ \ - {FAL_PART_MAGIC_WROD, "app", "onchip_flash", 0, 1008 * 1024, 0},\ - {FAL_PART_MAGIC_WROD, "param", "onchip_flash", 1008* 1024 , 16 * 1024, 0},\ -} -#endif /* FAL_PART_HAS_TABLE_CFG */ -#endif /* _FAL_CFG_H_ */ diff --git a/bsp/stm32/stm32f767-fire-challenger/board/ports/sdram_port.h b/bsp/stm32/stm32f767-fire-challenger/board/ports/sdram_port.h index 72d7c8d06..8d22b23f0 100644 --- a/bsp/stm32/stm32f767-fire-challenger/board/ports/sdram_port.h +++ b/bsp/stm32/stm32f767-fire-challenger/board/ports/sdram_port.h @@ -23,9 +23,9 @@ /* row bit numbers: 11, 12, 13 */ #define SDRAM_ROW_BITS 12 /* cas latency clock number: 1, 2, 3 */ -#define SDRAM_CAS_LATENCY 3 +#define SDRAM_CAS_LATENCY 2 /* read pipe delay: 0, 1, 2 */ -#define SDRAM_RPIPE_DELAY 1 +#define SDRAM_RPIPE_DELAY 0 /* clock divid: 2, 3 */ #define SDCLOCK_PERIOD 2 /* refresh rate counter */ @@ -33,21 +33,21 @@ #define SDRAM_SIZE ((uint32_t)0x800000) /* Timing configuration for IS42S16400J */ -/* 90 MHz of SD clock frequency (180MHz/2) */ +/* 108 MHz of SD clock frequency (216MHz/2) */ /* TMRD: 2 Clock cycles */ #define LOADTOACTIVEDELAY 2 -/* TXSR: 7x11.90ns */ -#define EXITSELFREFRESHDELAY 7 -/* TRAS: 4x11.90ns */ -#define SELFREFRESHTIME 4 -/* TRC: 7x11.90ns */ +/* TXSR: 8x9.25ns */ +#define EXITSELFREFRESHDELAY 8 +/* TRAS: 5x9.25ns */ +#define SELFREFRESHTIME 5 +/* TRC: 7x9.25ns */ #define ROWCYCLEDELAY 7 /* TWR: 2 Clock cycles */ #define WRITERECOVERYTIME 2 -/* TRP: 2x11.90ns */ +/* TRP: 2x9.25ns */ #define RPDELAY 2 -/* TRCD: 2x11.90ns */ -#define RCDDELAY 2 +/* TRCD: 2x9.25ns */ +#define RCDDELAY 3 /* memory mode register */ #define SDRAM_MODEREG_BURST_LENGTH_1 ((uint16_t)0x0000) diff --git a/bsp/stm32/stm32f767-fire-challenger/board/ports/spi_flash_init.c b/bsp/stm32/stm32f767-fire-challenger/board/ports/spi_flash_init.c deleted file mode 100644 index 5a1a4a258..000000000 --- a/bsp/stm32/stm32f767-fire-challenger/board/ports/spi_flash_init.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2006-2018, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2018-11-27 SummerGift add spi flash port file - */ - -#include -#include "spi_flash.h" -#include "spi_flash_sfud.h" -#include "drv_spi.h" - -#if defined(BSP_USING_SPI_FLASH) -static int rt_hw_spi_flash_init(void) -{ - __HAL_RCC_GPIOF_CLK_ENABLE(); - rt_hw_spi_device_attach("spi5", "spi50", GPIOF, GPIO_PIN_6); - - if (RT_NULL == rt_sfud_flash_probe("W25Q128", "spi50")) - { - return -RT_ERROR; - } - - return RT_EOK; -} -INIT_COMPONENT_EXPORT(rt_hw_spi_flash_init); -#endif - -- GitLab