Changeset 3e828ea in mainline for boot/generic

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

boot/generic

Files:

• include/align.h (modified) (1 diff)
• src/version.c (modified) (1 diff)

boot/generic/include/align.h

@@ -49 +49 @@
 #define ALIGN_UP(s, a)  (((s) + ((a) - 1)) & ~((a) - 1))
 
+/** Check alignment.
+ *
+ * @param s Address or size to be checked for alignment.
+ * @param a Size of alignment, must be a power of 2.
+ */
+#define IS_ALIGNED(s, a)  (ALIGN_UP((s), (a)) == (s))
+
 #endif
 

boot/generic/src/version.c

@@ -32 +32 @@
 
 static const char *project = "HelenOS bootloader";
-static const char *copyright = STRING(COPYRIGHT);
-static const char *release = STRING(RELEASE);
-static const char *name = STRING(NAME);
+static const char *copyright = STRING(HELENOS_COPYRIGHT);
+static const char *release = STRING(HELENOS_RELEASE);
+static const char *name = STRING(HELENOS_CODENAME);
 static const char *arch = STRING(KARCH);