Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/arch/cris Makefile,1.1.1.1,1.2 README.mm,1.1.1.1,1.2 config.in,1.1.1.1,1.2 cris.ld,1.1.1.1,1.2 defconfig,1.1.1.1,1.2
|
From: Andy P. <at...@us...> - 2002-04-09 17:08:13
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/cris
In directory usw-pr-cvs1:/tmp/cvs-serv13825/cris
Modified Files:
Makefile README.mm config.in cris.ld defconfig
Log Message:
synch 2.4.15 commit 29
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/cris/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 25 Feb 2001 23:15:23 -0000 1.1.1.1
+++ Makefile 9 Apr 2002 17:03:15 -0000 1.2
@@ -25,32 +25,40 @@
# regenerating stuff (even for incremental linking of subsystems!) is
# even more nauseating.
LD = if [ ! -e $(LD_SCRIPT).tmp -o $(LD_SCRIPT) -nt $(LD_SCRIPT).tmp ]; then \
- sed -e s/@ETRAX_DRAM_BASE@/0x$(ETRAX_DRAM_BASE)/ \
- -e s/@ETRAX_DRAM_SIZE_M@/$(ETRAX_DRAM_SIZE)/ \
+ sed -e s/@CONFIG_ETRAX_DRAM_VIRTUAL_BASE@/0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)/ \
+ -e s/@CONFIG_ETRAX_DRAM_SIZE_M@/$(CONFIG_ETRAX_DRAM_SIZE)/ \
< $(LD_SCRIPT) > $(LD_SCRIPT).tmp; \
else true; \
- fi && $(CROSS_COMPILE)ld -mcriself
+ fi && $(CROSS_COMPILE)gcc -mlinux -nostdlib
-LINKFLAGS =-qmagic -mcriself -T $(LD_SCRIPT).tmp
+LINKFLAGS = -mlinux -T $(LD_SCRIPT).tmp
# objcopy is used to make binary images from the resulting linked file
OBJCOPY := $(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -S
# normally, gcc on a linux box adds __linux__ but we do it "manually"
-# gcc-cris defaults to a.out, we need ELF, so -melf
+# -mlinux enables -march=v10, -fno-underscores among others
-CFLAGS := $(CFLAGS) -march=v10 -fno-strict-aliasing -pipe -D__linux__
+CFLAGS := $(CFLAGS) -mlinux -fno-strict-aliasing -pipe -D__linux__
-ifdef CONFIG_KGDB
+ifdef CONFIG_ETRAX_KGDB
CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS)) -g
CFLAGS += -fno-omit-frame-pointer
endif
+AFLAGS += -mlinux
+
HEAD := arch/cris/kernel/head.o
SUBDIRS += arch/cris/kernel arch/cris/mm arch/cris/lib arch/cris/drivers
-CORE_FILES += arch/cris/kernel/kernel.o arch/cris/mm/mm.o arch/cris/drivers/drivers.o
+ifdef CONFIG_ETRAX_AXISFLASHMAP
+# only build this if axis flash map is used, because they depend on
+# each others config options
+SUBDIRS += arch/cris/boot/rescue
+endif
+CORE_FILES += arch/cris/kernel/kernel.o arch/cris/mm/mm.o
+DRIVERS += arch/cris/drivers/drivers.o
LIBGCC = $(shell $(CC) $(CFLAGS) -print-file-name=libgcc.a)
LIBS := $(TOPDIR)/arch/cris/lib/lib.a $(LIBS) $(TOPDIR)/arch/cris/lib/lib.a $(LIBGCC)
@@ -76,10 +84,18 @@
cramfs:
## cramfs - Creates a cramfs image
- mkcramfs -p 8192 root cramfs.img
+ mkcramfs -b 8192 -m romfs_meta.txt root cramfs.img
cat vmlinux.bin cramfs.img >timage
-zImage: vmlinux
+clinux: vmlinux.bin decompress.bin rescue.bin
+
+decompress.bin: dummy
+ @make -C arch/cris/boot/compressed decompress.bin
+
+rescue.bin: dummy
+ @make -C arch/cris/boot/rescue rescue.bin
+
+zImage: vmlinux.bin
## zImage - Compressed kernel (gzip)
@$(MAKEBOOT) zImage
Index: README.mm
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/cris/README.mm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- README.mm 25 Feb 2001 23:15:23 -0000 1.1.1.1
+++ README.mm 9 Apr 2002 17:03:15 -0000 1.2
@@ -3,8 +3,8 @@
HISTORY:
$Log$
-Revision 1.1.1.1 2001/02/25 23:15:23 kenn
-Import official 2.4.2 Linus tree
+Revision 1.2 2002/04/09 17:03:15 atp
+synch 2.4.15 commit 29
Revision 1.1 2000/07/10 16:25:21 bjornw
Initial revision
Index: config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/cris/config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- config.in 25 Feb 2001 23:15:23 -0000 1.1.1.1
+++ config.in 9 Apr 2002 17:03:15 -0000 1.2
@@ -5,6 +5,8 @@
mainmenu_name "Linux/CRIS Kernel Configuration"
define_bool CONFIG_UID16 y
+define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
+define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
mainmenu_option next_comment
comment 'Code maturity level options'
@@ -12,48 +14,57 @@
endmenu
mainmenu_option next_comment
+comment 'Loadable module support'
+bool 'Enable loadable module support' CONFIG_MODULES
+if [ "$CONFIG_MODULES" = "y" ]; then
+ bool ' Set version information on all module symbols' CONFIG_MODVERSIONS
+ bool ' Kernel module loader' CONFIG_KMOD
+fi
+endmenu
+
+mainmenu_option next_comment
comment 'General setup'
bool 'Networking support' CONFIG_NET
bool 'System V IPC' CONFIG_SYSVIPC
+bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
+bool 'Sysctl support' CONFIG_SYSCTL
tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'Kernel support for JAVA binaries' CONFIG_BINFMT_JAVA
-fi
-bool 'Use kernel gdb debugger' CONFIG_KGDB
+bool 'Use kernel gdb debugger' CONFIG_ETRAX_KGDB
bool 'Enable Etrax100 watchdog' CONFIG_ETRAX_WATCHDOG
-bool 'Use serial console (on the debug port)' CONFIG_USE_SERIAL_CONSOLE
-
-bool 'Use in-kernel ifconfig/route setup' CONFIG_KERNEL_IFCONFIG
-
endmenu
mainmenu_option next_comment
comment 'Hardware setup'
choice 'Processor type' \
- "Etrax-100-LX CONFIG_ETRAX100LX \
- Etrax-100-LX-for-xsim-simulator CONFIG_SVINTO_SIM" Etrax-100-LX
-
-# For both LX version 1 and the current simulator we enable the low VM mapping
-# Later when LX version 2 and above exist, this should be done with an if
-
-define_bool CONFIG_CRIS_LOW_MAP y
+ "Etrax-100-LX-v1 CONFIG_ETRAX100LX \
+ Etrax-100-LX-v2 CONFIG_ETRAX100LX_V2 \
+ Etrax-100-LX-for-xsim-simulator CONFIG_SVINTO_SIM" Etrax-100-LX-v1
+
+# Etrax100 LX v1 has a MMU "feature" requiring a low mapping
+
+if [ "$CONFIG_ETRAX100LX" = "y" ]; then
+ define_bool CONFIG_CRIS_LOW_MAP y
+ define_hex CONFIG_ETRAX_DRAM_VIRTUAL_BASE 60000000
+else
+ define_hex CONFIG_ETRAX_DRAM_VIRTUAL_BASE c0000000
+fi
-hex 'DRAM base (hex)' ETRAX_DRAM_BASE 40000000
-int 'DRAM size (dec, in MB)' ETRAX_DRAM_SIZE 8
+int 'DRAM size (dec, in MB)' CONFIG_ETRAX_DRAM_SIZE 8
-int 'Max possible flash size (dec, in MB)' CONFIG_ETRAX_FLASH_LENGTH 2
int 'Buswidth of flash in bytes' CONFIG_ETRAX_FLASH_BUSWIDTH 2
+string 'Root device name' CONFIG_ETRAX_ROOT_DEVICE "/dev/mtdblock3"
+
choice 'Product LED port' \
"Port-PA-LEDs CONFIG_ETRAX_PA_LEDS \
Port-PB-LEDs CONFIG_ETRAX_PB_LEDS \
- Mem-0x90000000-LEDs CONFIG_ETRAX_90000000_LEDS \
+ Port-CSP0-LEDs CONFIG_ETRAX_CSP0_LEDS \
None CONFIG_ETRAX_NO_LEDS" Port-PA-LEDs
if [ "$CONFIG_ETRAX_NO_LEDS" != "y" ]; then
@@ -61,46 +72,67 @@
int ' First red LED bit' CONFIG_ETRAX_LED1R 3
int ' Second green LED bit' CONFIG_ETRAX_LED2G 4
int ' Second red LED bit' CONFIG_ETRAX_LED2R 5
- int ' Third green LED bit' CONFIG_ETRAX_LED3R 2
- int ' Third red LED bit' CONFIG_ETRAX_LED3G 2
+ int ' Third green LED bit' CONFIG_ETRAX_LED3G 2
+ int ' Third red LED bit' CONFIG_ETRAX_LED3R 2
fi
+if [ "$CONFIG_ETRAX_CSP0_LEDS" = "y" ]; then
+ int ' Fourth red LED bit' CONFIG_ETRAX_LED4R 2
+ int ' Fourth green LED bit' CONFIG_ETRAX_LED4G 2
+ int ' Fifth red LED bit' CONFIG_ETRAX_LED5R 2
+ int ' Fifth green LED bit' CONFIG_ETRAX_LED5G 2
+ int ' Sixth red LED bit' CONFIG_ETRAX_LED6R 2
+ int ' Sixth green LED bit' CONFIG_ETRAX_LED6G 2
+ int ' Seventh red LED bit' CONFIG_ETRAX_LED7R 2
+ int ' Seventh green LED bit' CONFIG_ETRAX_LED7G 2
+ int ' Eigth yellow LED bit' CONFIG_ETRAX_LED8Y 2
+ int ' Ninth yellow LED bit' CONFIG_ETRAX_LED9Y 2
+ int ' Tenth yellow LED bit' CONFIG_ETRAX_LED10Y 2
+ int ' Eleventh yellow LED bit' CONFIG_ETRAX_LED11Y 2
+ int ' Twelfth red LED bit' CONFIG_ETRAX_LED12R 2
+fi
+
choice 'Product debug-port' \
- "Serial-0 CONFIG_DEBUG_PORT0 \
- Serial-1 CONFIG_DEBUG_PORT1 \
- Serial-2 CONFIG_DEBUG_PORT2 \
- Serial-3 CONFIG_DEBUG_PORT3" Serial-0
-
-hex 'R_WAITSTATES' DEF_R_WAITSTATES 95a6
-hex 'R_BUS_CONFIG' DEF_R_BUS_CONFIG 104
-hex 'R_DRAM_CONFIG' DEF_R_DRAM_CONFIG 1a200040
-hex 'R_DRAM_TIMING' DEF_R_DRAM_TIMING 5611
-hex 'R_PORT_PA_DIR' DEF_R_PORT_PA_DIR 1c
-hex 'R_PORT_PA_DATA' DEF_R_PORT_PA_DATA 00
-hex 'R_PORT_PB_CONFIG' DEF_R_PORT_PB_CONFIG 00
-hex 'R_PORT_PB_DIR' DEF_R_PORT_PB_DIR 00
-hex 'R_PORT_PB_DATA' DEF_R_PORT_PB_DATA ff
+ "Serial-0 CONFIG_ETRAX_DEBUG_PORT0 \
+ Serial-1 CONFIG_ETRAX_DEBUG_PORT1 \
+ Serial-2 CONFIG_ETRAX_DEBUG_PORT2 \
+ Serial-3 CONFIG_ETRAX_DEBUG_PORT3 \
+ disabled CONFIG_ETRAX_DEBUG_PORT_NULL" Serial-0
+
+choice 'Product rescue-port' \
+ "Serial-0 CONFIG_ETRAX_RESCUE_SER0 \
+ Serial-1 CONFIG_ETRAX_RESCUE_SER1 \
+ Serial-2 CONFIG_ETRAX_RESCUE_SER2 \
+ Serial-3 CONFIG_ETRAX_RESCUE_SER3" Serial-0
+
+hex 'R_WAITSTATES' CONFIG_ETRAX_DEF_R_WAITSTATES 95a6
+hex 'R_BUS_CONFIG' CONFIG_ETRAX_DEF_R_BUS_CONFIG 104
+
+bool 'SDRAM support' CONFIG_ETRAX_SDRAM
+if [ "$CONFIG_ETRAX_SDRAM" = "n" ]; then
+ hex 'R_DRAM_CONFIG' CONFIG_ETRAX_DEF_R_DRAM_CONFIG 1a200040
+ hex 'R_DRAM_TIMING' CONFIG_ETRAX_DEF_R_DRAM_TIMING 5611
+fi
+
+if [ "$CONFIG_ETRAX_SDRAM" = "y" ]; then
+ hex 'R_SDRAM_CONFIG' CONFIG_ETRAX_DEF_R_SDRAM_CONFIG d2fa7878
+ hex 'R_SDRAM_TIMING' CONFIG_ETRAX_DEF_R_SDRAM_TIMING 80004801
+fi
+
+hex 'R_PORT_PA_DIR' CONFIG_ETRAX_DEF_R_PORT_PA_DIR 1c
+hex 'R_PORT_PA_DATA' CONFIG_ETRAX_DEF_R_PORT_PA_DATA 00
+hex 'R_PORT_PB_CONFIG' CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG 00
+hex 'R_PORT_PB_DIR' CONFIG_ETRAX_DEF_R_PORT_PB_DIR 00
+hex 'R_PORT_PB_DATA' CONFIG_ETRAX_DEF_R_PORT_PB_DATA ff
+
+bool 'Software Shutdown Support' CONFIG_ETRAX_SOFT_SHUTDOWN
+if [ "$CONFIG_ETRAX_SOFT_SHUTDOWN" = "y" ]; then
+ int 'Shutdown bit on port CSP0' CONFIG_ETRAX_SHUTDOWN_BIT 12
+ int 'Power button bit on port G' CONFIG_ETRAX_POWERBUTTON_BIT 25
+fi
endmenu
-# only configure IP numbers if the kernel ifconfig/route setup is enabled
-
-if [ "$CONFIG_KERNEL_IFCONFIG" = "y" ]; then
- mainmenu_option next_comment
- comment 'IP address selection'
-
- comment 'All addresses are in hexadecimal form without 0x prefix'
-
- hex 'IP address' ELTEST_IPADR ab1005af
- hex 'Network' ELTEST_NETWORK ab100000
- hex 'Netmask' ELTEST_NETMASK ffff0000
- hex 'Broadcast' ELTEST_BROADCAST ab10ffff
- hex 'Gateway' ELTEST_GATEWAY ab100101
- hwaddr 'Ethernet address' ELTEST_ETHADR 00408ccd0000
-
- endmenu
-fi
-
# bring in Etrax built-in drivers
source arch/cris/drivers/Config.in
@@ -148,7 +180,7 @@
source drivers/ieee1394/Config.in
-source drivers/i2o/Config.in
+source drivers/message/i2o/Config.in
if [ "$CONFIG_NET" = "y" ]; then
mainmenu_option next_comment
@@ -198,8 +230,6 @@
source drivers/media/Config.in
source fs/Config.in
-
-source drivers/char/Config.in
mainmenu_option next_comment
comment 'Sound'
Index: cris.ld
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/cris/cris.ld,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- cris.ld 25 Feb 2001 23:15:23 -0000 1.1.1.1
+++ cris.ld 9 Apr 2002 17:03:15 -0000 1.2
@@ -1,38 +1,47 @@
/* ld script to make the Linux/CRIS kernel
* Authors: Bjorn Wesen (bj...@ax...)
*
- * For now, on Etrax-100 LX, the DRAM starts virtually at 0x6. Normally
- * it should be at 0xc.
+ * It is VERY DANGEROUS to fiddle around with the symbols in this
+ * script. It is for example quite vital that all generated sections
+ * that are used are actually named here, otherwise the linker will
+ * put them at the end, where the init stuff is which is FREED after
+ * the kernel has booted.
*/
SECTIONS
{
- . = 0x60000000; /* DRAM starts virtually at 0x60000000 */
- _dram_start = .;
- _ibr_start = .;
+ . = @CONFIG_ETRAX_DRAM_VIRTUAL_BASE@;
+ dram_start = .;
+ ibr_start = .;
. = . + 0x4000; /* see head.S and pages reserved at the start */
_text = .; /* Text and read-only data */
- _text_start = .; /* lots of aliases */
+ text_start = .; /* lots of aliases */
_stext = .;
__stext = .;
.text : {
*(.text)
*(.fixup)
*(.text.__*)
- *(.rodata)
}
+ .text.lock : { *(.text.lock) } /* out-of-line lock text */
+
+ _etext = . ; /* End of text section */
+ __etext = .;
+
+ .rodata : { *(.rodata) *(.rodata.__*) }
+ .kstrtab : { *(.kstrtab) }
. = ALIGN(4); /* Exception table */
__start___ex_table = .;
__ex_table : { *(__ex_table) }
__stop___ex_table = .;
- _etext = . ; /* End of text section */
- __etext = .;
+ __start___ksymtab = .; /* Kernel symbol table */
+ __ksymtab : { *(__ksymtab) }
+ __stop___ksymtab = .;
. = ALIGN (4);
- ___data_rom_start = . ;
___data_start = . ;
__Sdata = . ;
.data : { /* Data */
@@ -45,19 +54,26 @@
.data.init_task : { *(.data.init_task) }
. = ALIGN(8192); /* Init code and data */
- ___init_begin = .;
+ __init_begin = .;
.text.init : { *(.text.init) }
.data.init : { *(.data.init) }
. = ALIGN(16);
- ___setup_start = .;
+ __setup_start = .;
.setup.init : { *(.setup.init) }
- ___setup_end = .;
- ___initcall_start = .;
- .initcall.init : { *(.initcall.init) }
- ___initcall_end = .;
+ __setup_end = .;
+ .initcall.init : {
+ __initcall_start = .;
+ *(.initcall.init);
+ __initcall_end = .;
+
+ /* We fill to the next page, so we can discard all init
+ pages without needing to consider what payload might be
+ appended to the kernel image. */
+ FILL (0);
+ . = ALIGN (8192);
+ }
__vmlinux_end = .; /* last address of the physical file */
- . = ALIGN(8192);
- ___init_end = .;
+ __init_end = .;
__data_end = . ; /* Move to _edata ? */
__bss_start = .; /* BSS */
@@ -77,5 +93,5 @@
*(.exitcall.exit)
}
- _dram_end = 0x60000000 + @ETRAX_DRAM_SIZE_M@*1024*1024;
+ dram_end = dram_start + @CONFIG_ETRAX_DRAM_SIZE_M@*1024*1024;
}
Index: defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/cris/defconfig,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- defconfig 25 Feb 2001 23:15:23 -0000 1.1.1.1
+++ defconfig 9 Apr 2002 17:03:15 -0000 1.2
@@ -2,6 +2,8 @@
# Automatically generated make config: don't edit
#
CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
#
# Code maturity level options
@@ -13,49 +15,177 @@
#
CONFIG_NET=y
CONFIG_SYSVIPC=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_SYSCTL is not set
CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_JAVA is not set
-# CONFIG_KGDB is not set
+# CONFIG_ETRAX_KGDB is not set
# CONFIG_ETRAX_WATCHDOG is not set
-CONFIG_USE_SERIAL_CONSOLE=y
-# CONFIG_KERNEL_IFCONFIG is not set
#
# Hardware setup
#
CONFIG_ETRAX100LX=y
+# CONFIG_ETRAX100LX_V2 is not set
# CONFIG_SVINTO_SIM is not set
CONFIG_CRIS_LOW_MAP=y
-ETRAX_DRAM_BASE=40000000
-ETRAX_DRAM_SIZE=8
+CONFIG_ETRAX_DRAM_VIRTUAL_BASE=60000000
+CONFIG_ETRAX_DRAM_SIZE=8
+CONFIG_ETRAX_FLASH_BUSWIDTH=2
+CONFIG_ETRAX_ROOT_DEVICE="/dev/mtdblock3"
CONFIG_ETRAX_PA_LEDS=y
# CONFIG_ETRAX_PB_LEDS is not set
-# CONFIG_ETRAX_90000000_LEDS is not set
+# CONFIG_ETRAX_CSP0_LEDS is not set
# CONFIG_ETRAX_NO_LEDS is not set
CONFIG_ETRAX_LED1G=2
CONFIG_ETRAX_LED1R=2
CONFIG_ETRAX_LED2G=2
CONFIG_ETRAX_LED2R=2
-CONFIG_DEBUG_PORT0=y
-# CONFIG_DEBUG_PORT1 is not set
-# CONFIG_DEBUG_PORT2 is not set
-# CONFIG_DEBUG_PORT3 is not set
-DEF_R_WAITSTATES=95a6
-DEF_R_BUS_CONFIG=104
-DEF_R_DRAM_CONFIG=1a200040
-DEF_R_DRAM_TIMING=5611
-DEF_R_PORT_PA_DIR=1d
-DEF_R_PORT_PA_DATA=f0
-DEF_R_PORT_PB_CONFIG=00
-DEF_R_PORT_PB_DIR=1e
-DEF_R_PORT_PB_DATA=f3
+CONFIG_ETRAX_LED3R=2
+CONFIG_ETRAX_LED3G=2
+CONFIG_ETRAX_LED4R=2
+CONFIG_ETRAX_LED4G=2
+CONFIG_ETRAX_LED5R=2
+CONFIG_ETRAX_LED5G=2
+CONFIG_ETRAX_LED6R=2
+CONFIG_ETRAX_LED6G=2
+CONFIG_ETRAX_LED7R=2
+CONFIG_ETRAX_LED7G=2
+CONFIG_ETRAX_LED8Y=2
+CONFIG_ETRAX_LED9Y=2
+CONFIG_ETRAX_LED10Y=2
+CONFIG_ETRAX_LED11Y=2
+CONFIG_ETRAX_LED12R=2
+CONFIG_ETRAX_DEBUG_PORT0=y
+# CONFIG_ETRAX_DEBUG_PORT1 is not set
+# CONFIG_ETRAX_DEBUG_PORT2 is not set
+# CONFIG_ETRAX_DEBUG_PORT3 is not set
+CONFIG_ETRAX_RESCUE_SER0=y
+# CONFIG_ETRAX_RESCUE_SER1 is not set
+# CONFIG_ETRAX_RESCUE_SER2 is not set
+# CONFIG_ETRAX_RESCUE_SER3 is not set
+CONFIG_ETRAX_DEF_R_WAITSTATES=95a6
+CONFIG_ETRAX_DEF_R_BUS_CONFIG=104
+# CONFIG_ETRAX_SDRAM is not set
+CONFIG_ETRAX_DEF_R_DRAM_CONFIG=1a200040
+CONFIG_ETRAX_DEF_R_DRAM_TIMING=5611
+CONFIG_ETRAX_DEF_R_PORT_PA_DIR=1d
+CONFIG_ETRAX_DEF_R_PORT_PA_DATA=f0
+CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG=00
+CONFIG_ETRAX_DEF_R_PORT_PB_DIR=1e
+CONFIG_ETRAX_DEF_R_PORT_PB_DATA=f3
+# CONFIG_ETRAX_SOFT_SHUTDOWN is not set
#
-# Drivers for Etrax built-in interfaces
+# Drivers for ETRAX 100LX built-in interfaces
#
CONFIG_ETRAX_ETHERNET=y
CONFIG_NET_ETHERNET=y
+# CONFIG_ETRAX_NETWORK_LED_ON_WHEN_LINK is not set
+CONFIG_ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY=y
+# CONFIG_ETRAX_ETHERNET_LPSLAVE is not set
CONFIG_ETRAX_SERIAL=y
+CONFIG_ETRAX_SERIAL_PORT0=y
+# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB is not set
+CONFIG_ETRAX_SERIAL_PORT1=y
+# CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_ON_PB is not set
+# CONFIG_ETRAX_SERIAL_PORT2 is not set
+# CONFIG_ETRAX_SERIAL_PORT3 is not set
+# CONFIG_ETRAX_RS485 is not set
+# CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set
+# CONFIG_ETRAX_IDE is not set
+CONFIG_ETRAX_AXISFLASHMAP=y
+CONFIG_ETRAX_PTABLE_SECTOR=65536
+CONFIG_MTD=y
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_AMDSTD=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_ETRAX_I2C=y
+CONFIG_ETRAX_I2C_USES_PB_NOT_PB_I2C=y
+# CONFIG_ETRAX_I2C_EEPROM is not set
+CONFIG_ETRAX_GPIO=y
+CONFIG_ETRAX_PA_BUTTON_BITMASK=02
+CONFIG_ETRAX_PA_CHANGEABLE_DIR=00
+CONFIG_ETRAX_PA_CHANGEABLE_BITS=FF
+CONFIG_ETRAX_PB_CHANGEABLE_DIR=00
+CONFIG_ETRAX_PB_CHANGEABLE_BITS=FF
+# CONFIG_ETRAX_USB_HOST is not set
+# CONFIG_USB is not set
+# CONFIG_ETRAX_DS1302 is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC1000 is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOCPROBE is not set
+
+#
+# RAM/ROM Device Drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_MTDRAM is not set
+
+#
+# Linearly Mapped Flash Device Drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_GEOMETRY is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_AMDSTD=y
+# CONFIG_MTD_SHARP is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_NORA is not set
+# CONFIG_MTD_PNC2000 is not set
+# CONFIG_MTD_RPXLITE is not set
+# CONFIG_MTD_SC520CDP is not set
+# CONFIG_MTD_SBC_MEDIAGX is not set
+# CONFIG_MTD_ELAN_104NC is not set
+# CONFIG_MTD_SA1100 is not set
+# CONFIG_MTD_DC21285 is not set
+# CONFIG_MTD_CSTM_CFI_JEDEC is not set
+# CONFIG_MTD_JEDEC is not set
+# CONFIG_MTD_MIXMEM is not set
+# CONFIG_MTD_OCTAGON is not set
+# CONFIG_MTD_VMAX is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_SPIA is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
#
# Block devices
@@ -90,10 +220,6 @@
# CONFIG_IPV6 is not set
# CONFIG_KHTTPD is not set
# CONFIG_ATM is not set
-
-#
-#
-#
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_DECNET is not set
@@ -101,6 +227,7 @@
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_FASTROUTE is not set
@@ -112,11 +239,61 @@
# CONFIG_NET_SCHED is not set
#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+# CONFIG_PHONE_IXJ is not set
+
+#
+# ATA/IDE/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# IDE, ATA and ATAPI Block devices
+#
+# CONFIG_BLK_DEV_IDE is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_IDEDISK is not set
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
+# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
+# CONFIG_BLK_DEV_IDEDISK_IBM is not set
+# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set
+# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set
+# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set
+# CONFIG_BLK_DEV_IDEDISK_WD is not set
+# CONFIG_BLK_DEV_COMMERIAL is not set
+# CONFIG_BLK_DEV_TIVO is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+# CONFIG_BLK_DEV_ISAPNP is not set
+# CONFIG_IDE_CHIPSETS is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_DMA_NONPCI is not set
+# CONFIG_BLK_DEV_IDE_MODES is not set
+
+#
# SCSI support
#
# CONFIG_SCSI is not set
#
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_LAN is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
+#
# Network device support
#
CONFIG_NETDEVICES=y
@@ -177,6 +354,16 @@
# CONFIG_WAN is not set
#
+# Amateur Radio support
+#
+# CONFIG_HAMRADIO is not set
+
+#
+# IrDA (infrared) support
+#
+# CONFIG_IRDA is not set
+
+#
# ISDN subsystem
#
# CONFIG_ISDN is not set
@@ -187,6 +374,60 @@
# CONFIG_CD_NO_IDESCSI is not set
#
+# Input core support
+#
+# CONFIG_INPUT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL is not set
+# CONFIG_SERIAL_EXTENDED is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_UNIX98_PTYS is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Mice
+#
+# CONFIG_BUSMOUSE is not set
+# CONFIG_MOUSE is not set
+
+#
+# Joysticks
+#
+# CONFIG_JOYSTICK is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_INTEL_RNG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
# File systems
#
# CONFIG_QUOTA is not set
@@ -259,59 +500,14 @@
# CONFIG_NLS is not set
#
-# Character devices
-#
-# CONFIG_VT is not set
-# CONFIG_SERIAL is not set
-# CONFIG_SERIAL_EXTENDED is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_UNIX98_PTYS is not set
-# CONFIG_PRINTER is not set
-# CONFIG_PPDEV is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-# CONFIG_MOUSE is not set
-
-#
-# Joysticks
-#
-# CONFIG_JOYSTICK is not set
-
-#
-# Input core support is needed for joysticks
-#
-# CONFIG_QIC02_TAPE is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_INTEL_RNG is not set
-# CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
+# Sound
#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
+# CONFIG_SOUND is not set
#
-# Sound
+# USB support
#
-# CONFIG_SOUND is not set
+# CONFIG_USB is not set
#
# Kernel hacking
|
