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

Commit e910b63d authored by Russell King's avatar Russell King
Browse files

Merge branch 'l7200' into devel 

Conflicts:
	arch/arm/configs/lusl7200_defconfig
parents 2f7989ef c9c6fe50

arch/arm/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -439,21 +439,6 @@ config ARCH_IXP4XX 
	help

	  Support for Intel's IXP4XX (XScale) family of processors.



config ARCH_L7200

	bool "LinkUp-L7200"

	select CPU_ARM720T

	select FIQ

	select ARCH_USES_GETTIMEOFFSET

	help

	  Say Y here if you intend to run this kernel on a LinkUp Systems

	  L7200 Software Development Board which uses an ARM720T processor.

	  Information on this board can be obtained at:



	  <http://www.linkupsys.com/>



	  If you have any questions or comments about the Linux kernel port

	  to this board, send e-mail to <sjhill@cotw.com>.



config ARCH_DOVE

	bool "Marvell Dove"

	select PCI
@@ -1185,7 +1170,6 @@ source kernel/Kconfig.preempt 


config HZ

	int

	default 128 if ARCH_L7200

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx 
machine-$(CONFIG_ARCH_IXP4XX)		:= ixp4xx

machine-$(CONFIG_ARCH_KIRKWOOD)		:= kirkwood

machine-$(CONFIG_ARCH_KS8695)		:= ks8695

machine-$(CONFIG_ARCH_L7200)		:= l7200

machine-$(CONFIG_ARCH_LH7A40X)		:= lh7a40x

machine-$(CONFIG_ARCH_LOKI) 		:= loki

machine-$(CONFIG_ARCH_MMP)		:= mmp

arch/arm/boot/compressed/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ ifeq ($(CONFIG_ARCH_SHARK),y) 
OBJS		+= head-shark.o ofw-shark.o

endif



ifeq ($(CONFIG_ARCH_L7200),y)

OBJS		+= head-l7200.o

endif



ifeq ($(CONFIG_ARCH_P720T),y)

# Borrow this code from SA1100

OBJS		+= head-sa1100.o

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

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/* 

 * linux/arch/arm/boot/compressed/head-l7200.S

 * 

 * Copyright (C) 2000 Steve Hill <sjhill@cotw.com>

 * 

 * Some code borrowed from Nicolas Pitre's 'head-sa1100.S' file. This

 * is merged with head.S by the linker.

 */



#include <asm/mach-types.h>



#ifndef CONFIG_ARCH_L7200

#error What am I doing here...

#endif



		.section        ".start", "ax"



__L7200_start:

		mov	r0, #0x00100000		@ FLASH address of initrd

		mov	r2, #0xf1000000		@ RAM address of initrd

		add	r3, r2, #0x00700000	@ Size of initrd 

1:

		ldmia   r0!, {r4, r5, r6, r7}

		stmia   r2!, {r4, r5, r6, r7}

		cmp	r2, r3

		ble	1b



		mov	r8, #0			@ Zero it out

		mov	r7, #MACH_TYPE_L7200	@ Set architecture ID

arch/arm/configs/lusl7200_defconfig

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

# CONFIG_HOTPLUG is not set

CONFIG_MODULES=y

CONFIG_ARCH_L7200=y

# CONFIG_ARM_THUMB is not set

CONFIG_ZBOOT_ROM_TEXT=0x00010000

CONFIG_ZBOOT_ROM_BSS=0xf03e0000

CONFIG_ZBOOT_ROM=y

CONFIG_CMDLINE="console=tty0 console=ttyLU1,115200 root=/dev/ram initrd=0xf1000000,0x005dac7b mem=32M"

CONFIG_BINFMT_AOUT=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_INPUT is not set

# CONFIG_SERIO_SERPORT is not set

# CONFIG_VT is not set

CONFIG_SERIAL_NONSTANDARD=y

CONFIG_EXT2_FS=y

CONFIG_DEBUG_USER=y

# CONFIG_CRC32 is not set