From 890fefafbe18df3f924f70a9fc9159acb3cac29a Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 1 Mar 2023 16:22:38 +0700 Subject: [PATCH 1/2] shrink cf2 from 2KB to 1KB --- linker/nrf52833.ld | 4 ++-- linker/nrf52833_debug.ld | 4 ++-- linker/nrf52840.ld | 4 ++-- linker/nrf52840_debug.ld | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linker/nrf52833.ld b/linker/nrf52833.ld index 49d8350f..1f6d64ca 100644 --- a/linker/nrf52833.ld +++ b/linker/nrf52833.ld @@ -11,9 +11,9 @@ MEMORY * those values do not match. The check is performed in main.c, see * APP_ERROR_CHECK_BOOL(*((uint32_t *)NRF_UICR_BOOT_START_ADDRESS) == BOOTLOADER_REGION_START); */ - FLASH (rx) : ORIGIN = 0x74000, LENGTH = 0x7E000-0x74000-2K /* 38 KB */ + FLASH (rx) : ORIGIN = 0x74000, LENGTH = 0x7E000-0x74000-1K /* 39 KB */ - BOOTLOADER_CONFIG (r): ORIGIN = 0x7E000 - 2K, LENGTH = 2K + BOOTLOADER_CONFIG (r): ORIGIN = 0x7E000 - 1K, LENGTH = 1K /** Location of mbr params page in flash. */ MBR_PARAMS_PAGE (rw) : ORIGIN = 0x0007E000, LENGTH = 0x1000 diff --git a/linker/nrf52833_debug.ld b/linker/nrf52833_debug.ld index ed8f3586..de7b5fce 100644 --- a/linker/nrf52833_debug.ld +++ b/linker/nrf52833_debug.ld @@ -12,9 +12,9 @@ MEMORY * APP_ERROR_CHECK_BOOL(*((uint32_t *)NRF_UICR_BOOT_START_ADDRESS) == BOOTLOADER_REGION_START); */ /* due to lack of flash for debug, we will use reserved app to extend bootloader size */ - FLASH (rx) : ORIGIN = 0x74000-28K, LENGTH = 0x7E000-0x74000-2K + 28K + FLASH (rx) : ORIGIN = 0x74000-28K, LENGTH = 0x7E000-0x74000-1K + 28K - BOOTLOADER_CONFIG (r): ORIGIN = 0x7E000 - 2K, LENGTH = 2K + BOOTLOADER_CONFIG (r): ORIGIN = 0x7E000 - 1K, LENGTH = 1K /** Location of mbr params page in flash. */ MBR_PARAMS_PAGE (rw) : ORIGIN = 0x0007E000, LENGTH = 0x1000 diff --git a/linker/nrf52840.ld b/linker/nrf52840.ld index 5eec85ed..80c274de 100644 --- a/linker/nrf52840.ld +++ b/linker/nrf52840.ld @@ -11,9 +11,9 @@ MEMORY * those values do not match. The check is performed in main.c, see * APP_ERROR_CHECK_BOOL(*((uint32_t *)NRF_UICR_BOOT_START_ADDRESS) == BOOTLOADER_REGION_START); */ - FLASH (rx) : ORIGIN = 0xF4000, LENGTH = 0xFE000-0xF4000 - 2K /* 38 KB */ + FLASH (rx) : ORIGIN = 0xF4000, LENGTH = 0xFE000 - 0xF4000 - 1K /* 39 KB */ - BOOTLOADER_CONFIG (r): ORIGIN = 0xFE000 - 2K, LENGTH = 2K + BOOTLOADER_CONFIG (r): ORIGIN = 0xFE000 - 1K, LENGTH = 1K /** Location of mbr params page in flash. */ MBR_PARAMS_PAGE (rw) : ORIGIN = 0xFE000, LENGTH = 0x1000 diff --git a/linker/nrf52840_debug.ld b/linker/nrf52840_debug.ld index 324cad1d..82e54cda 100644 --- a/linker/nrf52840_debug.ld +++ b/linker/nrf52840_debug.ld @@ -12,9 +12,9 @@ MEMORY * APP_ERROR_CHECK_BOOL(*((uint32_t *)NRF_UICR_BOOT_START_ADDRESS) == BOOTLOADER_REGION_START); */ /* due to lack of flash for debug, we will use reserved app to extend bootloader size */ - FLASH (rx) : ORIGIN = 0xF4000-28K, LENGTH = 0xFE000-0xF4000 - 2K + 28K /* 38 KB */ + FLASH (rx) : ORIGIN = 0xF4000-28K, LENGTH = 0xFE000-0xF4000 - 1K + 28K - BOOTLOADER_CONFIG (r): ORIGIN = 0xFE000 - 2K, LENGTH = 2K + BOOTLOADER_CONFIG (r): ORIGIN = 0xFE000 - 1K, LENGTH = 1K /** Location of mbr params page in flash. */ MBR_PARAMS_PAGE (rw) : ORIGIN = 0xFE000, LENGTH = 0x1000 From ea6d5481389bff46cf91184066410f38e49940c4 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 1 Mar 2023 16:51:58 +0700 Subject: [PATCH 2/2] fix ci warnings --- .github/workflows/githubci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml index ad77865c..631239b2 100644 --- a/.github/workflows/githubci.yml +++ b/.github/workflows/githubci.yml @@ -63,7 +63,7 @@ jobs: steps: - name: Setup Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 - name: Checkout Code uses: actions/checkout@v3