cbfs: Enable CBFS mcache on most chipsets
This patch flips the default of CONFIG_NO_CBFS_MCACHE so the feature is enabled by default. Some older chipsets with insufficient SRAM/CAR space still have it explicitly disabled. All others get the new section added to their memlayout... 8K seems like a sane default to start with. Change-Id: I0abd1c813aece6e78fb883f292ce6c9319545c44 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38424 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
parent
4a1cbdd51a
commit
baf27dbaeb
|
@ -144,6 +144,13 @@ config PRERAM_CBMEM_CONSOLE_SIZE
|
||||||
help
|
help
|
||||||
Increase this value if preram cbmem console is getting truncated
|
Increase this value if preram cbmem console is getting truncated
|
||||||
|
|
||||||
|
config CBFS_MCACHE_SIZE
|
||||||
|
hex
|
||||||
|
depends on !NO_CBFS_MCACHE
|
||||||
|
default 0x2000
|
||||||
|
help
|
||||||
|
Increase this value if you see CBFS mcache overflow warnings.
|
||||||
|
|
||||||
config PC80_SYSTEM
|
config PC80_SYSTEM
|
||||||
bool
|
bool
|
||||||
default y if ARCH_X86
|
default y if ARCH_X86
|
||||||
|
|
|
@ -48,6 +48,9 @@
|
||||||
|
|
||||||
TIMESTAMP(., 0x200)
|
TIMESTAMP(., 0x200)
|
||||||
|
|
||||||
|
#if !CONFIG(NO_CBFS_MCACHE)
|
||||||
|
CBFS_MCACHE(., CONFIG_CBFS_MCACHE_SIZE)
|
||||||
|
#endif
|
||||||
#if !CONFIG(NO_FMAP_CACHE)
|
#if !CONFIG(NO_FMAP_CACHE)
|
||||||
FMAP_CACHE(., FMAP_SIZE)
|
FMAP_CACHE(., FMAP_SIZE)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -83,7 +83,6 @@ config ESPI_DEBUG
|
||||||
|
|
||||||
config NO_CBFS_MCACHE
|
config NO_CBFS_MCACHE
|
||||||
bool
|
bool
|
||||||
default y
|
|
||||||
help
|
help
|
||||||
Disables the CBFS metadata cache. This means that your platform does
|
Disables the CBFS metadata cache. This means that your platform does
|
||||||
not need to provide a CBFS_MCACHE section in memlayout and can save
|
not need to provide a CBFS_MCACHE section in memlayout and can save
|
||||||
|
|
|
@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select BOARD_ROMSIZE_KB_512
|
select BOARD_ROMSIZE_KB_512
|
||||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||||
select INTEL_GMA_HAVE_VBT
|
select INTEL_GMA_HAVE_VBT
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
string
|
string
|
||||||
|
|
|
@ -19,7 +19,8 @@ SECTIONS
|
||||||
REGION(secram, 0xe000000, 0x1000000, 4096)
|
REGION(secram, 0xe000000, 0x1000000, 4096)
|
||||||
DRAM_START(0x40000000)
|
DRAM_START(0x40000000)
|
||||||
BOOTBLOCK(0x60010000, 64K)
|
BOOTBLOCK(0x60010000, 64K)
|
||||||
STACK(0x60020000, 62K)
|
STACK(0x60020000, 54K)
|
||||||
|
CBFS_MCACHE(0x6002D800, 8K)
|
||||||
FMAP_CACHE(0x6002F800, 2K)
|
FMAP_CACHE(0x6002F800, 2K)
|
||||||
TIMESTAMP(0x60030000, 1K)
|
TIMESTAMP(0x60030000, 1K)
|
||||||
ROMSTAGE(0x60031000, 128K)
|
ROMSTAGE(0x60031000, 128K)
|
||||||
|
|
|
@ -35,6 +35,7 @@ SECTIONS
|
||||||
BOOTBLOCK(0x60010000, 128K)
|
BOOTBLOCK(0x60010000, 128K)
|
||||||
FMAP_CACHE(0x60030000, 4K)
|
FMAP_CACHE(0x60030000, 4K)
|
||||||
TIMESTAMP(0x60031000, 1K)
|
TIMESTAMP(0x60031000, 1K)
|
||||||
|
CBFS_MCACHE(0x60031400, 7K)
|
||||||
/* TODO: Implement MMU support and move TTB to a better location. */
|
/* TODO: Implement MMU support and move TTB to a better location. */
|
||||||
TTB(0x60034000, 16K)
|
TTB(0x60034000, 16K)
|
||||||
ROMSTAGE(0x60038000, 128K)
|
ROMSTAGE(0x60038000, 128K)
|
||||||
|
|
|
@ -13,5 +13,6 @@ SECTIONS
|
||||||
STACK(0x40000, 0x3ff00)
|
STACK(0x40000, 0x3ff00)
|
||||||
PRERAM_CBMEM_CONSOLE(0x80000, 8K)
|
PRERAM_CBMEM_CONSOLE(0x80000, 8K)
|
||||||
FMAP_CACHE(0x82000, 2K)
|
FMAP_CACHE(0x82000, 2K)
|
||||||
|
CBFS_MCACHE(0x82800, 8K)
|
||||||
RAMSTAGE(0x100000, 16M)
|
RAMSTAGE(0x100000, 16M)
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,7 @@ SECTIONS
|
||||||
#endif
|
#endif
|
||||||
PRERAM_CBMEM_CONSOLE(STAGES_START + 128K, 8K)
|
PRERAM_CBMEM_CONSOLE(STAGES_START + 128K, 8K)
|
||||||
FMAP_CACHE(STAGES_START + 136K, 2K)
|
FMAP_CACHE(STAGES_START + 136K, 2K)
|
||||||
|
CBFS_MCACHE(STAGES_START + 138K, 8K)
|
||||||
RAMSTAGE(STAGES_START + 200K, 16M)
|
RAMSTAGE(STAGES_START + 200K, 16M)
|
||||||
STACK(STAGES_START + 200K + 16M, 4K)
|
STACK(STAGES_START + 200K + 16M, 4K)
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,8 @@ SECTIONS
|
||||||
BOOTBLOCK(START, 64K)
|
BOOTBLOCK(START, 64K)
|
||||||
STACK(START + 8M, 4K)
|
STACK(START + 8M, 4K)
|
||||||
FMAP_CACHE(START + 8M + 4K, 2K)
|
FMAP_CACHE(START + 8M + 4K, 2K)
|
||||||
/* hole at (START + 8M + 6K, 58K) */
|
CBFS_MCACHE(START + 8M + 6K, 8K)
|
||||||
|
/* hole at (START + 8M + 14K, 50K) */
|
||||||
ROMSTAGE(START + 8M + 64K, 128K)
|
ROMSTAGE(START + 8M + 64K, 128K)
|
||||||
PRERAM_CBMEM_CONSOLE(START + 8M + 192k, 8K)
|
PRERAM_CBMEM_CONSOLE(START + 8M + 192k, 8K)
|
||||||
RAMSTAGE(START + 8M + 200K, 256K)
|
RAMSTAGE(START + 8M + 200K, 256K)
|
||||||
|
|
|
@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||||
select REALTEK_8168_RESET if BOARD_GIGABYTE_GA_945GCM_S2L
|
select REALTEK_8168_RESET if BOARD_GIGABYTE_GA_945GCM_S2L
|
||||||
select INTEL_GMA_HAVE_VBT
|
select INTEL_GMA_HAVE_VBT
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
string
|
string
|
||||||
|
|
|
@ -26,6 +26,7 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
|
||||||
select GOOGLE_SMBIOS_MAINBOARD_VERSION
|
select GOOGLE_SMBIOS_MAINBOARD_VERSION
|
||||||
select NO_BOOTBLOCK_CONSOLE
|
select NO_BOOTBLOCK_CONSOLE
|
||||||
select NO_FMAP_CACHE
|
select NO_FMAP_CACHE
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
if BOARD_GOOGLE_BASEBOARD_OCTOPUS
|
if BOARD_GOOGLE_BASEBOARD_OCTOPUS
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select MAINBOARD_HAS_LIBGFXINIT
|
select MAINBOARD_HAS_LIBGFXINIT
|
||||||
select MAINBOARD_USES_IFD_GBE_REGION if !BOARD_LENOVO_R500
|
select MAINBOARD_USES_IFD_GBE_REGION if !BOARD_LENOVO_R500
|
||||||
select INTEL_GMA_HAVE_VBT
|
select INTEL_GMA_HAVE_VBT
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
config VBOOT
|
config VBOOT
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
|
|
|
@ -9,5 +9,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
|
||||||
def_bool y
|
def_bool y
|
||||||
select NO_MMCONF_SUPPORT
|
select NO_MMCONF_SUPPORT
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -5,6 +5,7 @@ config NORTHBRIDGE_INTEL_I440BX
|
||||||
select NO_MMCONF_SUPPORT
|
select NO_MMCONF_SUPPORT
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select NO_BOOTBLOCK_CONSOLE
|
select NO_BOOTBLOCK_CONSOLE
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
config SDRAMPWR_4DIMM
|
config SDRAMPWR_4DIMM
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -14,6 +14,7 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
|
||||||
select INTEL_EDID if MAINBOARD_DO_NATIVE_VGA_INIT
|
select INTEL_EDID if MAINBOARD_DO_NATIVE_VGA_INIT
|
||||||
select INTEL_GMA_ACPI
|
select INTEL_GMA_ACPI
|
||||||
select PARALLEL_MP
|
select PARALLEL_MP
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
config VGA_BIOS_ID
|
config VGA_BIOS_ID
|
||||||
string
|
string
|
||||||
|
|
|
@ -13,6 +13,7 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
|
||||||
select CACHE_MRC_SETTINGS
|
select CACHE_MRC_SETTINGS
|
||||||
select PARALLEL_MP
|
select PARALLEL_MP
|
||||||
select BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES
|
select BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
ALIGN_COUNTER(64)
|
ALIGN_COUNTER(64)
|
||||||
PRERAM_CBMEM_CONSOLE(., CONFIG_PRERAM_CBMEM_CONSOLE_SIZE)
|
PRERAM_CBMEM_CONSOLE(., CONFIG_PRERAM_CBMEM_CONSOLE_SIZE)
|
||||||
TIMESTAMP(., TIMESTAMP_BUFFER_SIZE)
|
TIMESTAMP(., TIMESTAMP_BUFFER_SIZE)
|
||||||
|
CBFS_MCACHE(., CONFIG_CBFS_MCACHE_SIZE)
|
||||||
FMAP_CACHE(., FMAP_SIZE)
|
FMAP_CACHE(., FMAP_SIZE)
|
||||||
|
|
||||||
#if CONFIG(VBOOT)
|
#if CONFIG(VBOOT)
|
||||||
|
|
|
@ -39,6 +39,8 @@
|
||||||
* | Unused hole |
|
* | Unused hole |
|
||||||
* +--------------------------------+
|
* +--------------------------------+
|
||||||
* | FMAP cache (FMAP_SIZE) |
|
* | FMAP cache (FMAP_SIZE) |
|
||||||
|
* +--------------------------------+
|
||||||
|
* | CBFS mcache (CBFS_MCACHE_SIZE) |
|
||||||
* +--------------------------------+ PSP_SHAREDMEM_BASE + 0x40 + VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE + PRERAM_CBMEM_CONSOLE_SIZE + 0x200
|
* +--------------------------------+ PSP_SHAREDMEM_BASE + 0x40 + VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE + PRERAM_CBMEM_CONSOLE_SIZE + 0x200
|
||||||
* | Early Timestamp region (512B) |
|
* | Early Timestamp region (512B) |
|
||||||
* +--------------------------------+ PSP_SHAREDMEM_BASE + 0x40 + VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE + PRERAM_CBMEM_CONSOLE_SIZE
|
* +--------------------------------+ PSP_SHAREDMEM_BASE + 0x40 + VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE + PRERAM_CBMEM_CONSOLE_SIZE
|
||||||
|
|
|
@ -20,7 +20,8 @@ SECTIONS
|
||||||
PRERAM_CBFS_CACHE(BOOTROM_OFFSET + 0x6000, 6K)
|
PRERAM_CBFS_CACHE(BOOTROM_OFFSET + 0x6000, 6K)
|
||||||
FMAP_CACHE(BOOTROM_OFFSET + 0x7800, 2K)
|
FMAP_CACHE(BOOTROM_OFFSET + 0x7800, 2K)
|
||||||
PRERAM_CBMEM_CONSOLE(BOOTROM_OFFSET + 0x8000, 8K)
|
PRERAM_CBMEM_CONSOLE(BOOTROM_OFFSET + 0x8000, 8K)
|
||||||
BOOTBLOCK(BOOTROM_OFFSET + 0x20000, 64K)
|
BOOTBLOCK(BOOTROM_OFFSET + 0x20000, 56K)
|
||||||
|
CBFS_MCACHE(BOOTROM_OFFSET + 0x2e000, 8K)
|
||||||
VBOOT2_WORK(BOOTROM_OFFSET + 0x30000, 12K)
|
VBOOT2_WORK(BOOTROM_OFFSET + 0x30000, 12K)
|
||||||
TPM_TCPA_LOG(BOOTROM_OFFSET + 0x33000, 2K)
|
TPM_TCPA_LOG(BOOTROM_OFFSET + 0x33000, 2K)
|
||||||
VERSTAGE(BOOTROM_OFFSET + 0x33800, 50K)
|
VERSTAGE(BOOTROM_OFFSET + 0x33800, 50K)
|
||||||
|
|
|
@ -42,6 +42,7 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select CPU_INTEL_COMMON
|
select CPU_INTEL_COMMON
|
||||||
select SOUTHBRIDGE_INTEL_COMMON_SMBUS
|
select SOUTHBRIDGE_INTEL_COMMON_SMBUS
|
||||||
select SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT
|
select SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
config DCACHE_BSP_STACK_SIZE
|
config DCACHE_BSP_STACK_SIZE
|
||||||
hex
|
hex
|
||||||
|
|
|
@ -30,7 +30,8 @@ SECTIONS
|
||||||
FMAP_CACHE(0x00103800, 2K)
|
FMAP_CACHE(0x00103800, 2K)
|
||||||
PRERAM_CBMEM_CONSOLE(0x00104000, 12K)
|
PRERAM_CBMEM_CONSOLE(0x00104000, 12K)
|
||||||
WATCHDOG_TOMBSTONE(0x00107000, 4)
|
WATCHDOG_TOMBSTONE(0x00107000, 4)
|
||||||
PRERAM_CBFS_CACHE(0x00107004, 16K - 4)
|
PRERAM_CBFS_CACHE(0x00107004, 8K - 4)
|
||||||
|
CBFS_MCACHE(0x00109000, 8K)
|
||||||
TIMESTAMP(0x0010B000, 4K)
|
TIMESTAMP(0x0010B000, 4K)
|
||||||
ROMSTAGE(0x0010C000, 92K)
|
ROMSTAGE(0x0010C000, 92K)
|
||||||
STACK(0x00124000, 16K)
|
STACK(0x00124000, 16K)
|
||||||
|
|
|
@ -30,7 +30,8 @@ SECTIONS
|
||||||
|
|
||||||
SRAM_L2C_START(0x00200000)
|
SRAM_L2C_START(0x00200000)
|
||||||
OVERLAP_DECOMPRESSOR_VERSTAGE_ROMSTAGE(0x00201000, 188K)
|
OVERLAP_DECOMPRESSOR_VERSTAGE_ROMSTAGE(0x00201000, 188K)
|
||||||
BOOTBLOCK(0x00230000, 64K)
|
BOOTBLOCK(0x00230000, 56K)
|
||||||
|
CBFS_MCACHE(0x0023e000, 8K)
|
||||||
DRAM_INIT_CODE(0x00240000, 208K)
|
DRAM_INIT_CODE(0x00240000, 208K)
|
||||||
PRERAM_CBFS_CACHE(0x00274000, 48K)
|
PRERAM_CBFS_CACHE(0x00274000, 48K)
|
||||||
SRAM_L2C_END(0x00280000)
|
SRAM_L2C_END(0x00280000)
|
||||||
|
|
|
@ -26,9 +26,10 @@ SECTIONS
|
||||||
TPM_TCPA_LOG(0x00103000, 2K)
|
TPM_TCPA_LOG(0x00103000, 2K)
|
||||||
FMAP_CACHE(0x00103800, 2K)
|
FMAP_CACHE(0x00103800, 2K)
|
||||||
WATCHDOG_TOMBSTONE(0x00104000, 4)
|
WATCHDOG_TOMBSTONE(0x00104000, 4)
|
||||||
PRERAM_CBMEM_CONSOLE(0x00104004, 19K - 4)
|
PRERAM_CBMEM_CONSOLE(0x00104004, 15K - 4)
|
||||||
TIMESTAMP(0x00108c00, 1K)
|
CBFS_MCACHE(0x00107c00, 8K)
|
||||||
STACK(0x00109000, 16K)
|
TIMESTAMP(0x00109c00, 1K)
|
||||||
|
STACK(0x0010a000, 12K)
|
||||||
TTB(0x0010d000, 28K)
|
TTB(0x0010d000, 28K)
|
||||||
DMA_COHERENT(0x00114000, 4K)
|
DMA_COHERENT(0x00114000, 4K)
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -16,7 +16,8 @@ SECTIONS
|
||||||
TTB(0x40000000, 16K + 32)
|
TTB(0x40000000, 16K + 32)
|
||||||
PRERAM_CBMEM_CONSOLE(0x40004020, 6K - 32)
|
PRERAM_CBMEM_CONSOLE(0x40004020, 6K - 32)
|
||||||
FMAP_CACHE(0x40005800, 2K)
|
FMAP_CACHE(0x40005800, 2K)
|
||||||
PRERAM_CBFS_CACHE(0x40006000, 14K)
|
CBFS_MCACHE(0x40006000, 8K)
|
||||||
|
PRERAM_CBFS_CACHE(0x40008000, 6K)
|
||||||
VBOOT2_WORK(0x40009800, 12K)
|
VBOOT2_WORK(0x40009800, 12K)
|
||||||
TPM_TCPA_LOG(0x4000D800, 2K)
|
TPM_TCPA_LOG(0x4000D800, 2K)
|
||||||
STACK(0x4000E000, 8K)
|
STACK(0x4000E000, 8K)
|
||||||
|
|
|
@ -17,7 +17,8 @@ SECTIONS
|
||||||
SRAM_START(0x40000000)
|
SRAM_START(0x40000000)
|
||||||
PRERAM_CBMEM_CONSOLE(0x40000000, 2K)
|
PRERAM_CBMEM_CONSOLE(0x40000000, 2K)
|
||||||
FMAP_CACHE(0x40000800, 2K)
|
FMAP_CACHE(0x40000800, 2K)
|
||||||
PRERAM_CBFS_CACHE(0x40001000, 28K)
|
PRERAM_CBFS_CACHE(0x40001000, 20K)
|
||||||
|
CBFS_MCACHE(0x40006000, 8K)
|
||||||
VBOOT2_WORK(0x40008000, 12K)
|
VBOOT2_WORK(0x40008000, 12K)
|
||||||
TPM_TCPA_LOG(0x4000B000, 2K)
|
TPM_TCPA_LOG(0x4000B000, 2K)
|
||||||
#if ENV_ARM64
|
#if ENV_ARM64
|
||||||
|
|
|
@ -20,7 +20,8 @@ SECTIONS
|
||||||
/* This includes bootblock image, can be reused after bootblock starts */
|
/* This includes bootblock image, can be reused after bootblock starts */
|
||||||
/* UBER_SBL(0x0A0C0000, 48K) */
|
/* UBER_SBL(0x0A0C0000, 48K) */
|
||||||
|
|
||||||
PRERAM_CBFS_CACHE(0x0A0C0000, 92K)
|
PRERAM_CBFS_CACHE(0x0A0C0000, 84K)
|
||||||
|
CBFS_MCACHE(0x0A0ED800, 8K)
|
||||||
FMAP_CACHE(0x0A0EF800, 2K)
|
FMAP_CACHE(0x0A0EF800, 2K)
|
||||||
|
|
||||||
TTB(0x0A0F0000, 16K)
|
TTB(0x0A0F0000, 16K)
|
||||||
|
|
|
@ -24,7 +24,8 @@ SECTIONS
|
||||||
QCA_SHARED_RAM(2A03F000, 4K)
|
QCA_SHARED_RAM(2A03F000, 4K)
|
||||||
*/
|
*/
|
||||||
STACK(0x2A040000, 16K)
|
STACK(0x2A040000, 16K)
|
||||||
PRERAM_CBFS_CACHE(0x2A044000, 91K)
|
PRERAM_CBFS_CACHE(0x2A044000, 83K)
|
||||||
|
CBFS_MCACHE(0x2A059000, 8K)
|
||||||
FMAP_CACHE(0x2A05B000, 2K)
|
FMAP_CACHE(0x2A05B000, 2K)
|
||||||
TTB_SUBTABLES(0x2A05B800, 2K)
|
TTB_SUBTABLES(0x2A05B800, 2K)
|
||||||
TTB(0x2A05C000, 16K)
|
TTB(0x2A05C000, 16K)
|
||||||
|
|
|
@ -25,7 +25,8 @@ SECTIONS
|
||||||
STACK(0x8C4B000, 16K)
|
STACK(0x8C4B000, 16K)
|
||||||
TIMESTAMP(0x8C4F000, 1K)
|
TIMESTAMP(0x8C4F000, 1K)
|
||||||
PRERAM_CBMEM_CONSOLE(0x8C4F400, 32K)
|
PRERAM_CBMEM_CONSOLE(0x8C4F400, 32K)
|
||||||
PRERAM_CBFS_CACHE(0x8C57400, 70K)
|
PRERAM_CBFS_CACHE(0x8C57400, 62K)
|
||||||
|
CBFS_MCACHE(0x8C66C00, 8K)
|
||||||
FMAP_CACHE(0x8C68C00, 2K)
|
FMAP_CACHE(0x8C68C00, 2K)
|
||||||
REGION(bsram_unused, 0x8C69400, 0xA1C00, 0x100)
|
REGION(bsram_unused, 0x8C69400, 0xA1C00, 0x100)
|
||||||
BSRAM_END(0x8D80000)
|
BSRAM_END(0x8D80000)
|
||||||
|
|
|
@ -43,6 +43,7 @@ SECTIONS
|
||||||
REGION(qclib_serial_log, 0x14852000, 4K, 4K)
|
REGION(qclib_serial_log, 0x14852000, 4K, 4K)
|
||||||
REGION(ddr_information, 0x14853000, 1K, 1K)
|
REGION(ddr_information, 0x14853000, 1K, 1K)
|
||||||
FMAP_CACHE(0x14853400, 2K)
|
FMAP_CACHE(0x14853400, 2K)
|
||||||
|
CBFS_MCACHE(0x14853C00, 8K)
|
||||||
REGION(dcb, 0x1485b000, 16K, 4K)
|
REGION(dcb, 0x1485b000, 16K, 4K)
|
||||||
REGION(pmic, 0x1485f000, 48K, 4K)
|
REGION(pmic, 0x1485f000, 48K, 4K)
|
||||||
REGION(qclib, 0x1486b000, 596K, 4K)
|
REGION(qclib, 0x1486b000, 596K, 4K)
|
||||||
|
|
|
@ -17,6 +17,7 @@ config SOC_ROCKCHIP_RK3288
|
||||||
select HAVE_LINEAR_FRAMEBUFFER
|
select HAVE_LINEAR_FRAMEBUFFER
|
||||||
select NO_BOOTBLOCK_CONSOLE
|
select NO_BOOTBLOCK_CONSOLE
|
||||||
select NO_FMAP_CACHE
|
select NO_FMAP_CACHE
|
||||||
|
select NO_CBFS_MCACHE
|
||||||
|
|
||||||
if SOC_ROCKCHIP_RK3288
|
if SOC_ROCKCHIP_RK3288
|
||||||
|
|
||||||
|
|
|
@ -24,11 +24,12 @@ SECTIONS
|
||||||
FMAP_CACHE(0xFF8C1400, 2K)
|
FMAP_CACHE(0xFF8C1400, 2K)
|
||||||
TIMESTAMP(0xFF8C1C00, 1K)
|
TIMESTAMP(0xFF8C1C00, 1K)
|
||||||
/* 0xFF8C2004 is the entry point address the masked ROM will jump to. */
|
/* 0xFF8C2004 is the entry point address the masked ROM will jump to. */
|
||||||
OVERLAP_DECOMPRESSOR_VERSTAGE_ROMSTAGE(0xFF8C2004, 88K - 4)
|
OVERLAP_DECOMPRESSOR_VERSTAGE_ROMSTAGE(0xFF8C2004, 84K - 4)
|
||||||
BOOTBLOCK(0xFF8D8000, 40K)
|
BOOTBLOCK(0xFF8D7000, 40K)
|
||||||
#endif
|
#endif
|
||||||
VBOOT2_WORK(0XFF8E2000, 12K)
|
CBFS_MCACHE(0xFF8E1000, 8K)
|
||||||
TTB(0xFF8E5000, 24K)
|
VBOOT2_WORK(0XFF8E3000, 12K)
|
||||||
|
TTB(0xFF8E6000, 20K)
|
||||||
PRERAM_CBMEM_CONSOLE(0xFF8EB000, 8K)
|
PRERAM_CBMEM_CONSOLE(0xFF8EB000, 8K)
|
||||||
STACK(0xFF8ED000, 12K)
|
STACK(0xFF8ED000, 12K)
|
||||||
SRAM_END(0xFF8F0000)
|
SRAM_END(0xFF8F0000)
|
||||||
|
|
|
@ -18,7 +18,8 @@ SECTIONS
|
||||||
ROMSTAGE(0x2030000, 128K)
|
ROMSTAGE(0x2030000, 128K)
|
||||||
/* 32K hole */
|
/* 32K hole */
|
||||||
TTB(0x2058000, 16K)
|
TTB(0x2058000, 16K)
|
||||||
PRERAM_CBFS_CACHE(0x205C000, 76K)
|
PRERAM_CBFS_CACHE(0x205C000, 68K)
|
||||||
|
CBFS_MCACHE(0x206D000, 8K)
|
||||||
FMAP_CACHE(0x206F000, 2K)
|
FMAP_CACHE(0x206F000, 2K)
|
||||||
TPM_TCPA_LOG(0x206F800, 2K)
|
TPM_TCPA_LOG(0x206F800, 2K)
|
||||||
VBOOT2_WORK(0x2070000, 12K)
|
VBOOT2_WORK(0x2070000, 12K)
|
||||||
|
|
|
@ -19,7 +19,8 @@ SECTIONS
|
||||||
ROMSTAGE(0x2030000, 128K)
|
ROMSTAGE(0x2030000, 128K)
|
||||||
/* 32K hole */
|
/* 32K hole */
|
||||||
TTB(0x2058000, 16K)
|
TTB(0x2058000, 16K)
|
||||||
PRERAM_CBFS_CACHE(0x205C000, 74K)
|
PRERAM_CBFS_CACHE(0x205C000, 66K)
|
||||||
|
CBFS_MCACHE(0x206C800, 8K)
|
||||||
FMAP_CACHE(0x206E800, 2K)
|
FMAP_CACHE(0x206E800, 2K)
|
||||||
STACK(0x206F000, 16K)
|
STACK(0x206F000, 16K)
|
||||||
/* 1K hole for weird kernel-shared CPU/SMP state structure that doesn't
|
/* 1K hole for weird kernel-shared CPU/SMP state structure that doesn't
|
||||||
|
|
|
@ -12,8 +12,9 @@ SECTIONS
|
||||||
{
|
{
|
||||||
L2LIM_START(FU540_L2LIM)
|
L2LIM_START(FU540_L2LIM)
|
||||||
BOOTBLOCK(FU540_L2LIM, 64K)
|
BOOTBLOCK(FU540_L2LIM, 64K)
|
||||||
CAR_STACK(FU540_L2LIM + 64K, 20K)
|
CAR_STACK(FU540_L2LIM + 64K, 12K)
|
||||||
PRERAM_CBMEM_CONSOLE(FU540_L2LIM + 84K, 8K)
|
PRERAM_CBMEM_CONSOLE(FU540_L2LIM + 76K, 8K)
|
||||||
|
CBFS_MCACHE(FU540_L2LIM + 84K, 8K)
|
||||||
FMAP_CACHE(FU540_L2LIM + 92K, 2K)
|
FMAP_CACHE(FU540_L2LIM + 92K, 2K)
|
||||||
ROMSTAGE(FU540_L2LIM + 128K, 128K)
|
ROMSTAGE(FU540_L2LIM + 128K, 128K)
|
||||||
PRERAM_CBFS_CACHE(FU540_L2LIM + 256K, 128K)
|
PRERAM_CBFS_CACHE(FU540_L2LIM + 256K, 128K)
|
||||||
|
|
|
@ -9,6 +9,7 @@ SECTIONS
|
||||||
SRAM_START(0x402f0400)
|
SRAM_START(0x402f0400)
|
||||||
BOOTBLOCK(0x402f0400, 20K)
|
BOOTBLOCK(0x402f0400, 20K)
|
||||||
FMAP_CACHE(0x402f0400+20K, 2K)
|
FMAP_CACHE(0x402f0400+20K, 2K)
|
||||||
|
CBFS_MCACHE(0x402f0400+20K+2K, 8K)
|
||||||
TTB(0x402F8000, 16K)
|
TTB(0x402F8000, 16K)
|
||||||
ROMSTAGE(0x402F8000+16K, 40K)
|
ROMSTAGE(0x402F8000+16K, 40K)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue