Changeset 944b15c in mainline
- Timestamp:
- 2005-12-08T16:15:20Z (19 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- b00fdde
- Parents:
- ac0cb2a
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
rac0cb2a r944b15c 72 72 ifeq ($(CONFIG_USERSPACE),y) 73 73 DEFS += -DCONFIG_USERSPACE 74 endif 75 ifeq ($(CONFIG_FPU_LAZY),y) 76 DEFS += -DCONFIG_FPU_LAZY 74 77 endif 75 78 -
arch/amd64/Makefile.inc
rac0cb2a r944b15c 68 68 DEFS += -DCONFIG_HT 69 69 endif 70 ifeq ($(CONFIG_FPU_LAZY),y)71 DEFS += -DCONFIG_FPU_LAZY72 endif73 70 74 71 ARCH_SOURCES = \ -
arch/ia32/Makefile.inc
rac0cb2a r944b15c 87 87 DEFS += -DCONFIG_HT 88 88 endif 89 ifeq ($(CONFIG_FPU_LAZY),y)90 DEFS += -DCONFIG_FPU_LAZY91 endif92 89 93 90 ARCH_SOURCES = \ -
arch/mips32/Makefile.inc
rac0cb2a r944b15c 74 74 CFLAGS += -EB -DBIG_ENDIAN -DHAVE_FPU -mips3 75 75 endif 76 ifeq ($(MIPS_MACHINE),msim4kc)77 # MSIM needs lwl/swl patch & 4kc instruction patch to work78 # otherwise add -mmemcpy -mips379 80 BFD_NAME = elf32-tradlittlemips81 BFD = binary82 CFLAGS += -mhard-float -march=4kc83 endif84 76 ifeq ($(MIPS_MACHINE),simics) 85 77 # SIMICS 4kc emulation is broken, although for instructions … … 96 88 endif 97 89 98 ## Accepted configuration directives99 #100 101 ifeq ($(CONFIG_FPU_LAZY),y)102 DEFS += -DCONFIG_FPU_LAZY103 endif104 90 105 91 ARCH_SOURCES = \ -
kernel.config
rac0cb2a r944b15c 37 37 ! [ARCH=ia32] IA32_CPU (choice) 38 38 39 # MIPS Machine Type 40 @ "msim" MSIM Simulator 41 @ "simics" Virtutech Simics simulator 42 @ "lgxemul" GXEmul Little Endian 43 @ "bgxemul" GXEmul Big Endian 44 @ "indy" SGI Indy 45 ! [ARCH=mips32] MIPS_MACHINE (choice) 46 39 47 # Support for SMP 40 ! CONFIG_SMP (y/n)48 ! [ARCH=ia32|ARCH=amd64] CONFIG_SMP (y/n) 41 49 42 50 # Improved support for hyperthreading … … 44 52 45 53 # Lazy FPU context switching 46 ! CONFIG_FPU_LAZY (y/n) 47 48 # MIPS Machine Type 49 @ "msim" MSIM Simulator 50 @ "msim4kc" MSIM Simulator with 4kc instruction set 51 @ "simics" Virtutech Simics simulator 52 @ "lgxemul" GXEmul Little Endian 53 @ "bgxemul" GXEmul Big Endian 54 @ "indy" SGI Indy 55 ! [ARCH=mips32] MIPS_MACHINE (choice) 54 ! [(ARCH=mips32&MIPS_MACHINE!=msim)|ARCH=amd64|ARCH=ia32] CONFIG_FPU_LAZY (y/n) 56 55 57 56 ## Debugging configuration directives … … 79 78 @ [ARCH=ia32|ARCH=amd64] "fpu/fpu1" Intel fpu test 1 80 79 @ [ARCH=ia32|ARCH=amd64] "fpu/sse1" Intel Sse test 1 81 @ [ARCH=mips32&MIPS_MACHINE!=msim &MIPS_MACHINE!=msim4kc] "fpu/mips1" Mips FPU test 180 @ [ARCH=mips32&MIPS_MACHINE!=msim] "fpu/mips1" Mips FPU test 1 82 81 @ "print/print1" Printf test 1 83 82 @ "thread/trhead1" Thread test 1 -
tools/config.py
rac0cb2a r944b15c 231 231 f.close() 232 232 233 def check_condition(text, defaults): 234 result = True 235 conds = text.split('&') 233 def check_condition(text, defaults, asked_names): 234 seen_vars = [ x[0] for x in asked_names ] 235 ctype = 'cnf' 236 if ')|' in text or '|(' in text: 237 ctype = 'dnf' 238 239 if ctype == 'cnf': 240 conds = text.split('&') 241 else: 242 conds = text.split('|') 243 236 244 for cond in conds: 237 245 if cond.startswith('(') and cond.endswith(')'): 238 246 cond = cond[1:-1] 239 if not check_dnf(cond, defaults): 247 248 inside = check_inside(cond, defaults, ctype, seen_vars) 249 250 if ctype == 'cnf' and not inside: 240 251 return False 241 return True 242 243 def check_dnf(text, defaults): 252 if ctype == 'dnf' and inside: 253 return True 254 255 if ctype == 'cnf': 256 return True 257 return False 258 259 def check_inside(text, defaults, ctype, seen_vars): 244 260 """ 245 261 Check that the condition specified on input line is True … … 247 263 only CNF is supported 248 264 """ 249 conds = text.split('|') 265 if ctype == 'cnf': 266 conds = text.split('|') 267 else: 268 conds = text.split('&') 250 269 for cond in conds: 251 270 res = re.match(r'^(.*?)(!?=)(.*)$', cond) … … 255 274 oper = res.group(2) 256 275 condval = res.group(3) 276 if condname not in seen_vars: 277 raise RuntimeError("Variable %s not defined before being asked." %\ 278 condname) 257 279 if not defaults.has_key(condname): 258 280 raise RuntimeError("Condition var %s does not exist: %s" % \ 259 281 (condname,text)) 260 282 261 if oper=='=' and condval == defaults[condname]: 262 return True 263 if oper == '!=' and condval != defaults[condname]: 264 return True 265 return False 283 if ctype == 'cnf': 284 if oper == '=' and condval == defaults[condname]: 285 return True 286 if oper == '!=' and condval != defaults[condname]: 287 return True 288 else: 289 if oper== '=' and condval != defaults[condname]: 290 return False 291 if oper== '!=' and condval == defaults[condname]: 292 print 2 293 return False 294 if ctype=='cnf': 295 return False 296 return True 266 297 267 298 def parse_config(input, output, dlg, defaults={}, askonly=None): … … 305 336 raise RuntimeError('Invalid command: %s' % line) 306 337 if res.group(1): 307 if not check_condition(res.group(1), defaults): 338 if not check_condition(res.group(1), defaults, 339 asked_names): 308 340 continue 309 341 args = res.group(2).strip().split(' ') … … 335 367 336 368 if res.group(1): 337 if not check_condition(res.group(1), defaults): 369 if not check_condition(res.group(1), defaults, 370 asked_names): 338 371 if default is not None: 339 372 outf.write('#!# %s = %s\n' % (varname, default)) … … 366 399 raise RuntimeError("Bad line: %s" % line) 367 400 if res.group(1): 368 if not check_condition(res.group(1),defaults): 401 if not check_condition(res.group(1),defaults, 402 asked_names): 369 403 continue 370 404 choices.append((res.group(2), res.group(3))) … … 434 468 435 469 if not defmode and dlg.yesno('Rebuild kernel?') == 'y': 436 os.execlp('make','make','clean',' all')470 os.execlp('make','make','clean','build') 437 471 438 472 if __name__ == '__main__':
Note:
See TracChangeset
for help on using the changeset viewer.