Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1077682b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents dc9ca2af bafa49cc

arch/arm/boot/compressed/head-sharpsl.S

+85 −26
Original line number Original line Diff line number Diff line
@@ -7,7 +7,8 @@ 
 * so we have to figure out the machine for ourselves...

 * so we have to figure out the machine for ourselves...

 *

 *

 * Support for Poodle, Corgi (SL-C700), Shepherd (SL-C750)

 * Support for Poodle, Corgi (SL-C700), Shepherd (SL-C750)

 * and Husky (SL-C760).

 * Husky (SL-C760), Tosa (SL-C6000), Spitz (SL-C3000),

 * Akita (SL-C1000) and Borzoi (SL-C3100).

 *

 *

 */

 */
@@ -23,6 +24,22 @@ 




__SharpSL_start:

__SharpSL_start:





/* Check for TC6393 - if found we have a Tosa */

	ldr	r7, .TOSAID

	mov	r1, #0x10000000		@ Base address of TC6393 chip

	mov 	r6, #0x03

	ldrh	r3, [r1, #8]		@ Load TC6393XB Revison: This is 0x0003

	cmp	r6, r3

	beq	.SHARPEND		@ Success -> tosa



/* Check for pxa270 - if found, branch */

	mrc p15, 0, r4, c0, c0		@ Get Processor ID

	and	r4, r4, #0xffffff00

	ldr	r3, .PXA270ID

	cmp	r4, r3

	beq	.PXA270



/* Check for w100 - if not found we have a Poodle */

	ldr	r1, .W100ADDR		@ Base address of w100 chip + regs offset

	ldr	r1, .W100ADDR		@ Base address of w100 chip + regs offset





	mov r6, #0x31			@ Load Magic Init value

	mov r6, #0x31			@ Load Magic Init value
@@ -40,45 +57,52 @@ __SharpSL_start: 
	cmp	r6, r3

	cmp	r6, r3

	bne	.SHARPEND			@ We have no w100 - Poodle

	bne	.SHARPEND			@ We have no w100 - Poodle





	mrc p15, 0, r6, c0, c0	@ Get Processor ID

/* Check for pxa250 - if found we have a Corgi */

	and	r6, r6, #0xffffff00

	ldr	r7, .CORGIID

	ldr	r7, .CORGIID

	ldr	r3, .PXA255ID

	ldr	r3, .PXA255ID

	cmp	r6, r3

	cmp	r4, r3

	blo	.SHARPEND			@ We have a PXA250 - Corgi

	blo	.SHARPEND			@ We have a PXA250 - Corgi





	mov	r1, #0x0c000000		@ Base address of NAND chip

/* Check for 64MiB flash - if found we have a Shepherd */

	ldrb	r3, [r1, #24]	@ Load FLASHCTL

	bl	get_flash_ids

	bic	r3, r3, #0x11		@ SET NCE

	orr	r3, r3, #0x0a		@ SET CLR + FLWP

	strb	r3, [r1, #24]	@ Save to FLASHCTL

	mov 	r2, #0x90		@ Command "readid"

	strb	r2, [r1, #20]	@ Save to FLASHIO

	bic	r3, r3, #2			@ CLR CLE

	orr	r3, r3, #4			@ SET ALE

	strb	r3, [r1, #24]	@ Save to FLASHCTL

	mov		r2, #0			@ Address 0x00

	strb	r2, [r1, #20]	@ Save to FLASHIO

	bic	r3, r3, #4			@ CLR ALE

	strb	r3, [r1, #24]	@ Save to FLASHCTL

.SHARP1:

	ldrb	r3, [r1, #24]	@ Load FLASHCTL

	tst	r3, #32				@ Is chip ready?

	beq	.SHARP1

	ldrb	r2, [r1, #20]	@ NAND Manufacturer ID

	ldrb	r3, [r1, #20]	@ NAND Chip ID

	ldr	r7, .SHEPHERDID

	ldr	r7, .SHEPHERDID

	cmp	r3, #0x76			@ 64MiB flash

	cmp	r3, #0x76			@ 64MiB flash

	beq	.SHARPEND			@ We have Shepherd

	beq	.SHARPEND			@ We have Shepherd



/* Must be a Husky */

	ldr	r7, .HUSKYID		@ Must be Husky

	ldr	r7, .HUSKYID		@ Must be Husky

	b .SHARPEND

	b .SHARPEND





.PXA270:

/* Check for 16MiB flash - if found we have Spitz */

	bl	get_flash_ids

	ldr	r7, .SPITZID

	cmp	r3, #0x73			@ 16MiB flash

	beq	.SHARPEND			@ We have Spitz



/* Check for a second SCOOP chip - if found we have Borzoi */

	ldr	r1, .SCOOP2ADDR

	ldr	r7, .BORZOIID

	mov 	r6, #0x0140

	strh	r6, [r1]

	ldrh	r6, [r1]

	cmp	r6, #0x0140

	beq	.SHARPEND			@ We have Borzoi



/* Must be Akita */

	ldr	r7, .AKITAID

	b	.SHARPEND			@ We have Borzoi



.PXA255ID:

.PXA255ID:

	.word	0x69052d00		@ PXA255 Processor ID

	.word	0x69052d00		@ PXA255 Processor ID

.PXA270ID:

	.word	0x69054100		@ PXA270 Processor ID

.W100ID:

.W100ID:

	.word	0x57411002		@ w100 Chip ID

	.word	0x57411002		@ w100 Chip ID

.W100ADDR:

.W100ADDR:

	.word 	0x08010000		@ w100 Chip ID Reg Address

	.word 	0x08010000		@ w100 Chip ID Reg Address

.SCOOP2ADDR:

	.word	0x08800040

.POODLEID:

.POODLEID:

	.word	MACH_TYPE_POODLE

	.word	MACH_TYPE_POODLE

.CORGIID:

.CORGIID:
@@ -87,6 +111,41 @@ __SharpSL_start: 
	.word	MACH_TYPE_SHEPHERD

	.word	MACH_TYPE_SHEPHERD

.HUSKYID:

.HUSKYID:

	.word	MACH_TYPE_HUSKY

	.word	MACH_TYPE_HUSKY

.SHARPEND:

.TOSAID:

	.word	MACH_TYPE_TOSA

.SPITZID:

	.word	MACH_TYPE_SPITZ

.AKITAID:

	.word	MACH_TYPE_AKITA

.BORZOIID:

	.word	MACH_TYPE_BORZOI





/*

 * Return: r2 - NAND Manufacturer ID

 *         r3 - NAND Chip ID

 * Corrupts: r1

 */

get_flash_ids:

	mov	r1, #0x0c000000		@ Base address of NAND chip

	ldrb	r3, [r1, #24]		@ Load FLASHCTL

	bic	r3, r3, #0x11		@ SET NCE

	orr	r3, r3, #0x0a		@ SET CLR + FLWP

	strb	r3, [r1, #24]		@ Save to FLASHCTL

	mov 	r2, #0x90		@ Command "readid"

	strb	r2, [r1, #20]		@ Save to FLASHIO

	bic	r3, r3, #2		@ CLR CLE

	orr	r3, r3, #4		@ SET ALE

	strb	r3, [r1, #24]		@ Save to FLASHCTL

	mov	r2, #0			@ Address 0x00

	strb	r2, [r1, #20]		@ Save to FLASHIO

	bic	r3, r3, #4		@ CLR ALE

	strb	r3, [r1, #24]		@ Save to FLASHCTL

.fids1:

	ldrb	r3, [r1, #24]		@ Load FLASHCTL

	tst	r3, #32			@ Is chip ready?

	beq	.fids1

	ldrb	r2, [r1, #20]		@ NAND Manufacturer ID

	ldrb	r3, [r1, #20]		@ NAND Chip ID

	mov	pc, lr





.SHARPEND:

arch/arm/configs/omap_h2_1610_defconfig

+72 −218
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.13-rc2

# Linux kernel version: 2.6.13

# Fri Jul  8 04:49:34 2005

# Mon Sep  5 18:07:12 2005

#

#

CONFIG_ARM=y

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_MMU=y
@@ -102,9 +102,11 @@ CONFIG_OMAP_MUX_WARNINGS=y 
# CONFIG_OMAP_MPU_TIMER is not set

# CONFIG_OMAP_MPU_TIMER is not set

CONFIG_OMAP_32K_TIMER=y

CONFIG_OMAP_32K_TIMER=y

CONFIG_OMAP_32K_TIMER_HZ=128

CONFIG_OMAP_32K_TIMER_HZ=128

# CONFIG_OMAP_DM_TIMER is not set

CONFIG_OMAP_LL_DEBUG_UART1=y

CONFIG_OMAP_LL_DEBUG_UART1=y

# CONFIG_OMAP_LL_DEBUG_UART2 is not set

# CONFIG_OMAP_LL_DEBUG_UART2 is not set

# CONFIG_OMAP_LL_DEBUG_UART3 is not set

# CONFIG_OMAP_LL_DEBUG_UART3 is not set

CONFIG_OMAP_SERIAL_WAKE=y





#

#

# OMAP Core Type

# OMAP Core Type
@@ -166,7 +168,6 @@ CONFIG_ISA_DMA_API=y 
#

#

# Kernel Features

# Kernel Features

#

#

# CONFIG_SMP is not set

CONFIG_PREEMPT=y

CONFIG_PREEMPT=y

CONFIG_NO_IDLE_HZ=y

CONFIG_NO_IDLE_HZ=y

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -230,91 +231,82 @@ CONFIG_PM=y 
# CONFIG_APM is not set

# CONFIG_APM is not set





#

#

# Device Drivers

# Networking

#



#

# Generic Driver Options

#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set



#

# Memory Technology Devices (MTD)

#

#

CONFIG_MTD=y

CONFIG_NET=y

CONFIG_MTD_DEBUG=y

CONFIG_MTD_DEBUG_VERBOSE=3

# CONFIG_MTD_CONCAT is not set

CONFIG_MTD_PARTITIONS=y

# CONFIG_MTD_REDBOOT_PARTS is not set

CONFIG_MTD_CMDLINE_PARTS=y

# CONFIG_MTD_AFS_PARTS is not set





#

#

# User Modules And Translation Layers

# Networking options

#

#

CONFIG_MTD_CHAR=y

CONFIG_PACKET=y

CONFIG_MTD_BLOCK=y

# CONFIG_PACKET_MMAP is not set

# CONFIG_FTL is not set

CONFIG_UNIX=y

# CONFIG_NFTL is not set

# CONFIG_NET_KEY is not set

# CONFIG_INFTL is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IP_PNP_RARP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_ARPD is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_IP_TCPDIAG=y

# CONFIG_IP_TCPDIAG_IPV6 is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set





#

#

# RAM/ROM/Flash chip drivers

# SCTP Configuration (EXPERIMENTAL)

#

#

CONFIG_MTD_CFI=y

# CONFIG_IP_SCTP is not set

# CONFIG_MTD_JEDECPROBE is not set

# CONFIG_ATM is not set

CONFIG_MTD_GEN_PROBE=y

# CONFIG_BRIDGE is not set

# CONFIG_MTD_CFI_ADV_OPTIONS is not set

# CONFIG_VLAN_8021Q is not set

CONFIG_MTD_MAP_BANK_WIDTH_1=y

# CONFIG_DECNET is not set

CONFIG_MTD_MAP_BANK_WIDTH_2=y

# CONFIG_LLC2 is not set

CONFIG_MTD_MAP_BANK_WIDTH_4=y

# CONFIG_IPX is not set

# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set

# CONFIG_ATALK is not set

# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set

# CONFIG_X25 is not set

# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set

# CONFIG_LAPB is not set

CONFIG_MTD_CFI_I1=y

# CONFIG_NET_DIVERT is not set

CONFIG_MTD_CFI_I2=y

# CONFIG_ECONET is not set

# CONFIG_MTD_CFI_I4 is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_MTD_CFI_I8 is not set

# CONFIG_NET_SCHED is not set

CONFIG_MTD_CFI_INTELEXT=y

# CONFIG_NET_CLS_ROUTE is not set

# CONFIG_MTD_CFI_AMDSTD is not set

# CONFIG_MTD_CFI_STAA is not set

CONFIG_MTD_CFI_UTIL=y

# CONFIG_MTD_RAM is not set

# CONFIG_MTD_ROM is not set

# CONFIG_MTD_ABSENT is not set

# CONFIG_MTD_XIP is not set





#

#

# Mapping drivers for chip access

# Network testing

#

#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

# CONFIG_NET_PKTGEN is not set

# CONFIG_MTD_PHYSMAP is not set

# CONFIG_HAMRADIO is not set

# CONFIG_MTD_ARM_INTEGRATOR is not set

# CONFIG_IRDA is not set

# CONFIG_MTD_EDB7312 is not set

# CONFIG_BT is not set





#

#

# Self-contained MTD device drivers

# Device Drivers

#

#

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLKMTD is not set

# CONFIG_MTD_BLOCK2MTD is not set





#

#

# Disk-On-Chip Device Drivers

# Generic Driver Options

#

#

# CONFIG_MTD_DOC2000 is not set

CONFIG_STANDALONE=y

# CONFIG_MTD_DOC2001 is not set

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_MTD_DOC2001PLUS is not set

# CONFIG_FW_LOADER is not set





#

#

# NAND Flash Device Drivers

# Memory Technology Devices (MTD)

#

#

# CONFIG_MTD_NAND is not set

# CONFIG_MTD is not set





#

#

# Parallel port support

# Parallel port support
@@ -403,72 +395,8 @@ CONFIG_SCSI_PROC_FS=y 
#

#





#

#

# Networking support

# Network device support

#

CONFIG_NET=y



#

# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IP_PNP_RARP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_ARPD is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_IP_TCPDIAG=y

# CONFIG_IP_TCPDIAG_IPV6 is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set



#

# SCTP Configuration (EXPERIMENTAL)

#

#

# CONFIG_IP_SCTP is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

# CONFIG_NET_CLS_ROUTE is not set



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_BONDING is not set
@@ -518,6 +446,8 @@ CONFIG_SLIP_COMPRESSED=y 
# CONFIG_SLIP_MODE_SLIP6 is not set

# CONFIG_SLIP_MODE_SLIP6 is not set

# CONFIG_SHAPER is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set





#

#

# ISDN subsystem

# ISDN subsystem
@@ -615,77 +545,15 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
#

#

# I2C support

# I2C support

#

#

CONFIG_I2C=y

# CONFIG_I2C is not set

CONFIG_I2C_CHARDEV=y

# CONFIG_I2C_SENSOR is not set



CONFIG_ISP1301_OMAP=y

#

# I2C Algorithms

#

# CONFIG_I2C_ALGOBIT is not set

# CONFIG_I2C_ALGOPCF is not set

# CONFIG_I2C_ALGOPCA is not set



#

# I2C Hardware Bus support

#

# CONFIG_I2C_ISA is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_STUB is not set

# CONFIG_I2C_PCA_ISA is not set





#

#

# Hardware Sensors Chip support

# Hardware Monitoring support

#

#

# CONFIG_I2C_SENSOR is not set

CONFIG_HWMON=y

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_LM63 is not set

# CONFIG_SENSORS_LM75 is not set

# CONFIG_SENSORS_LM77 is not set

# CONFIG_SENSORS_LM78 is not set

# CONFIG_SENSORS_LM80 is not set

# CONFIG_SENSORS_LM83 is not set

# CONFIG_SENSORS_LM85 is not set

# CONFIG_SENSORS_LM87 is not set

# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set



#

# Other I2C Chip support

#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

CONFIG_ISP1301_OMAP=y

CONFIG_TPS65010=y

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set





#

#

# Misc devices

# Misc devices
@@ -756,15 +624,9 @@ CONFIG_SOUND=y 
# Open Sound System

# Open Sound System

#

#

CONFIG_SOUND_PRIME=y

CONFIG_SOUND_PRIME=y

# CONFIG_SOUND_BT878 is not set

# CONFIG_SOUND_FUSION is not set

# CONFIG_SOUND_CS4281 is not set

# CONFIG_SOUND_SONICVIBES is not set

# CONFIG_SOUND_TRIDENT is not set

# CONFIG_SOUND_MSNDCLAS is not set

# CONFIG_SOUND_MSNDCLAS is not set

# CONFIG_SOUND_MSNDPIN is not set

# CONFIG_SOUND_MSNDPIN is not set

# CONFIG_SOUND_OSS is not set

# CONFIG_SOUND_OSS is not set

# CONFIG_SOUND_TVMIXER is not set

# CONFIG_SOUND_AD1980 is not set

# CONFIG_SOUND_AD1980 is not set





#

#
@@ -810,6 +672,7 @@ CONFIG_EXT2_FS=y 
# CONFIG_JBD is not set

# CONFIG_JBD is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set





#

#

# XFS support

# XFS support
@@ -817,6 +680,7 @@ CONFIG_EXT2_FS=y 
# CONFIG_XFS_FS is not set

# CONFIG_XFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_MINIX_FS is not set

CONFIG_ROMFS_FS=y

CONFIG_ROMFS_FS=y

CONFIG_INOTIFY=y

# CONFIG_QUOTA is not set

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS_FS is not set
@@ -857,15 +721,6 @@ CONFIG_RAMFS=y 
# CONFIG_BEFS_FS is not set

# CONFIG_BEFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

# CONFIG_EFS_FS is not set

# CONFIG_JFFS_FS is not set

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS_DEBUG=2

# CONFIG_JFFS2_FS_NAND is not set

# CONFIG_JFFS2_FS_NOR_ECC is not set

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

CONFIG_CRAMFS=y

CONFIG_CRAMFS=y

# CONFIG_VXFS_FS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_HPFS_FS is not set
@@ -1007,4 +862,3 @@ CONFIG_CRYPTO_DES=y 
CONFIG_CRC32=y

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set

# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y
 
CONFIG_ZLIB_INFLATE=y
 
CONFIG_ZLIB_DEFLATE=y

arch/arm/mach-iop3xx/iop321-time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ static unsigned long iop321_gettimeoffset(void) 
	/*

	/*

	 * Now convert them to usec.

	 * Now convert them to usec.

	 */

	 */

	usec = (unsigned long)(elapsed * (tick_nsec / 1000)) / LATCH;

	usec = (unsigned long)(elapsed / (CLOCK_TICK_RATE/1000000));





	return usec;

	return usec;

}

}

arch/arm/mach-iop3xx/iop331-time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ static unsigned long iop331_gettimeoffset(void) 
	/*

	/*

	 * Now convert them to usec.

	 * Now convert them to usec.

	 */

	 */

	usec = (unsigned long)(elapsed * (tick_nsec / 1000)) / LATCH;

	usec = (unsigned long)(elapsed / (CLOCK_TICK_RATE/1000000));





	return usec;

	return usec;

}

}

arch/arm/mach-ixp2000/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -382,7 +382,7 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq) 
static struct irqchip ixp2000_GPIO_irq_chip = {

static struct irqchip ixp2000_GPIO_irq_chip = {

	.ack		= ixp2000_GPIO_irq_mask_ack,

	.ack		= ixp2000_GPIO_irq_mask_ack,

	.mask		= ixp2000_GPIO_irq_mask,

	.mask		= ixp2000_GPIO_irq_mask,

	.unmask		= ixp2000_GPIO_irq_unmask

	.unmask		= ixp2000_GPIO_irq_unmask,

	.set_type	= ixp2000_GPIO_irq_type,

	.set_type	= ixp2000_GPIO_irq_type,

};

};