sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-04-04 19:19:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trivial changes to sync up.

Browse Source
This commit is contained in:
Russel Winder
2009-08-28 09:28:24 +01:00
parent 187b70a829
commit 34a804eb4d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@@ -18,7 +18,7 @@
# Author: Russel Winder # Author: Russel Winder
# To support Python 2.5 we need the following, which seems to do no harm in Python 2.6. Only if Python 2.6 # To support Python 2.5 we need the following, which seems to do no harm in Python 2.6. Only if Python 2.6
# is the floor version supported can be dispensed with. # is the floor version supported can this be dispensed with.
from __future__ import with_statement from __future__ import with_statement
@@ -57,7 +57,7 @@ if 'configure' in COMMAND_LINE_TARGETS :
os.system(cml2ToolsDirectory + '/cmlconfigure.py -c -o ' + cml2ConfigPropertiesFile + ' ' + cml2CompileRulesFile) os.system(cml2ToolsDirectory + '/cmlconfigure.py -c -o ' + cml2ConfigPropertiesFile + ' ' + cml2CompileRulesFile)
os.system(toolsDirectory + '/cml2header.py -o ' + cml2ConfigHeaderFile + ' -i ' + cml2ConfigPropertiesFile) os.system(toolsDirectory + '/cml2header.py -o ' + cml2ConfigHeaderFile + ' -i ' + cml2ConfigPropertiesFile)
if len ( COMMAND_LINE_TARGETS ) != 1: if len(COMMAND_LINE_TARGETS) != 1:
print '#### Warning####: configure is part of the command line, all the other targets are being ignored as this is a configure step.' print '#### Warning####: configure is part of the command line, all the other targets are being ignored as this is a configure step.'
Command('configure', ['#configs/arm.cml'], performCML2Configuration) Command('configure', ['#configs/arm.cml'], performCML2Configuration)
Clean('configure', buildDirectory) Clean('configure', buildDirectory)
@@ -109,6 +109,7 @@ else :
if items[1] == 'SUBARCH': if items[1] == 'SUBARCH':
subarch = items[2].lower() subarch = items[2].lower()
if items[0] == 'DRIVER': if items[0] == 'DRIVER':
# Add data to the environment about which driver paths to include in the build.
configuration.env.Append(driverList = [('irq' if items[1] == 'IRQCTRL' else items[1].lower()) + '/' + items[2].lower()]) configuration.env.Append(driverList = [('irq' if items[1] == 'IRQCTRL' else items[1].lower()) + '/' + items[2].lower()])
configuration.Define('__ARCH__', arch) configuration.Define('__ARCH__', arch)
configuration.Define('__PLATFORM__', platform) configuration.Define('__PLATFORM__', platform)
@@ -213,6 +214,9 @@ else :
#### TODO: Why does the linker require crt0.o to be in the current directory and named as such. Is it #### TODO: Why does the linker require crt0.o to be in the current directory and named as such. Is it
#### because of the text in the linker script? #### because of the text in the linker script?
#### ####
#### taskNameList = [ f.name for f in Glob(posixServicesDirectory + '*') if f.name not in taskLibraryNames + ['bootdesc'] ]
#### imageOrderData = [(taskName, []) for taskName in taskNameList]
execfile(posixServicesDirectory + 'taskOrder.py') execfile(posixServicesDirectory + 'taskOrder.py')
imageOrderData = [(taskName, []) for taskName in taskOrder] imageOrderData = [(taskName, []) for taskName in taskOrder]
imageOrderData[0][1].append(startAxf) imageOrderData[0][1].append(startAxf)