From bac418ea5ecb32c8a7e307c14de7be728f7933a9 Mon Sep 17 00:00:00 2001 From: jzlv Date: Wed, 20 Oct 2021 19:03:30 +0800 Subject: [PATCH] [fix][ld] update camera ld section --- .../camera/camera_interleave/bl706_camera.ld | 48 ++++++++++--------- .../bl706_camera_pbuf.ld | 48 ++++++++++--------- .../bl706_camera_psram.ld | 48 ++++++++++--------- .../camera/camera_lcd/bl706_camera_psram.ld | 48 ++++++++++--------- 4 files changed, 104 insertions(+), 88 deletions(-) diff --git a/examples/camera/camera_interleave/bl706_camera.ld b/examples/camera/camera_interleave/bl706_camera.ld index 5c3c4d51..b152950a 100644 --- a/examples/camera/camera_interleave/bl706_camera.ld +++ b/examples/camera/camera_interleave/bl706_camera.ld @@ -60,16 +60,17 @@ SECTIONS *(.text.*) /*put .rodata**/ - *(EXCLUDE_FILE( *bl702_glb.o \ - *bl702_pds.o \ - *bl702_common.o \ - *bl702_sf_cfg.o \ - *bl702_sf_ctrl.o \ - *bl702_sflash.o \ - *bl702_xip_sflash.o \ - *bl702_ef_ctrl.o) .rodata*) - *(.rodata) - *(.rodata.*) + *(EXCLUDE_FILE( *bl702_glb*.o* \ + *bl702_pds*.o* \ + *bl702_common*.o* \ + *bl702_sf_cfg*.o* \ + *bl702_sf_cfg_ext*.o* \ + *bl702_sf_ctrl*.o* \ + *bl702_sflash*.o* \ + *bl702_sflash_ext*.o* \ + *bl702_xip_sflash*.o* \ + *bl702_xip_sflash_ext*.o* \ + *bl702_ef_ctrl*.o*) .rodata*) *(.srodata) *(.srodata.*) @@ -86,19 +87,22 @@ SECTIONS . = ALIGN(4); __tcm_code_start__ = .; - *(.tcm_code) - *(.tcm_const) - *(.sclock_rlt_code) - *(.sclock_rlt_const) + *(.tcm_code.*) + *(.tcm_const.*) + *(.sclock_rlt_code.*) + *(.sclock_rlt_const.*) - *bl702_glb.o*(.rodata*) - *bl702_pds.o*(.rodata*) - *bl702_common.o*(.rodata*) - *bl702_sf_cfg.o*(.rodata*) - *bl702_sf_ctrl.o*(.rodata*) - *bl702_sflash.o*(.rodata*) - *bl702_xip_sflash.o*(.rodata*) - *bl702_ef_ctrl.o*(.rodata*) + *bl702_glb*.o*(.rodata*) + *bl702_pds*.o*(.rodata*) + *bl702_common*.o*(.rodata*) + *bl702_sf_cfg*.o*(.rodata*) + *bl702_sf_cfg_ext*.o*(.rodata*) + *bl702_sf_ctrl*.o*(.rodata*) + *bl702_sflash*.o*(.rodata*) + *bl702_sflash_ext*.o*(.rodata*) + *bl702_xip_sflash*.o*(.rodata*) + *bl702_xip_sflash_ext*.o*(.rodata*) + *bl702_ef_ctrl*.o*(.rodata*) . = ALIGN(4); __tcm_code_end__ = .; diff --git a/examples/camera/camera_interleave_pbuf/bl706_camera_pbuf.ld b/examples/camera/camera_interleave_pbuf/bl706_camera_pbuf.ld index 01ae7713..81e47d5a 100644 --- a/examples/camera/camera_interleave_pbuf/bl706_camera_pbuf.ld +++ b/examples/camera/camera_interleave_pbuf/bl706_camera_pbuf.ld @@ -60,16 +60,17 @@ SECTIONS *(.text.*) /*put .rodata**/ - *(EXCLUDE_FILE( *bl702_glb.o \ - *bl702_pds.o \ - *bl702_common.o \ - *bl702_sf_cfg.o \ - *bl702_sf_ctrl.o \ - *bl702_sflash.o \ - *bl702_xip_sflash.o \ - *bl702_ef_ctrl.o) .rodata*) - *(.rodata) - *(.rodata.*) + *(EXCLUDE_FILE( *bl702_glb*.o* \ + *bl702_pds*.o* \ + *bl702_common*.o* \ + *bl702_sf_cfg*.o* \ + *bl702_sf_cfg_ext*.o* \ + *bl702_sf_ctrl*.o* \ + *bl702_sflash*.o* \ + *bl702_sflash_ext*.o* \ + *bl702_xip_sflash*.o* \ + *bl702_xip_sflash_ext*.o* \ + *bl702_ef_ctrl*.o*) .rodata*) *(.srodata) *(.srodata.*) @@ -86,19 +87,22 @@ SECTIONS . = ALIGN(4); __tcm_code_start__ = .; - *(.tcm_code) - *(.tcm_const) - *(.sclock_rlt_code) - *(.sclock_rlt_const) + *(.tcm_code.*) + *(.tcm_const.*) + *(.sclock_rlt_code.*) + *(.sclock_rlt_const.*) - *bl702_glb.o*(.rodata*) - *bl702_pds.o*(.rodata*) - *bl702_common.o*(.rodata*) - *bl702_sf_cfg.o*(.rodata*) - *bl702_sf_ctrl.o*(.rodata*) - *bl702_sflash.o*(.rodata*) - *bl702_xip_sflash.o*(.rodata*) - *bl702_ef_ctrl.o*(.rodata*) + *bl702_glb*.o*(.rodata*) + *bl702_pds*.o*(.rodata*) + *bl702_common*.o*(.rodata*) + *bl702_sf_cfg*.o*(.rodata*) + *bl702_sf_cfg_ext*.o*(.rodata*) + *bl702_sf_ctrl*.o*(.rodata*) + *bl702_sflash*.o*(.rodata*) + *bl702_sflash_ext*.o*(.rodata*) + *bl702_xip_sflash*.o*(.rodata*) + *bl702_xip_sflash_ext*.o*(.rodata*) + *bl702_ef_ctrl*.o*(.rodata*) . = ALIGN(4); __tcm_code_end__ = .; diff --git a/examples/camera/camera_interleave_psram/bl706_camera_psram.ld b/examples/camera/camera_interleave_psram/bl706_camera_psram.ld index 567452ec..4cf8505b 100644 --- a/examples/camera/camera_interleave_psram/bl706_camera_psram.ld +++ b/examples/camera/camera_interleave_psram/bl706_camera_psram.ld @@ -61,16 +61,17 @@ SECTIONS *(.text.*) /*put .rodata**/ - *(EXCLUDE_FILE( *bl702_glb.o \ - *bl702_pds.o \ - *bl702_common.o \ - *bl702_sf_cfg.o \ - *bl702_sf_ctrl.o \ - *bl702_sflash.o \ - *bl702_xip_sflash.o \ - *bl702_ef_ctrl.o) .rodata*) - *(.rodata) - *(.rodata.*) + *(EXCLUDE_FILE( *bl702_glb*.o* \ + *bl702_pds*.o* \ + *bl702_common*.o* \ + *bl702_sf_cfg*.o* \ + *bl702_sf_cfg_ext*.o* \ + *bl702_sf_ctrl*.o* \ + *bl702_sflash*.o* \ + *bl702_sflash_ext*.o* \ + *bl702_xip_sflash*.o* \ + *bl702_xip_sflash_ext*.o* \ + *bl702_ef_ctrl*.o*) .rodata*) *(.srodata) *(.srodata.*) @@ -87,19 +88,22 @@ SECTIONS . = ALIGN(4); __tcm_code_start__ = .; - *(.tcm_code) - *(.tcm_const) - *(.sclock_rlt_code) - *(.sclock_rlt_const) + *(.tcm_code.*) + *(.tcm_const.*) + *(.sclock_rlt_code.*) + *(.sclock_rlt_const.*) - *bl702_glb.o*(.rodata*) - *bl702_pds.o*(.rodata*) - *bl702_common.o*(.rodata*) - *bl702_sf_cfg.o*(.rodata*) - *bl702_sf_ctrl.o*(.rodata*) - *bl702_sflash.o*(.rodata*) - *bl702_xip_sflash.o*(.rodata*) - *bl702_ef_ctrl.o*(.rodata*) + *bl702_glb*.o*(.rodata*) + *bl702_pds*.o*(.rodata*) + *bl702_common*.o*(.rodata*) + *bl702_sf_cfg*.o*(.rodata*) + *bl702_sf_cfg_ext*.o*(.rodata*) + *bl702_sf_ctrl*.o*(.rodata*) + *bl702_sflash*.o*(.rodata*) + *bl702_sflash_ext*.o*(.rodata*) + *bl702_xip_sflash*.o*(.rodata*) + *bl702_xip_sflash_ext*.o*(.rodata*) + *bl702_ef_ctrl*.o*(.rodata*) . = ALIGN(4); __tcm_code_end__ = .; diff --git a/examples/camera/camera_lcd/bl706_camera_psram.ld b/examples/camera/camera_lcd/bl706_camera_psram.ld index a54fdfbc..051afa75 100644 --- a/examples/camera/camera_lcd/bl706_camera_psram.ld +++ b/examples/camera/camera_lcd/bl706_camera_psram.ld @@ -60,16 +60,17 @@ SECTIONS *(.text.*) /*put .rodata**/ - *(EXCLUDE_FILE( *bl702_glb.o \ - *bl702_pds.o \ - *bl702_common.o \ - *bl702_sf_cfg.o \ - *bl702_sf_ctrl.o \ - *bl702_sflash.o \ - *bl702_xip_sflash.o \ - *bl702_ef_ctrl.o) .rodata*) - *(.rodata) - *(.rodata.*) + *(EXCLUDE_FILE( *bl702_glb*.o* \ + *bl702_pds*.o* \ + *bl702_common*.o* \ + *bl702_sf_cfg*.o* \ + *bl702_sf_cfg_ext*.o* \ + *bl702_sf_ctrl*.o* \ + *bl702_sflash*.o* \ + *bl702_sflash_ext*.o* \ + *bl702_xip_sflash*.o* \ + *bl702_xip_sflash_ext*.o* \ + *bl702_ef_ctrl*.o*) .rodata*) *(.srodata) *(.srodata.*) @@ -86,19 +87,22 @@ SECTIONS . = ALIGN(4); __tcm_code_start__ = .; - *(.tcm_code) - *(.tcm_const) - *(.sclock_rlt_code) - *(.sclock_rlt_const) + *(.tcm_code.*) + *(.tcm_const.*) + *(.sclock_rlt_code.*) + *(.sclock_rlt_const.*) - *bl702_glb.o*(.rodata*) - *bl702_pds.o*(.rodata*) - *bl702_common.o*(.rodata*) - *bl702_sf_cfg.o*(.rodata*) - *bl702_sf_ctrl.o*(.rodata*) - *bl702_sflash.o*(.rodata*) - *bl702_xip_sflash.o*(.rodata*) - *bl702_ef_ctrl.o*(.rodata*) + *bl702_glb*.o*(.rodata*) + *bl702_pds*.o*(.rodata*) + *bl702_common*.o*(.rodata*) + *bl702_sf_cfg*.o*(.rodata*) + *bl702_sf_cfg_ext*.o*(.rodata*) + *bl702_sf_ctrl*.o*(.rodata*) + *bl702_sflash*.o*(.rodata*) + *bl702_sflash_ext*.o*(.rodata*) + *bl702_xip_sflash*.o*(.rodata*) + *bl702_xip_sflash_ext*.o*(.rodata*) + *bl702_ef_ctrl*.o*(.rodata*) . = ALIGN(4); __tcm_code_end__ = .;