Changeset 5b586b9 in mainline


Ignore:
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

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/arm32/meson.build

    r98975a8 r5b586b9  
    44
    55if MACHINE == 'gta02'
    6         LADDR = 0x30008000
    7         SADDR = 0x30008000
     6        LADDR = '0x30008000'
     7        SADDR = '0x30008000'
    88        POSTBUILD = 'uboot'
    99        POST_OUTPUT = 'uImage.bin'
    … …  
    1111
    1212if MACHINE == 'beagleboardxm' or MACHINE == 'beaglebone'
    13         LADDR = 0x80000000
    14         SADDR = 0x80000000
     13        LADDR = '0x80000000'
     14        SADDR = '0x80000000'
    1515        POSTBUILD = 'uboot'
    1616        POST_OUTPUT = 'uImage.bin'
    … …  
    1818
    1919if MACHINE == 'raspberrypi'
    20         LADDR = 0x00008000
    21         SADDR = 0x00008000
     20        LADDR = '0x00008000'
     21        SADDR = '0x00008000'
    2222        POSTBUILD = 'uboot'
    2323        POST_OUTPUT = 'uImage.bin'

  • boot/meson.build

    r98975a8 r5b586b9  
    11subdir('arch' / BARCH)
     2
     3if POSTBUILD == 'uimage'
     4        boot_image_format = 'binary'
     5endif
    26
    37if BUILD
    … …  
    137141        if boot_image_format == 'binary'
    138142                # Some platforms can't ELF.
    139                 boot_image = custom_target(boot_image_name,
     143                boot_image = custom_target(boot_image_name + '.bin',
    140144                        input: boot_elf,
    141                         output: boot_image_name,
     145                        output: boot_image_name + '.bin',
    142146                        command: [ objcopy, '-O', 'binary', '@INPUT@', '@OUTPUT@' ],
    143147                )
    … …  
    154158
    155159if POSTBUILD == 'uboot'
    156         # TODO
    157         error('unfinished')
     160        IMAGE_NAME = 'HelenOS-' + HELENOS_RELEASE
     161
     162        POST_INPUT = custom_target('uboot-image',
     163                output: 'uboot-image.bin',
     164                input: boot_image,
     165                command: [
     166                        mkuimage,
     167                        '-name', IMAGE_NAME,
     168                        '-laddr', LADDR,
     169                        '-saddr', SADDR,
     170                        '-ostype', UIMAGE_OS,
     171                        '@INPUT@',
     172                        '@OUTPUT@',
     173                ],
     174        )
    158175endif
    159176

  • meson.build

    r98975a8 r5b586b9  
    2626mkext4 = find_program('tools/mkext4.py')
    2727mkfat = find_program('tools/mkfat.py')
     28mkuimage = find_program('tools/mkuimage.py')
    2829cp = find_program('cp')
    2930
    … …  
    157158        'BARCH',
    158159        'GRUB_ARCH',
     160        'UIMAGE_OS',
    159161]
    160162
Note: See TracChangeset for help on using the changeset viewer.