diff --git a/arch/arm/configs/netx_nxdb500_defconfig b/arch/arm/configs/netx_nxdb500_defconfig
index 70af580..863a4be 100644
--- a/arch/arm/configs/netx_nxdb500_defconfig
+++ b/arch/arm/configs/netx_nxdb500_defconfig
@@ -1,54 +1,86 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-git
-# Sat Sep 22 15:53:21 2007
+# U-Boot version: 2.0.0-rc5-git
+# Thu Jul  3 09:34:20 2008
 #
-CONFIG_TEXT_BASE=0x08f80000
+CONFIG_ARCH_TEXT_BASE=0x81f00000
 CONFIG_BOARDINFO="Hilscher Netx nxdb500"
+# CONFIG_BOARD_LINKER_SCRIPT is not set
+CONFIG_GENERIC_LINKER_SCRIPT=y
 CONFIG_ARM=y
 CONFIG_ARM926EJS=y
 CONFIG_ARCH_NETX=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=y
+# CONFIG_MACH_PCM037 is not set
+# CONFIG_MACH_OMAP is not set
+# CONFIG_MACH_AT91SAM9260_EK is not set
 CONFIG_NETX_SDRAM_CTRL=0x010D0121
 CONFIG_NETX_SDRAM_TIMING_CTRL=0x03C13261
 CONFIG_NETX_MEM_CTRL=0x0203030F
 CONFIG_NETX_COOKIE=32
 
 #
-# Arm specific settings
+# Arm specific settings         
 #
 CONFIG_CMDLINE_TAG=y
 CONFIG_SETUP_MEMORY_TAGS=y
 CONFIG_INITRD_TAG=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=0x08f80000
+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=y
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_KALLSYMS is not set
+CONFIG_MACH_HAS_LOWLEVEL_INIT=y
+CONFIG_MACH_DO_LOWLEVEL_INIT=y
 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_HUSH_PARSER=y
+CONFIG_SHELL_HUSH=y
+# CONFIG_SHELL_SIMPLE is not set
+# CONFIG_GLOB is not set
 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 is not set
 
 #
 # 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
 
 #
 # Commands                      
@@ -58,10 +90,13 @@
 # scripting                     
 #
 CONFIG_CMD_EDIT=y
-CONFIG_CMD_EXEC=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                 
@@ -85,29 +120,19 @@
 # CONFIG_CMD_SPLASH is not set
 
 #
-# i2c                           
-#
-# CONFIG_CMD_I2C is not set
-
-#
 # memory                        
 #
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_MEMORY=y
 CONFIG_CMD_CRC=y
 # CONFIG_CMD_MTEST is not set
 
 #
-# network                       
-#
-# CONFIG_CMD_MII is not set
-
-#
 # flash                         
 #
 CONFIG_CMD_FLASH=y
+# CONFIG_CMD_NAND is not set
 
 #
 # booting                       
@@ -138,6 +163,7 @@
 # serial drivers                
 #
 CONFIG_DRIVER_SERIAL_NETX=y
+# CONFIG_DRIVER_SERIAL_NS16550 is not set
 CONFIG_HAS_NETX_ETHER=y
 CONFIG_MIIPHY=y
 
@@ -148,12 +174,20 @@
 CONFIG_DRIVER_NET_NETX=y
 
 #
+# SPI drivers                   
+#
+CONFIG_SPI=y
+# CONFIG_DRIVER_SPI_MC13783 is not set
+
+#
 # flash drivers                 
 #
 CONFIG_HAS_CFI=y
 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
 
 #
 # Filesystem support            
diff --git a/board/netx/Makefile b/board/netx/Makefile
index c1d02f8..8b33fec 100644
--- a/board/netx/Makefile
+++ b/board/netx/Makefile
@@ -1 +1,2 @@
-obj-y += netx.o
+obj-y += netx.o platform.o
+
diff --git a/board/netx/netx.c b/board/netx/netx.c
index b422ff8..628acee 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -28,6 +28,7 @@
 #include <asm/armlinux.h>
 #include <fs.h>
 #include <fcntl.h>
+#include <asm/mach-types.h>
 #include <asm/arch/netx-eth.h>
 
 static struct device_d cfi_dev = {
@@ -76,11 +77,14 @@
 	register_device(&netx_eth_dev0);
 //	register_device(&netx_eth_dev1);
 
+#ifdef CONFIG_PARTITION
 	dev_add_partition(&cfi_dev, 0x00000, 0x40000, PARTITION_FIXED, "self");
-	dev_protect(&cfi_dev, 0x40000, 0, 1);
 
 	/* Do not overwrite primary env for now */
 	dev_add_partition(&cfi_dev, 0xc0000, 0x80000, PARTITION_FIXED, "env"); 
+#endif
+
+	dev_protect(&cfi_dev, 0x40000, 0, 1);
 
 	armlinux_set_bootparams((void *)0x80000100);
 	armlinux_set_architecture(MACH_TYPE_NXDB500);
diff --git a/board/netx/platform.S b/board/netx/platform.S
index f7e0f1e..4961682 100644
--- a/board/netx/platform.S
+++ b/board/netx/platform.S
@@ -21,9 +21,6 @@
  * MA 02111-1307 USA
  */
 
-#include <config.h>
-#include <version.h>
-
 .globl board_init_lowlevel
 board_init_lowlevel:
 	mov	pc, lr