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

Commit a93d6201 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'clps711x/soc' into clps711x/soc2 



Conflicts:
	arch/arm/Kconfig

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2cad6a8a 2a552891

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ config ARCH_CLPS711X 
	select CLKDEV_LOOKUP

	select COMMON_CLK

	select CPU_ARM720T

	select GENERIC_CLOCKEVENTS

	select NEED_MACH_MEMORY_H

	help

	  Support for Cirrus Logic 711x/721x/731x based boards.

arch/arm/configs/clps711x_defconfig

0 → 100644
+78 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_MSDOS_PARTITION is not set

CONFIG_ARCH_CLPS711X=y

CONFIG_ARCH_AUTCPU12=y

CONFIG_ARCH_CDB89712=y

CONFIG_ARCH_CLEP7312=y

CONFIG_ARCH_EDB7211=y

CONFIG_ARCH_P720T=y

CONFIG_ARCH_FORTUNET=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_IRDA=y

CONFIG_IRTTY_SIR=y

CONFIG_EP7211_DONGLE=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_CDB89712=y

CONFIG_MTD_AUTCPU12=y

CONFIG_MTD_PLATRAM=y

CONFIG_BLK_DEV_RAM=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_AMD is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

CONFIG_CS89x0=y

# CONFIG_NET_VENDOR_FARADAY is not set

# CONFIG_NET_VENDOR_FUJITSU is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_RACAL is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

CONFIG_SERIAL_CLPS711X_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_CLPS711X=y

# CONFIG_USB_SUPPORT is not set

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_MINIX_FS=y

# CONFIG_NETWORK_FILESYSTEMS is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

# CONFIG_CRC32 is not set

arch/arm/configs/edb7211_defconfig

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

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_HOTPLUG is not set

CONFIG_ARCH_CLPS711X=y

CONFIG_ARCH_EDB7211=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_BLK_DEV_RAM=y

CONFIG_NETDEVICES=y

# CONFIG_INPUT is not set

CONFIG_SERIO_LIBPS2=y

# CONFIG_VT is not set

CONFIG_SERIAL_CLPS711X=y

CONFIG_SERIAL_CLPS711X_CONSOLE=y

CONFIG_EXT2_FS=y

CONFIG_MINIX_FS=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_MSDOS_PARTITION is not set

CONFIG_DEBUG_USER=y

arch/arm/configs/fortunet_defconfig

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

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_HOTPLUG is not set

CONFIG_ARCH_CLPS711X=y

CONFIG_ARCH_FORTUNET=y

# CONFIG_ARM_THUMB is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_FPE_FASTFPE=y

CONFIG_BINFMT_AOUT=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

CONFIG_SERIAL_CLPS711X=y

CONFIG_SERIAL_CLPS711X_CONSOLE=y

CONFIG_EXT2_FS=y

CONFIG_DEBUG_USER=y

arch/arm/mach-clps711x/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ obj- := 
obj-$(CONFIG_ARCH_AUTCPU12) += autcpu12.o

obj-$(CONFIG_ARCH_CDB89712) += cdb89712.o

obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o

obj-$(CONFIG_ARCH_EDB7211)  += edb7211-arch.o edb7211-mm.o

obj-$(CONFIG_ARCH_EDB7211)  += edb7211.o

obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o

obj-$(CONFIG_ARCH_P720T)    += p720t.o