diff --git a/configs/README.txt b/configs/README.txt index 95ff0f7b825..57c74babdcb 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -973,9 +973,10 @@ defconfig -- This is a configuration file similar to the Linux CONFIG_NXFONTS_CHARBITS The number of bits in the character set. Current options are only 7 and 8. The default is 7. - CONFIG_NXFONT_SANS - At present, there is only one font. But if there were were more, - then this option would select the sans serif font. + CONFIG_NXFONT_SANS23X27 + At present, there is only one font, a 23x27 sans serif font. But + if there were were more, then this option would select that sans serif + font. NX Multi-user only options: diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig index 886533daa41..5fea9f7a4f2 100644 --- a/configs/ez80f910200kitg/ostest/defconfig +++ b/configs/ez80f910200kitg/ostest/defconfig @@ -572,7 +572,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -605,7 +605,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig index ca499c9a48e..40cbb674a21 100644 --- a/configs/ez80f910200zco/dhcpd/defconfig +++ b/configs/ez80f910200zco/dhcpd/defconfig @@ -580,7 +580,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -613,7 +613,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig index 09acb43f3ca..5e2801348e9 100644 --- a/configs/ez80f910200zco/httpd/defconfig +++ b/configs/ez80f910200zco/httpd/defconfig @@ -580,7 +580,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -613,7 +613,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig index 6923717d48e..9468c7b5b9a 100644 --- a/configs/ez80f910200zco/nettest/defconfig +++ b/configs/ez80f910200zco/nettest/defconfig @@ -580,7 +580,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -613,7 +613,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig index 43c0a3de180..60abb1e7725 100644 --- a/configs/ez80f910200zco/nsh/defconfig +++ b/configs/ez80f910200zco/nsh/defconfig @@ -580,7 +580,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -613,7 +613,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig index 054e9fe0aa0..7649d22bd31 100644 --- a/configs/ez80f910200zco/ostest/defconfig +++ b/configs/ez80f910200zco/ostest/defconfig @@ -575,7 +575,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -608,7 +608,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig index c2a74015277..133ef6a753d 100644 --- a/configs/ez80f910200zco/poll/defconfig +++ b/configs/ez80f910200zco/poll/defconfig @@ -580,7 +580,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -613,7 +613,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig index 759c14d3a79..2a8bb6e990d 100755 --- a/configs/lm3s6965-ek/nx/defconfig +++ b/configs/lm3s6965-ek/nx/defconfig @@ -548,7 +548,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -584,7 +584,7 @@ CONFIG_NX_KBD=y CONFIG_NXTK_BORDERCOLOR1=8 CONFIG_NXTK_BORDERCOLOR2=4 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig index e76f69a9e53..0ccbe5e023f 100755 --- a/configs/lm3s8962-ek/nx/defconfig +++ b/configs/lm3s8962-ek/nx/defconfig @@ -548,7 +548,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -584,7 +584,7 @@ CONFIG_NX_KBD=y CONFIG_NXTK_BORDERCOLOR1=8 CONFIG_NXTK_BORDERCOLOR2=4 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig index 477ca4ef772..c54eec489c0 100755 --- a/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/configs/lpcxpresso-lpc1768/nx/defconfig @@ -759,7 +759,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -795,7 +795,7 @@ CONFIG_NXTK_BORDERWIDTH=2 CONFIG_NXTK_BORDERCOLOR1=1 CONFIG_NXTK_BORDERCOLOR2=0 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig index 1ffd9defe88..309bf31acb2 100755 --- a/configs/olimex-lpc1766stk/nx/defconfig +++ b/configs/olimex-lpc1766stk/nx/defconfig @@ -739,7 +739,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -775,7 +775,7 @@ CONFIG_NX_KBD=y CONFIG_NXTK_BORDERCOLOR1=8 CONFIG_NXTK_BORDERCOLOR2=4 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig index 51f83efc34e..ddf6a23ff62 100755 --- a/configs/sam3u-ek/knsh/defconfig +++ b/configs/sam3u-ek/knsh/defconfig @@ -702,7 +702,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -738,7 +738,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig index 9294603f49c..8cbbbdcb1cb 100755 --- a/configs/sam3u-ek/nsh/defconfig +++ b/configs/sam3u-ek/nsh/defconfig @@ -672,7 +672,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -708,7 +708,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig index ea1b6093673..c50d242e11a 100755 --- a/configs/sam3u-ek/nx/defconfig +++ b/configs/sam3u-ek/nx/defconfig @@ -681,7 +681,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -717,7 +717,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index 2962d6b0bc6..d4688ea4988 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -369,7 +369,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -402,7 +402,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/sim/nx/defconfig-x11 b/configs/sim/nx/defconfig-x11 index 27a6a51fa0b..9228786dfea 100644 --- a/configs/sim/nx/defconfig-x11 +++ b/configs/sim/nx/defconfig-x11 @@ -369,7 +369,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -402,7 +402,7 @@ CONFIG_NX_KBD=y #CONFIG_NXTK_BORDERCOLOR1 #CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index 988d659e4b7..951980caac4 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -775,7 +775,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -811,7 +811,7 @@ CONFIG_NX_KBD=y CONFIG_NXTK_BORDERCOLOR1=0xd69a CONFIG_NXTK_BORDERCOLOR2=0xad55 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index bf6e25e7a61..44633cbc179 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -767,7 +767,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -803,7 +803,7 @@ CONFIG_NX_KBD=y CONFIG_NXTK_BORDERCOLOR1=0xd69a CONFIG_NXTK_BORDERCOLOR2=0xad55 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 diff --git a/configs/stm3210e-eval/nxtext/defconfig b/configs/stm3210e-eval/nxtext/defconfig index 98efcf9a797..5b658f0ad8d 100644 --- a/configs/stm3210e-eval/nxtext/defconfig +++ b/configs/stm3210e-eval/nxtext/defconfig @@ -767,7 +767,7 @@ CONFIG_USBSTRG_REMOVABLE=y # CONFIG_NXFONTS_CHARBITS # The number of bits in the character set. Current options are # only 7 and 8. The default is 7. -# CONFIG_NXFONT_SANS +# CONFIG_NXFONT_SANS23X27 # At present, there is only one font. But if there were were more, # then this option would select the sans serif font. # @@ -803,7 +803,7 @@ CONFIG_NX_KBD=y CONFIG_NXTK_BORDERCOLOR1=0xd69a CONFIG_NXTK_BORDERCOLOR2=0xad55 CONFIG_NXTK_AUTORAISE=n -CONFIG_NXFONT_SANS=y +CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32