Changes for clean NXTEXT compile

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3755 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 18 insertions, 18 deletions

diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig
index 63e362f32..84d407c21 100644
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/configs/stm3210e-eval/nx/defconfig
@@ -366,7 +366,7 @@ CONFIG_SIG_SIGWORK=4
 # CONFIG_SYMTAB_ORDEREDBYNAME. Select if the system symbol table
 #  is ordered by symbol name
 #
-CONFIG_NXFLAT=y
+CONFIG_NXFLAT=n
 CONFIG_NXFLAT_DUMPBUFFER=n
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 
diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig
index f18d11448..d9e0a6371 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig
@@ -335,11 +335,11 @@ CONFIG_SCHED_INSTRUMENTATION=n
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_START_YEAR=2011
 CONFIG_START_MONTH=7
-CONFIG_START_DAY=5
+CONFIG_START_DAY=8
 CONFIG_GREGORIAN_TIME=n
 CONFIG_JULIAN_TIME=n
 CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=n
+CONFIG_DEV_LOWCONSOLE=y
 CONFIG_MUTEX_TYPES=n
 CONFIG_PRIORITY_INHERITANCE=n
 CONFIG_SEM_PREALLOCHOLDERS=0
@@ -366,7 +366,7 @@ CONFIG_SIG_SIGWORK=4
 # CONFIG_SYMTAB_ORDEREDBYNAME. Select if the system symbol table
 #  is ordered by symbol name
 #
-CONFIG_NXFLAT=y
+CONFIG_NXFLAT=n
 CONFIG_NXFLAT_DUMPBUFFER=n
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 
@@ -978,20 +978,20 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=n
 # CONFIG_EXAMPLES_NXTEXT_NOTIFYSIGNO -- The signal number to use with
 #   nx_eventnotify().  Default: 4
 
-CONFIG_EXAMPLES_NXTEST_VPLANE=0
-CONFIG_EXAMPLES_NXTEST_DEVNO=0
-CONFIG_EXAMPLES_NXTEST_BGCOLOR=0x0011
-CONFIG_EXAMPLES_NXTEST_BGFONTCOLOR=0xffdf
-CONFIG_EXAMPLES_NXTEST_PUCOLOR=0xfd20
-CONFIG_EXAMPLES_NXTEST_PUFONTCOLOR=0x001f
-CONFIG_EXAMPLES_NXTEST_BPP=16
-CONFIG_EXAMPLES_NXTEST_EXTERNINIT=n
+CONFIG_EXAMPLES_NXTEXT_VPLANE=0
+CONFIG_EXAMPLES_NXTEXT_DEVNO=0
+CONFIG_EXAMPLES_NXTEXT_BGCOLOR=0x0011
+CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR=0xffdf
+CONFIG_EXAMPLES_NXTEXT_PUCOLOR=0xfd20
+CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR=0x001f
+CONFIG_EXAMPLES_NXTEXT_BPP=16
+CONFIG_EXAMPLES_NXTEXT_EXTERNINIT=n
 CONFIG_EXAMPLES_NXTEXT_BMCACHE=512
 CONFIG_EXAMPLES_NXTEXT_GLCACHE=128
-CONFIG_EXAMPLES_NXTEST_STACKSIZE=2048
-CONFIG_EXAMPLES_NXTEST_CLIENTPRIO=80
-CONFIG_EXAMPLES_NXTEST_SERVERPRIO=120
-CONFIG_EXAMPLES_NXTEST_NOTIFYSIGNO=4
+CONFIG_EXAMPLES_NXTEXT_STACKSIZE=2048
+CONFIG_EXAMPLES_NXTEXT_CLIENTPRIO=80
+CONFIG_EXAMPLES_NXTEXT_SERVERPRIO=120
+CONFIG_EXAMPLES_NXTEXT_NOTIFYSIGNO=4
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/stm3210e-eval/src/up_lcd.c b/nuttx/configs/stm3210e-eval/src/up_lcd.c
index b759aa031..588890e50 100755
--- a/nuttx/configs/stm3210e-eval/src/up_lcd.c
+++ b/nuttx/configs/stm3210e-eval/src/up_lcd.c
@@ -520,7 +520,7 @@ static int stm3210e_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu
  
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcddbg("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Write the run to GRAM. */
@@ -588,7 +588,7 @@ static int stm3210e_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
  
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcddbg("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Set up to read the run. */