Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Examples): Fix warning in MAX32655/UART_DMA example, and increase Bootloader app size for MAX32665 #1224

Merged
merged 9 commits into from
Oct 11, 2024
Merged

fix(Examples): Fix warning in MAX32655/UART_DMA example, and increase Bootloader app size for MAX32665 #1224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6000c61
Merge pull request #919 from Jake-Carter/release
lorne-maxim Feb 13, 2024
b20b398
Merge pull request #926 from analogdevicesinc/main
lorne-maxim Feb 19, 2024
f8d2e36
chore(Other): Merge `main` into `release` for September 2024 Release …
sihyung-maxim Sep 26, 2024
07b1c0e
Merge branch 'release' into release-main
sihyung-maxim Oct 1, 2024
9535fbe
Merge pull request #1201 from analogdevicesinc/release-main
lorne-maxim Oct 1, 2024
7b81d79
Merge branch 'main' into release-main
sihyung-maxim Oct 8, 2024
b566324
Merge pull request #1219 from analogdevicesinc/release-main
lorne-maxim Oct 9, 2024
0e331b2
Fix incompatible pointer warning
sihyung-maxim Oct 10, 2024
71a823a
Increase bootloader application size for workflows
sihyung-maxim Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ mxc_version.h
mxc_version.mk
Packetcraft-ADI
packetcraft-adi

2 changes: 1 addition & 1 deletion Examples/MAX32655/UART_DMA/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void readCallback(mxc_uart_req_t *req, int error)
READ_FLAG = error;
}

void buttonHandler(void)
void buttonHandler(void *pb)
{
buttonPressed = 1;
}
Expand Down
4 changes: 2 additions & 2 deletions Examples/MAX32665/Bluetooth/Bootloader/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ the main flash section is erased and replaced with the update image. If no valid
is identified, the Bootloader will boot the exiting image in the main flash space.

__0x10000000__: Bootloader
__0x10004000__: Main flash space
__0x10008000__: Main flash space
__0x10080000__: Update flash space

## Setup

This Bootloader application needs to be loaded to the first two flash pages. The main application
This Bootloader application needs to be loaded at the beginning of Flash. The main application
will run on top of this application. The linker file for the main application must coincide
with the memory sections defined in this application. The main application is responsible
for updating the update flash space.
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32665/Bluetooth/Bootloader/boot_lower.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/* Boot from the lower flash array */
Boot_Lower:

ldr r0,=0x10004000 /* Address for main flash image */
ldr r0,=0x10008000 /* Address for main flash image */
ldr r1,=0xE000ED08 /* Address for SCB_VTOR_REG */

/* First 32-bit word in image is initial stack pointer */
Expand Down
2 changes: 1 addition & 1 deletion Examples/MAX32665/Bluetooth/Bootloader/bootloader.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
******************************************************************************/

BOOTLOADER_ORIGIN = 0x10000000;
BOOTLOADER_LEN = 0x4000;
BOOTLOADER_LEN = 0x8000;
FLASH_SECTION_LEN = 0x80000 - BOOTLOADER_LEN;
FLASH0_ORIGIN = BOOTLOADER_ORIGIN + BOOTLOADER_LEN;

Expand Down
1 change: 0 additions & 1 deletion Libraries/CMSIS/Device/Maxim/GCC/gcc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ endif
endif
endif


ifneq "$(wildcard $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk)" ""
include $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk
endif
Expand Down
2 changes: 2 additions & 0 deletions Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd_vs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Copyright (c) 2013-2019 Arm Ltd. All Rights Reserved.
*
* Copyright (c) 2019-2020 Packetcraft, Inc.
*
* Portions Copyright (c) 2024 Analog Devices, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 2 additions & 0 deletions Libraries/Cordio/controller/sources/ble/lhci/lhci_int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Copyright (c) 2013-2019 Arm Ltd. All Rights Reserved.
*
* Copyright (c) 2019-2020 Packetcraft, Inc.
*
* Portions Copyright (c) 2024 Analog Devices, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
5 changes: 2 additions & 3 deletions Libraries/Cordio/platform/include/pal_bb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Copyright (c) 2016-2019 Arm Ltd. All Rights Reserved.
*
* Copyright (c) 2019-2020 Packetcraft, Inc.
*
* Portions Copyright (c) 2024 Analog Devices, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -172,7 +174,6 @@ typedef struct {
} PalBbPhyVersion_t;



/**************************************************************************************************
Function Declarations
**************************************************************************************************/
Expand Down Expand Up @@ -346,8 +347,6 @@ static inline bool PalBbIsValidPrbsType(uint8_t maybeType)
default:
return false;
}


}

/*! \} */ /* PAL_BB */
Expand Down
Loading