Changeset b2a0f6dd in mainline

Timestamp:

2007-10-30T22:19:58Z (17 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

fa23560

Parents:

dbe8a8f

Message:

Better fix of labels in configuration script.

Files:

• kernel/kernel.config (modified) (1 diff)
• tools/config.py (modified) (1 diff)

kernel/kernel.config

@@ -66 +66 @@
 
 # Framebuffer width
-@ "640" 640
-@ "800" 800
-@ "1024" 1024
-@ "1152" 1152
-@ "1280" 1280
-@ "1400" 1400
-@ "1440" 1440
-@ "1600" 1600
-@ "2048" 2048
+@ "640"
+@ "800"
+@ "1024"
+@ "1152"
+@ "1280"
+@ "1400"
+@ "1440"
+@ "1600"
+@ "2048"
 ! [(ARCH=ia32|ARCH=amd64)&CONFIG_FB=y] CONFIG_VESA_WIDTH (choice)
 
 # Framebuffer height
-@ "480" 480
-@ "600" 600
-@ "768" 768
-@ "852" 852
-@ "900" 900
-@ "960" 960
-@ "1024" 1024
-@ "1050" 1050
-@ "1200" 1200
-@ "1536" 1536
+@ "480"
+@ "600"
+@ "768"
+@ "852"
+@ "900"
+@ "960"
+@ "1024"
+@ "1050"
+@ "1200"
+@ "1536"
 ! [(ARCH=ia32|ARCH=amd64)&CONFIG_FB=y] CONFIG_VESA_HEIGHT (choice)
 
 # Framebuffer depth
-@ "8" 8
-@ "16" 16
-@ "24" 24
+@ "8"
+@ "16"
+@ "24"
 ! [(ARCH=ia32|ARCH=amd64)&CONFIG_FB=y] CONFIG_VESA_BPP (choice)
 

tools/config.py

@@ -74 +74 @@
         sys.stdout.write('%s:\n' % text)
         for i,(text,descr) in enumerate(choices):
-            sys.stdout.write('\t%2d. %s\n' % (i, descr))
+            if descr is '':
+                sys.stdout.write('\t%2d. %s\n' % (i, text))
+            else:
+                sys.stdout.write('\t%2d. %s\n' % (i, descr))
         if defopt is not None:
             sys.stdout.write('Enter choice number[%d]: ' % defopt)