mirror of
https://github.com/espressif/ESP8266_RTOS_SDK.git
synced 2025-05-22 09:37:00 +08:00
feat(esp8266): Add full icache mode
Use full 32 KB iram as icache.
This commit is contained in:
@ -16,7 +16,7 @@ MEMORY
|
|||||||
dram_seg : org = 0x3FFE8000, len = 0x18000
|
dram_seg : org = 0x3FFE8000, len = 0x18000
|
||||||
|
|
||||||
/* Functions which are critical should be put in this segment. */
|
/* Functions which are critical should be put in this segment. */
|
||||||
iram_seg : org = 0x40100000, len = 0xC000
|
iram_seg : org = 0x40100000, len = 0x8000
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Default entry point: */
|
/* Default entry point: */
|
||||||
|
@ -28,6 +28,13 @@ config NEWLIB_STDOUT_LINE_ENDING_CR
|
|||||||
bool "CR"
|
bool "CR"
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
config SOC_FULL_ICACHE
|
||||||
|
bool "Enable full cache mode"
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
Enable this option, full 32 KB iram instead of 16 KB iram will be used as icache, so the heap use can use
|
||||||
|
may reduce a lot.
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
menu WIFI
|
menu WIFI
|
||||||
|
@ -33,5 +33,6 @@ int SPI_read_status(esp_spi_flash_chip_t *chip, uint32_t *status);
|
|||||||
int Enable_QMode(esp_spi_flash_chip_t *chip);
|
int Enable_QMode(esp_spi_flash_chip_t *chip);
|
||||||
|
|
||||||
void Cache_Read_Disable();
|
void Cache_Read_Disable();
|
||||||
|
void Cache_Read_Enable(uint8_t map, uint8_t p, uint8_t v);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
gwen:
|
gwen:
|
||||||
crypto: 8943c89
|
crypto: 8943c89
|
||||||
espnow: 8943c89
|
espnow: 8943c89
|
||||||
core: 2f2b0ef
|
core: f4f0d3d
|
||||||
net80211: 80fc165
|
net80211: 80fc165
|
||||||
pp: 06e0988
|
pp: 06e0988
|
||||||
pwm: 0181338
|
pwm: 0181338
|
||||||
|
Binary file not shown.
@ -52,9 +52,8 @@ void chip_boot(size_t start_addr, size_t map)
|
|||||||
|
|
||||||
extern esp_spi_flash_chip_t flashchip;
|
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(uint8_t);
|
||||||
extern void user_spi_flash_dio_to_qio_pre_init(void);
|
extern void user_spi_flash_dio_to_qio_pre_init(void);
|
||||||
extern int esp_get_boot_param(uint32_t, uint32_t, void *, uint32_t);
|
|
||||||
|
|
||||||
phy_get_bb_evm();
|
phy_get_bb_evm();
|
||||||
|
|
||||||
@ -93,7 +92,7 @@ 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);
|
||||||
|
|
||||||
ESP_EARLY_LOGD(TAG, "SPI flash cache map is %d\n", map);
|
ESP_EARLY_LOGD(TAG, "SPI flash cache map is %d\n", map);
|
||||||
cache_init(map, 0, 0);
|
cache_init(map);
|
||||||
|
|
||||||
if (fhdr.spi_mode == ESP_IMAGE_SPI_MODE_QIO) {
|
if (fhdr.spi_mode == ESP_IMAGE_SPI_MODE_QIO) {
|
||||||
ESP_EARLY_LOGD(TAG, "SPI flash enable QIO mode\n");
|
ESP_EARLY_LOGD(TAG, "SPI flash enable QIO mode\n");
|
||||||
|
39
components/esp8266/source/esp_cache.c
Normal file
39
components/esp8266/source/esp_cache.c
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// Copyright 2018-2019 Espressif Systems (Shanghai) PTE LTD
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
#include "sdkconfig.h"
|
||||||
|
#include <stdint.h>
|
||||||
|
#include "esp_attr.h"
|
||||||
|
#include "esp8266/rom_functions.h"
|
||||||
|
|
||||||
|
#ifdef CONFIG_SOC_FULL_ICACHE
|
||||||
|
#define SOC_CACHE_SIZE 1 // 32KB
|
||||||
|
#else
|
||||||
|
#define SOC_CACHE_SIZE 0 // 16KB
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static uint8_t s_cache_map;
|
||||||
|
static uint8_t s_cache_size = SOC_CACHE_SIZE;
|
||||||
|
|
||||||
|
void IRAM_ATTR Cache_Read_Enable_New(void)
|
||||||
|
{
|
||||||
|
Cache_Read_Enable(s_cache_map, 0, s_cache_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void cache_init(int map)
|
||||||
|
{
|
||||||
|
s_cache_map = map;
|
||||||
|
|
||||||
|
Cache_Read_Enable_New();
|
||||||
|
}
|
@ -105,6 +105,8 @@
|
|||||||
* Note 0x80000000 is the lower address so appears in the array first.
|
* Note 0x80000000 is the lower address so appears in the array first.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
#include "sdkconfig.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -363,8 +365,10 @@ static bool is_inited = false;
|
|||||||
xHeapRegions[0].pucStartAddress = ( uint8_t * )&_heap_start;
|
xHeapRegions[0].pucStartAddress = ( uint8_t * )&_heap_start;
|
||||||
xHeapRegions[0].xSizeInBytes = (( size_t)( 0x40000000 - (uint32_t)&_heap_start));
|
xHeapRegions[0].xSizeInBytes = (( size_t)( 0x40000000 - (uint32_t)&_heap_start));
|
||||||
|
|
||||||
|
#ifndef CONFIG_SOC_FULL_ICACHE
|
||||||
xHeapRegions[1].pucStartAddress = ( uint8_t * )&_lit4_end;
|
xHeapRegions[1].pucStartAddress = ( uint8_t * )&_lit4_end;
|
||||||
xHeapRegions[1].xSizeInBytes = (( size_t)( 0x4010C000 - (uint32_t)&_lit4_end));
|
xHeapRegions[1].xSizeInBytes = (( size_t)( 0x4010C000 - (uint32_t)&_lit4_end));
|
||||||
|
#endif
|
||||||
|
|
||||||
is_inited = true;
|
is_inited = true;
|
||||||
vPortDefineHeapRegions(xHeapRegions);
|
vPortDefineHeapRegions(xHeapRegions);
|
||||||
|
Reference in New Issue
Block a user