From 4652f77a7c8a56e3e8f9ab0dd738e5cf5ecc7410 Mon Sep 17 00:00:00 2001 From: wuzhenghui Date: Thu, 17 Mar 2022 11:47:22 +0800 Subject: [PATCH] esp32h2beta2:update rom layout table --- .../esp_rom/include/esp32h2/rom/rom_layout.h | 47 +++---------------- components/heap/port/memory_layout_utils.c | 1 + components/soc/esp32h2/include/soc/soc.h | 2 +- tools/ci/check_copyright_ignore.txt | 1 - 4 files changed, 8 insertions(+), 43 deletions(-) diff --git a/components/esp_rom/include/esp32h2/rom/rom_layout.h b/components/esp_rom/include/esp32h2/rom/rom_layout.h index cd1730c840..39d80438af 100644 --- a/components/esp_rom/include/esp32h2/rom/rom_layout.h +++ b/components/esp_rom/include/esp32h2/rom/rom_layout.h @@ -1,16 +1,8 @@ -// Copyright 2020 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. +/* + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once @@ -20,9 +12,6 @@ extern "C" { #endif -#define SUPPORT_BTDM 1 -#define SUPPORT_WIFI 1 - /* Structure and functions for returning ROM global layout * * This is for address symbols defined in the linker script, which may change during ECOs. @@ -32,8 +21,6 @@ typedef struct { void *dram0_rtos_reserved_start; void *stack_sentry; void *stack; - void *stack_sentry_app; - void *stack_app; /* BTDM data */ void *data_start_btdm; @@ -47,31 +34,9 @@ typedef struct { void *bss_start_interface_btdm; void *bss_end_interface_btdm; - /* Other DRAM ranges */ -#if SUPPORT_BTDM || SUPPORT_WIFI void *dram_start_phyrom; void *dram_end_phyrom; -#endif -#if SUPPORT_WIFI - void *dram_start_coexist; - void *dram_end_coexist; - void *dram_start_net80211; - void *dram_end_net80211; - void *dram_start_pp; - void *dram_end_pp; - void *data_start_interface_coexist; - void *data_end_interface_coexist; - void *bss_start_interface_coexist; - void *bss_end_interface_coexist; - void *data_start_interface_net80211; - void *data_end_interface_net80211; - void *bss_start_interface_net80211; - void *bss_end_interface_net80211; - void *data_start_interface_pp; - void *data_end_interface_pp; - void *bss_start_interface_pp; - void *bss_end_interface_pp; -#endif + void *dram_start_usbdev_rom; void *dram_end_usbdev_rom; void *dram_start_uart_rom; diff --git a/components/heap/port/memory_layout_utils.c b/components/heap/port/memory_layout_utils.c index 4a356fc8e0..bf4c4bc9a4 100644 --- a/components/heap/port/memory_layout_utils.c +++ b/components/heap/port/memory_layout_utils.c @@ -17,6 +17,7 @@ #define ROM_HAS_LAYOUT_TABLE 1 #elif CONFIG_IDF_TARGET_ESP32H2 #include "esp32h2/rom/rom_layout.h" +#define ROM_HAS_LAYOUT_TABLE 1 #elif CONFIG_IDF_TARGET_ESP32C2 #include "esp32c2/rom/rom_layout.h" #define ROM_HAS_LAYOUT_TABLE 1 diff --git a/components/soc/esp32h2/include/soc/soc.h b/components/soc/esp32h2/include/soc/soc.h index 970853d758..165e8c73b4 100644 --- a/components/soc/esp32h2/include/soc/soc.h +++ b/components/soc/esp32h2/include/soc/soc.h @@ -208,7 +208,7 @@ #define SOC_DEBUG_HIGH 0x28000000 // Start (highest address) of ROM boot stack, only relevant during early boot -#define SOC_ROM_STACK_START 0x3fcebf10 +#define SOC_ROM_STACK_START 0x3fcdf120 //On RISC-V CPUs, the interrupt sources are all external interrupts, whose type, source and priority are configured by SW. //There is no HW NMI conception. SW should controlled the masked levels through INT_THRESH_REG. diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index b6609e84bc..f01dc46cd8 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -586,7 +586,6 @@ components/esp_rom/include/esp32h2/rom/libc_stubs.h components/esp_rom/include/esp32h2/rom/lldesc.h components/esp_rom/include/esp32h2/rom/md5_hash.h components/esp_rom/include/esp32h2/rom/miniz.h -components/esp_rom/include/esp32h2/rom/rom_layout.h components/esp_rom/include/esp32h2/rom/rsa_pss.h components/esp_rom/include/esp32h2/rom/sha.h components/esp_rom/include/esp32h2/rom/tjpgd.h