From 8c5a8f68803fe8a619214d46c9f2b80090c9034e Mon Sep 17 00:00:00 2001 From: pulin1103 Date: Mon, 8 Jul 2024 13:57:25 +0800 Subject: [PATCH 1/2] [Telink] Disable BOOT_USB_DFU and update tlsr9528a 2m/4m flash overlay Signed-off-by: pulin1103 --- config/telink/app/bootloader_usb.conf | 4 +- .../telink/tlsr9528a_2m_flash.overlay | 45 ++++++++++++++++++- .../telink/tlsr9528a_4m_flash.overlay | 44 ++++++++++++++++++ 3 files changed, 90 insertions(+), 3 deletions(-) mode change 120000 => 100644 src/platform/telink/tlsr9528a_2m_flash.overlay create mode 100644 src/platform/telink/tlsr9528a_4m_flash.overlay diff --git a/config/telink/app/bootloader_usb.conf b/config/telink/app/bootloader_usb.conf index b6b0098bfc31b1..67ec09a790913d 100644 --- a/config/telink/app/bootloader_usb.conf +++ b/config/telink/app/bootloader_usb.conf @@ -16,5 +16,5 @@ # USB DFU configuration CONFIG_USB_DFU_WILL_DETACH=n -CONFIG_BOOT_USB_DFU_GPIO=y -CONFIG_MCUBOOT_INDICATION_LED=y +CONFIG_BOOT_USB_DFU_GPIO=n +CONFIG_MCUBOOT_INDICATION_LED=n diff --git a/src/platform/telink/tlsr9528a_2m_flash.overlay b/src/platform/telink/tlsr9528a_2m_flash.overlay deleted file mode 120000 index 3b425c1198b983..00000000000000 --- a/src/platform/telink/tlsr9528a_2m_flash.overlay +++ /dev/null @@ -1 +0,0 @@ -tlsr9518adk80d_2m_flash.overlay \ No newline at end of file diff --git a/src/platform/telink/tlsr9528a_2m_flash.overlay b/src/platform/telink/tlsr9528a_2m_flash.overlay new file mode 100644 index 00000000000000..98bc72b459dd24 --- /dev/null +++ b/src/platform/telink/tlsr9528a_2m_flash.overlay @@ -0,0 +1,44 @@ +&flash { + reg = <0x20000000 0x200000>; + + partitions { + /delete-node/ partition@0; + /delete-node/ partition@20000; + /delete-node/ partition@88000; + /delete-node/ partition@f0000; + /delete-node/ partition@f4000; + /delete-node/ partition@fe000; + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 0x13000>; + }; + slot0_partition: partition@13000 { + label = "image-0"; + reg = <0x13000 0xec000>; + }; + factory_partition: partition@ff000 { + label = "factory-data"; + reg = <0xff000 0x1000>; + }; + dac_keypair_partition: partition@100000 { + label = "dac-keypair"; + reg = <0x100000 0x1000>; //store dac and key pair. + }; + descriptor_partition: partition@101000 { + label = "sboot-descriptor"; + reg = <0x101000 0x2000>; + }; + storage_partition: partition@103000 { + label = "storage"; + reg = <0x103000 0xf000>; + }; + slot1_partition: partition@112000 { + label = "image-1"; + reg = <0x112000 0xec000>; + }; + vendor_partition: partition@1fe000 { + label = "vendor-data"; + reg = <0x1fe000 0x2000>; + }; + }; +}; diff --git a/src/platform/telink/tlsr9528a_4m_flash.overlay b/src/platform/telink/tlsr9528a_4m_flash.overlay new file mode 100644 index 00000000000000..0005da2a590ab4 --- /dev/null +++ b/src/platform/telink/tlsr9528a_4m_flash.overlay @@ -0,0 +1,44 @@ +&flash { + reg = <0x20000000 0x400000>; + + partitions { + /delete-node/ partition@0; + /delete-node/ partition@20000; + /delete-node/ partition@88000; + /delete-node/ partition@f0000; + /delete-node/ partition@f4000; + /delete-node/ partition@fe000; + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 0x13000>; + }; + slot0_partition: partition@13000 { + label = "image-0"; + reg = <0x13000 0x1ec000>; + }; + factory_partition: partition@1ff000 { + label = "factory-data"; + reg = <0x1ff000 0x1000>; + }; + dac_keypair_partition: partition@200000 { + label = "dac-keypair"; + reg = <0x200000 0x1000>; //store dac and key pair. + }; + descriptor_partition: partition@201000 { + label = "sboot-descriptor"; + reg = <0x201000 0x2000>; + }; + storage_partition: partition@203000 { + label = "storage"; + reg = <0x203000 0xf000>; + }; + slot1_partition: partition@212000 { + label = "image-1"; + reg = <0x212000 0x1ec000>; + }; + vendor_partition: partition@3fe000 { + label = "vendor-data"; + reg = <0x3fe000 0x2000>; + }; + }; +}; From bd77b684b758f84cc134f074fadd5b4dbfdd2196 Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Fri, 19 Jul 2024 12:26:16 +0300 Subject: [PATCH 2/2] [Telink] Update chef build to docker version 65 --- .github/workflows/chef.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index 5d0a6130b686ae..b403dffe758a52 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -98,7 +98,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:57 + image: ghcr.io/project-chip/chip-build-telink:65 options: --user root steps: