Changeset 48c3d50 in mainline

Timestamp:

2009-01-21T17:11:37Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d752cf4

Parents:

76bcaaf

Message:

salvage duplicate configuration option

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile (modified) (1 diff)
• boot/arch/sparc64/loader/main.c (modified) (1 diff)
• contrib/default/sparc64/Makefile.config (modified) (1 diff)
• tools/config.py (modified) (1 diff)

HelenOS.config

@@ -210 +210 @@
 
 % Start AP processors by the loader
-! [PLATFORM=sparc64] CONFIG_SMP (y/n)
+! [PLATFORM=sparc64&CONFIG_SMP=y] CONFIG_AP (y/n)
 
 % Use Block Address Translation by the loader

boot/Makefile

@@ -47 +47 @@
 endif
 
-ifeq ($(CONFIG_SMP),y)
-        DEFS += -DCONFIG_SMP
+ifeq ($(CONFIG_AP),y)
+        DEFS += -DCONFIG_AP
 endif
 

boot/arch/sparc64/loader/main.c

@@ -261 +261 @@
         printf("done.\n");
 
-#ifdef CONFIG_SMP
+#ifdef CONFIG_AP
         printf("\nChecking for secondary processors...");
         if (!ofw_cpu())

contrib/default/sparc64/Makefile.config

@@ -54 +54 @@
 
 # Start AP processors by the loader
-CONFIG_SMP = y
+CONFIG_AP = y
 
 # Preserve A.OUT header in isofs.b

tools/config.py

@@ -257 +257 @@
                         create_output(OUTPUT, defaults, ask_names)
                         return 0
+        
+        # Check mode: only check defaults
+        if ((len(sys.argv) >= 3) and (sys.argv[2] == 'check')):
+                if (check_choices(defaults, ask_names)):
+                        return 0
+                return 1
         
         screen = xtui.screen_init()