Changeset 5b586b9 in mainline for boot/meson.build

Timestamp:

2019-08-17T12:49:43Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

a73a1453

Parents:

98975a8

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-28 17:03:11)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

rest of arms

File:

• boot/meson.build (modified) (3 diffs)

boot/meson.build

@@ -1 +1 @@
 subdir('arch' / BARCH)
+
+if POSTBUILD == 'uimage'
+        boot_image_format = 'binary'
+endif
 
 if BUILD
@@ -137 +141 @@
         if boot_image_format == 'binary'
                 # Some platforms can't ELF.
-                boot_image = custom_target(boot_image_name,
+                boot_image = custom_target(boot_image_name + '.bin',
                         input: boot_elf,
-                        output: boot_image_name,
+                        output: boot_image_name + '.bin',
                         command: [ objcopy, '-O', 'binary', '@INPUT@', '@OUTPUT@' ],
                 )
@@ -154 +158 @@
 
 if POSTBUILD == 'uboot'
-        # TODO
-        error('unfinished')
+        IMAGE_NAME = 'HelenOS-' + HELENOS_RELEASE
+
+        POST_INPUT = custom_target('uboot-image',
+                output: 'uboot-image.bin',
+                input: boot_image,
+                command: [
+                        mkuimage,
+                        '-name', IMAGE_NAME,
+                        '-laddr', LADDR,
+                        '-saddr', SADDR,
+                        '-ostype', UIMAGE_OS,
+                        '@INPUT@',
+                        '@OUTPUT@',
+                ],
+        )
 endif