[pcm037] compile fixes, update defconfig

arch/arm/configs/pcm037_defconfig

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-git
-# Thu Oct 18 19:32:40 2007
+# U-Boot version: 2.0.0-rc5-git
+# Thu Jul  3 09:29:45 2008
 #
 CONFIG_ARCH_TEXT_BASE=0x87f00000
 CONFIG_BOARDINFO="Phytec phyCORE-i.MX31"
@@ -13,12 +13,15 @@ CONFIG_ARCH_IMX31=y
 # CONFIG_MACH_MX1ADS is not set
 # CONFIG_MACH_SCB9328 is not set
 # CONFIG_MACH_PCM038 is not set
+# CONFIG_MACH_IMX27ADS is not set
 # CONFIG_MACH_ECO920 is not set
 # CONFIG_MACH_NXDB500 is not set
 CONFIG_MACH_PCM037=y
+# CONFIG_MACH_OMAP is not set
+# CONFIG_MACH_AT91SAM9260_EK is not set
 
 #
-# Arm specific settings
+# Arm specific settings         
 #
 CONFIG_CMDLINE_TAG=y
 CONFIG_SETUP_MEMORY_TAGS=y
@@ -26,35 +29,49 @@ CONFIG_SETUP_MEMORY_TAGS=y
 CONFIG_GREGORIAN_CALENDER=y
 CONFIG_HAS_KALLSYMS=y
 CONFIG_HAS_MODULES=y
+CONFIG_CMD_MEMORY=y
+CONFIG_ENV_HANDLING=y
 
 #
 # General Settings              
 #
+
+#
+# memory layout                 
+#
+CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
 CONFIG_TEXT_BASE=0x87f00000
+CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y
+CONFIG_MEMORY_LAYOUT_DEFAULT=y
+# CONFIG_MEMORY_LAYOUT_FIXED is not set
+CONFIG_STACK_SIZE=0x8000
+CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_BROKEN is not set
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_PROMPT="uboot:"
 CONFIG_BAUDRATE=115200
 CONFIG_CMDLINE_EDITING=y
-# CONFIG_AUTO_COMPLETE is not set
+CONFIG_AUTO_COMPLETE=y
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
 CONFIG_MAXARGS=16
 CONFIG_SHELL_HUSH=y
 # CONFIG_SHELL_SIMPLE is not set
+CONFIG_GLOB=y
 CONFIG_PROMPT_HUSH_PS2="> "
 CONFIG_DYNAMIC_CRC_TABLE=y
 CONFIG_ERRNO_MESSAGES=y
 CONFIG_TIMESTAMP=y
 CONFIG_CONSOLE_ACTIVATE_FIRST=y
 # CONFIG_OF_FLAT_TREE is not set
+CONFIG_PARTITION=y
 CONFIG_DEFAULT_ENVIRONMENT=y
 CONFIG_DEFAULT_ENVIRONMENT_PATH="board/pcm037/env"
 
 #
 # Debugging                     
 #
-CONFIG_SKIP_LOWLEVEL_INIT=y
+# CONFIG_DEBUG_INFO is not set
 # CONFIG_ENABLE_FLASH_NOISE is not set
 # CONFIG_ENABLE_PARTITION_NOISE is not set
 # CONFIG_ENABLE_DEVICE_NOISE is not set
@@ -68,8 +85,12 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
 #
 CONFIG_CMD_EDIT=y
 CONFIG_CMD_SLEEP=y
-CONFIG_CMD_ENVIRONMENT=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_LOADENV=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_PRINTENV=y
 CONFIG_CMD_HELP=y
+CONFIG_CMD_READLINE=y
 
 #
 # file commands                 
@@ -94,15 +115,16 @@ CONFIG_CMD_ECHO=y
 #
 # memory                        
 #
+# CONFIG_CMD_LOADB is not set
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MEMORY=y
-# CONFIG_CMD_CRC is not set
+CONFIG_CMD_CRC=y
 # CONFIG_CMD_MTEST is not set
 
 #
 # flash                         
 #
 CONFIG_CMD_FLASH=y
+# CONFIG_CMD_NAND is not set
 
 #
 # booting                       
@@ -113,7 +135,7 @@ CONFIG_CMD_BOOTM=y
 # CONFIG_CMD_BOOTM_SHOW_TYPE is not set
 CONFIG_CMD_RESET=y
 CONFIG_CMD_GO=y
-# CONFIG_CMD_TIMEOUT is not set
+CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_PARTITION=y
 CONFIG_CMD_TEST=y
 CONFIG_NET=y
@@ -133,6 +155,7 @@ CONFIG_NET_TFTP=y
 # serial drivers                
 #
 CONFIG_DRIVER_SERIAL_IMX=y
+# CONFIG_DRIVER_SERIAL_NS16550 is not set
 CONFIG_MIIPHY=y
 
 #
@@ -141,11 +164,19 @@ CONFIG_MIIPHY=y
 CONFIG_DRIVER_NET_SMC911X=y
 CONFIG_DRIVER_NET_SMC911X_ADDRESS_SHIFT=0
 
+#
+# SPI drivers                   
+#
+CONFIG_SPI=y
+# CONFIG_DRIVER_SPI_IMX is not set
+# CONFIG_DRIVER_SPI_MC13783 is not set
+
 #
 # flash drivers                 
 #
 CONFIG_DRIVER_CFI=y
 # CONFIG_DRIVER_CFI_NEW is not set
+CONFIG_DRIVER_CFI_OLD=y
 CONFIG_CFI_BUFFER_WRITE=y
 # CONFIG_NAND is not set
 

board/pcm037/pcm037.c

@@ -114,8 +114,10 @@ static int imx31_devices_init(void)
 	 * Create partitions that should be
 	 * not touched by any regular user
 	 */
+#ifdef CONFIG_PARTITION
 	dev_add_partition(&cfi_dev, 0x00000, 0x20000, PARTITION_FIXED, "self");	/* ourself */
 	dev_add_partition(&cfi_dev, 0x20000, 0x20000, PARTITION_FIXED, "env");	/* environment */
+#endif
 	dev_protect(&cfi_dev, 0x20000, 0, 1);
 
 	register_device(&sram_dev);