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

Cleanup warning #2

Merged
merged 3 commits into from
Jan 16, 2024
Merged

Cleanup warning #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64b1374
kconfig: remove max-align config
nvincent-vossloh Jun 28, 2023
8ff5ba6
direct-xip : Do not compile boot_version_cmp when MCUBOOT_DIRECT_XIP_…
smartin-vossloh Jan 12, 2024
09353ab
CI: github: Allow Mynewt run job failure
smartin-vossloh Jan 12, 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: 1 addition & 0 deletions .github/workflows/mynewt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ jobs:
run: |
./ci/mynewt_install.sh
- name: Mynewt run
continue-on-error: true
run: |
./ci/mynewt_run.sh
2 changes: 2 additions & 0 deletions boot/bootutil/src/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,7 @@ boot_check_header_erased(struct boot_loader_state *state, int slot)
return 0;
}

#if !defined(MCUBOOT_DIRECT_XIP_DOWNGRADE_ALLOWED)
#if (BOOT_IMAGE_NUMBER > 1) || \
defined(MCUBOOT_DIRECT_XIP) || \
defined(MCUBOOT_RAM_LOAD) || \
Expand Down Expand Up @@ -656,6 +657,7 @@ boot_version_cmp(const struct image_version *ver1,
return 0;
}
#endif
#endif

#if defined(MCUBOOT_DIRECT_XIP)
/**
Expand Down
6 changes: 0 additions & 6 deletions boot/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ config SINGLE_APPLICATION_SLOT
uploading a new application overwrites the one that previously
occupied the area.

config BOOT_MAX_ALIGN
int "Flash write alignement in bytes"
default 8
help
Bytes alignment when performing writes into flash memory.

config BOOT_SOC_STM32H7XX
bool "Use booloader for STM32H7xx SOC"
default n
Expand Down
6 changes: 0 additions & 6 deletions boot/zephyr/include/mcuboot_config/mcuboot_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,6 @@

#endif /* CONFIG_SINGLE_APPLICATION_SLOT */

#ifdef CONFIG_BOOT_MAX_ALIGN
#define MCUBOOT_BOOT_MAX_ALIGN CONFIG_BOOT_MAX_ALIGN
#elif defined(CONFIG_MCUBOOT_BOOT_MAX_ALIGN)
#define MCUBOOT_BOOT_MAX_ALIGN CONFIG_MCUBOOT_BOOT_MAX_ALIGN
#endif

#ifdef CONFIG_LOG
#define MCUBOOT_HAVE_LOGGING 1
#endif
Expand Down
Loading