espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-22 01:27:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/refactor_chip_boot' into 'master'

Browse Source 
Check SPI mode from header image data

See merge request sdk/ESP8266_RTOS_SDK!345
This commit is contained in:
Dong Heng
2018-07-30 17:04:38 +08:00
parent ea34c2af21 e817311f33
commit 15a608ab2f
2 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
components/esp8266/source/chip_boot.c
View File

@ -18,6 +18,8 @@
#include "esp_log.h" #include "esp_log.h"
#include "esp_system.h" #include "esp_system.h"
#include "esp8266/eagle_soc.h" #include "esp8266/eagle_soc.h"
#include "esp8266/rom_functions.h"
#include "esp_image_format.h"
#define PERIPHS_SPI_FLASH_USRREG (0x60000200 + 0x1c) #define PERIPHS_SPI_FLASH_USRREG (0x60000200 + 0x1c)
#define PERIPHS_SPI_FLASH_CTRL (0x60000200 + 0x08) #define PERIPHS_SPI_FLASH_CTRL (0x60000200 + 0x08)
@ -26,32 +28,6 @@
#define SPI0_CLK_EQU_SYSCLK BIT8 #define SPI0_CLK_EQU_SYSCLK BIT8
#define SPI_FLASH_CLK_EQU_SYSCLK BIT12 #define SPI_FLASH_CLK_EQU_SYSCLK BIT12
typedef struct flash_hdr {
uint8_t magic;
uint8_t blocks;
uint8_t spi_mode;
uint8_t spi_speed : 4;
uint8_t spi_size_map : 4;
uint32_t entry_addr;
} flash_hdr_t;
typedef struct boot_hdr {
uint8_t user_bin : 2;
uint8_t boot_status : 1;
uint8_t to_qio : 1;
uint8_t reserve : 4;
uint8_t version : 5;
uint8_t test_pass_flag : 1;
uint8_t test_start_flag : 1;
uint8_t enhance_boot_flag : 1;
uint8_t test_bin_addr[3];
uint8_t user_bin_addr[3];
} boot_hdr_t;
extern int ets_printf(const char *fmt, ...);
static const char *TAG = "chip_boot"; static const char *TAG = "chip_boot";
/* /*
@ -61,10 +37,9 @@ static const char *TAG = "chip_boot";
void chip_boot(size_t start_addr, size_t map) void chip_boot(size_t start_addr, size_t map)
{ {
int ret; int ret;
uint32_t freqdiv, flash_size, sect_size; uint32_t freqdiv, flash_size;
uint32_t freqbits; uint32_t freqbits;
flash_hdr_t fhdr; esp_image_header_t fhdr;
boot_hdr_t bhdr;
uint32_t flash_map_table[FALSH_SIZE_MAP_MAX] = { uint32_t flash_map_table[FALSH_SIZE_MAP_MAX] = {
1 * 1024 * 1024, 1 * 1024 * 1024,
@ -75,6 +50,7 @@ void chip_boot(size_t start_addr, size_t map)
}; };
uint32_t flash_map_table_size = sizeof(flash_map_table) / sizeof(flash_map_table[0]); uint32_t flash_map_table_size = sizeof(flash_map_table) / sizeof(flash_map_table[0]);
extern esp_spi_flash_chip_t flashchip;
extern void phy_get_bb_evm(void); extern void phy_get_bb_evm(void);
extern void cache_init(uint32_t , uint32_t, uint32_t); extern void cache_init(uint32_t , uint32_t, uint32_t);
extern void user_spi_flash_dio_to_qio_pre_init(void); extern void user_spi_flash_dio_to_qio_pre_init(void);
@ -84,7 +60,7 @@ void chip_boot(size_t start_addr, size_t map)
SET_PERI_REG_MASK(PERIPHS_SPI_FLASH_USRREG, BIT5); SET_PERI_REG_MASK(PERIPHS_SPI_FLASH_USRREG, BIT5);
ret = spi_flash_read(start_addr, &fhdr, sizeof(flash_hdr_t)); ret = spi_flash_read(start_addr, &fhdr, sizeof(esp_image_header_t));
if (ret) { if (ret) {
ESP_EARLY_LOGE(TAG, "SPI flash read result %d\n", ret); ESP_EARLY_LOGE(TAG, "SPI flash read result %d\n", ret);
} }
@ -96,13 +72,14 @@ void chip_boot(size_t start_addr, size_t map)
else else
freqdiv = 2; freqdiv = 2;
if (fhdr.spi_size_map < flash_map_table_size) { if (fhdr.spi_size < flash_map_table_size) {
flash_size = flash_map_table[fhdr.spi_size_map]; flash_size = flash_map_table[fhdr.spi_size];
ESP_EARLY_LOGD(TAG, "SPI flash size is %d\n", flash_size);
} else { } else {
flash_size = 0; flash_size = 0;
ESP_EARLY_LOGE(TAG, "SPI size error is %d\n", fhdr.spi_size_map); ESP_EARLY_LOGE(TAG, "SPI size error is %d\n", fhdr.spi_size);
} }
sect_size = 4 * 1024; flashchip.chip_size = flash_size;
if (1 >= freqdiv) { if (1 >= freqdiv) {
freqbits = SPI_FLASH_CLK_EQU_SYSCLK; freqbits = SPI_FLASH_CLK_EQU_SYSCLK;
@ -115,13 +92,11 @@ void chip_boot(size_t start_addr, size_t map)
} }
SET_PERI_REG_BITS(PERIPHS_SPI_FLASH_CTRL, 0xfff, freqbits, 0); SET_PERI_REG_BITS(PERIPHS_SPI_FLASH_CTRL, 0xfff, freqbits, 0);
ret = esp_get_boot_param(flash_size, sect_size, &bhdr, sizeof(boot_hdr_t)); ESP_EARLY_LOGD(TAG, "SPI flash cache map is %d\n", map);
if (ret) {
ESP_EARLY_LOGE(TAG, "Get boot parameters %d\n", ret);
}
cache_init(map, 0, 0); cache_init(map, 0, 0);
if (bhdr.to_qio == 0) if (fhdr.spi_mode == ESP_IMAGE_SPI_MODE_QIO) {
ESP_EARLY_LOGD(TAG, "SPI flash enable QIO mode\n");
user_spi_flash_dio_to_qio_pre_init(); user_spi_flash_dio_to_qio_pre_init();
}
} }

5
components/esp8266/source/startup.c
View File

@ -92,8 +92,9 @@ void call_user_start(size_t start_addr, size_t map)
* And then user can load/store data which is not aligned by 4-byte. * And then user can load/store data which is not aligned by 4-byte.
*/ */
__asm__ __volatile__( __asm__ __volatile__(
"movi a2, 0x40100000\n" "movi a0, 0x40100000\n"
"wsr a2, vecbase\n"); "wsr a0, vecbase\n"
: : :"memory");
chip_boot(start_addr, map); chip_boot(start_addr, map);