dslinux/vendors/Nintendo/SCSD-RAM config.linux-2.6.x config.arch

[pepsiman]

Update of /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM
In directory antilope:/tmp/cvs-serv24117

Modified Files:
	config.linux-2.6.x config.arch 
Log Message:
Disable kernel XIP

Index: config.arch
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM/config.arch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.arch	16 Aug 2006 10:27:27 -0000	1.1
+++ config.arch	18 Aug 2006 13:58:34 -0000	1.2
@@ -1,3 +1,2 @@
-LINUXTARGET := xipImage
 VENDOR_CFLAGS := -mswp-byte-writes -DCONFIG_NDS_ROM8BIT
 include $(ROOTDIR)/vendors/Nintendo/common/common-config.arch

Index: config.linux-2.6.x
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/SCSD-RAM/config.linux-2.6.x,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.linux-2.6.x	16 Aug 2006 10:27:27 -0000	1.1
+++ config.linux-2.6.x	18 Aug 2006 13:58:34 -0000	1.2
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.14-hsc0
-# Sat Feb 25 20:59:53 2006
+# Fri Aug 18 14:54:57 2006
 #
 CONFIG_ARM=y
 # CONFIG_MMU is not set
@@ -44,7 +44,9 @@
 CONFIG_CC_ALIGN_LABELS=0
 CONFIG_CC_ALIGN_LOOPS=0
 CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_SLAB is not set
 CONFIG_BASE_SMALL=1
+CONFIG_SLOB=y
 
 #
 # Loadable module support
@@ -89,7 +91,7 @@
 CONFIG_DRAM_BASE=0x02000000
 CONFIG_DRAM_SIZE=0x00400000
 CONFIG_FLASH_MEM_BASE=0x08000000
-CONFIG_FLASH_SIZE=0x00400000
+CONFIG_FLASH_SIZE=0x02000000
 
 #
 # Nintendo DS Options
@@ -107,7 +109,6 @@
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_V4WB=y
-CONFIG_CPU_ARM946_CPU_IDLE=y
 
 #
 # Processor Features
@@ -141,8 +142,6 @@
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_SLAB is not set
-CONFIG_SLOB=y
 
 #
 # Boot options
@@ -150,8 +149,7 @@
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="rootfstype=romfs "
-CONFIG_XIP_KERNEL=y
-CONFIG_XIP_PHYS_ADDR=0x08000000
+# CONFIG_XIP_KERNEL is not set
 
 #
 # Floating point emulation