From 2f7baea50b3817650d1ae0de6ef1421cc5c3368f Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Sat, 15 Dec 2012 22:42:02 +1100 Subject: Install the grub configuration file with the PC BSP. --- wscript | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 3842db3..e8f8e6e 100644 --- a/wscript +++ b/wscript @@ -1,6 +1,7 @@ # # Waf build script for the Run Time Link editor development project. # +import re import rtems version = "1.0.0" @@ -40,6 +41,7 @@ def build(bld): arch_bsp = bld.get_env()['RTEMS_ARCH_BSP'] arch = bld.get_env()['RTEMS_ARCH'] + bsp = bld.get_env()['RTEMS_BSP'] # # The include paths and defines. @@ -50,7 +52,7 @@ def build(bld): bld.defines = ['PACKAGE_VERSION="' + version + '"', 'RTEMS_RTL_ELF_LOADER=1', 'RTEMS_RTL_RAP_LOADER=1'] - bld.cflags = ['-g'] + bld.cflags = ['-g', '-O'] # # The ARM as special BSP initialise code. @@ -169,7 +171,7 @@ def build(bld): bld(target = 'x.rap', features = 'c rap', xxxx = 'hello', - rtems_linkflags = ['--base', 'rtld.prelink', + rtems_linkflags = ['-v', '--base', 'rtld.prelink', '--entry', 'my_main'], source = ['xa.c', 'x-long-name-to-create-gnu-extension-in-archive.c']) @@ -182,6 +184,8 @@ def build(bld): source = 'fs-root.tar', rule = '${OBJCOPY} -I binary -B ${RTEMS_ARCH} ${OBJCOPY_FLAGS} ${SRC} ${TGT}') + bld.add_group () + bld(features = 'c cprogram', target = 'rtld', source = ['init.c', @@ -197,6 +201,11 @@ def build(bld): if bld.env.ASCIIDOC: bld(target = 'rtems-rtl.html', source = 'rtems-rtl.txt') + if re.match('pc[3456]86', bsp) is not None: + bld(features = 'subst', + source = 'rtems-grub-h0-1.cfg', + target = 'rtems-grub.cfg') + def rebuild(ctx): import waflib.Options waflib.Options.commands.extend(['clean', 'build']) -- cgit v1.2.3