Skip to content

Commit

Permalink
linker: Fix missing DEVNULL_REGION for XIP configuration
Browse files Browse the repository at this point in the history
DEVNULL_REGION was created only for !CONFIG_XIP. Moved definition
outside of that #ifdef.
Removed condition which was repeated as it is present at the beginning
of the file.

(cherry picked from commit 67676d8)

Original-Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
GitOrigin-RevId: 67676d8
Change-Id: I8a574a332ce1f8a1c26708d60fc572e1d7677d0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4993824
Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>
Tested-by: Fabio Baltieri <fabiobaltieri@google.com>
Commit-Queue: Fabio Baltieri <fabiobaltieri@google.com>
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
  • Loading branch information
nordic-krch authored and Chromeos LUCI committed Oct 31, 2023
1 parent 6f0cb46 commit d6cc149
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions include/zephyr/linker/linker-devnull.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,10 @@
#error "Cannot place devnull segment adjacent to ROM region."
#endif

#if defined(CONFIG_LINKER_DEVNULL_MEMORY)
#define DEVNULL_REGION DEVNULL_ROM
#else
#define DEVNULL_REGION ROMABLE_REGION
#endif

#endif /* CONFIG_XIP */

#define DEVNULL_REGION DEVNULL_ROM

#endif /* CONFIG_LINKER_DEVNULL_MEMORY */

#endif /* ZEPHYR_INCLUDE_LINKER_LINKER_DEVNULL_H_ */

0 comments on commit d6cc149

Please sign in to comment.