Changeset 5773e82 in mainline for boot/arch/arm64/src

Timestamp:

2019-05-04T12:33:41Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ebbc03c7

Parents:

db8568a (diff), 6de65f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Petr Pavlu <31453820+setupji@…> (2019-05-04 12:33:41)

git-committer:

GitHub <noreply@…> (2019-05-04 12:33:41)

Message:

Merge pull request #166 from setupji/aarch64-cleanup

AArch64 post-merge clean up

File:

• boot/arch/arm64/src/main.c (modified) (1 diff)

boot/arch/arm64/src/main.c

@@ -191 +191 @@
 
         /* Statically check PAGE_SIZE and BOOT_OFFSET. */
-#if PAGE_SIZE != 4096
-#error Unsupported PAGE_SIZE
-#endif
-#if !IS_ALIGNED(BOOT_OFFSET, PAGE_SIZE)
-#error Unsupported BOOT_OFFSET
-#endif
+        _Static_assert(PAGE_SIZE == 4096, "PAGE_SIZE must be equal to 4096");
+        _Static_assert(IS_ALIGNED(BOOT_OFFSET, PAGE_SIZE),
+            "BOOT_OFFSET must be a multiple of PAGE_SIZE");
+
         /*
          * Dynamically check the memory base. The condition should be always