diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-09-11 23:20:47 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-09-11 23:20:47 +0400 |
commit | 548cb231f01a6b896bf19424e365f2c0ff13e541 (patch) | |
tree | 52e411c5e26f38e7200ebbfcd332757f5c266564 | |
parent | 2368c09f6195ed7fa282f4ec1bed52c7211bd95f (diff) | |
parent | e77374c936044b99dcf5648e5a5332b59853e465 (diff) |
Merge branch 'tracking-ll-last-minute-fixes' into merge-linux-linaroll-20120911.0
-rw-r--r-- | arch/arm/configs/ubuntu_vexpress_defconfig | 149 | ||||
-rw-r--r-- | arch/arm/mach-exynos/include/mach-exynos/asv.h (renamed from arch/arm/mach-exynos/include/mach/asv.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-exynos/include/mach-exynos/mali/config.h (renamed from arch/arm/mach-exynos/include/mach/mali/config.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-exynos/include/mach-exynos/regs-iem.h (renamed from arch/arm/mach-exynos/include/mach/regs-iem.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-exynos/include/mach-exynos/ump/config.h (renamed from arch/arm/mach-exynos/include/mach/ump/config.h) | 0 | ||||
-rwxr-xr-x | drivers/gpu/arm/mali/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/arm/mali/linux/mali_osk_mali.c | 4 | ||||
-rw-r--r-- | drivers/gpu/arm/ump/linux/ump_kernel_linux.c | 2 | ||||
-rw-r--r-- | drivers/gpu/arm/ump/linux/ump_memory_backend.c | 2 |
9 files changed, 154 insertions, 5 deletions
diff --git a/arch/arm/configs/ubuntu_vexpress_defconfig b/arch/arm/configs/ubuntu_vexpress_defconfig new file mode 100644 index 000000000000..e6d7e02beba7 --- /dev/null +++ b/arch/arm/configs/ubuntu_vexpress_defconfig @@ -0,0 +1,149 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_CGROUPS=y +CONFIG_CGROUP_SCHED=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_EMBEDDED=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +CONFIG_PROFILING=y +CONFIG_OPROFILE=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_ARCH_VEXPRESS_CHOICE=y +CONFIG_ARCH_VEXPRESS_TC2_PM=y +CONFIG_ARCH_VEXPRESS_CA9X4=y +CONFIG_ARCH_VEXPRESS_DT=y +CONFIG_SMP=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y +CONFIG_DISABLE_CPU_SCHED_DOMAIN_BALANCE=y +CONFIG_SCHED_HMP=y +CONFIG_ARM_ARCH_TIMER=y +CONFIG_NR_CPUS=8 +CONFIG_THUMB2_KERNEL=y +CONFIG_HIGHMEM=y +CONFIG_HIGHPTE=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +CONFIG_CMDLINE="console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait mmci.fmax=4000000" +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_ARM_VEXPRESS_BL_CPUFREQ=y +CONFIG_CPU_IDLE=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_BINFMT_MISC=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM_USER=y +CONFIG_NET_KEY=y +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_SYN_COOKIES=y +# CONFIG_INET_LRO is not set +CONFIG_IPV6=y +CONFIG_NETLABEL=y +CONFIG_NETFILTER=y +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_CONNECTOR=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_OOPS=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_NAND=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y +CONFIG_NETDEVICES=y +CONFIG_SMC91X=y +CONFIG_SMSC911X=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y +CONFIG_SERIO_AMBAKMI=y +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_FB=y +CONFIG_FB_ARMCLCD=y +CONFIG_FB_ARMHDLCD=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_ARMAACI=y +CONFIG_USB=y +CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_MMC=y +CONFIG_MMC_ARMMMCI=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PL031=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +CONFIG_EXT4_FS=y +CONFIG_BTRFS_FS=y +CONFIG_QUOTA=y +CONFIG_QFMT_V2=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_ECRYPT_FS=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_FS_XATTR=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_RUBIN=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_PRINTK_TIME=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_SCHEDSTATS=y +CONFIG_TIMER_STATS=y +CONFIG_PROVE_LOCKING=y +CONFIG_ENABLE_DEFAULT_TRACERS=y +CONFIG_STRICT_DEVMEM=y +CONFIG_SECURITY=y +CONFIG_LSM_MMAP_MIN_ADDR=0 +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SMACK=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_DEFAULT_SECURITY_APPARMOR=y +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRC_CCITT=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=y +CONFIG_CRC7=y diff --git a/arch/arm/mach-exynos/include/mach/asv.h b/arch/arm/mach-exynos/include/mach-exynos/asv.h index 5b48b74811e2..5b48b74811e2 100644 --- a/arch/arm/mach-exynos/include/mach/asv.h +++ b/arch/arm/mach-exynos/include/mach-exynos/asv.h diff --git a/arch/arm/mach-exynos/include/mach/mali/config.h b/arch/arm/mach-exynos/include/mach-exynos/mali/config.h index ccd3cf7d2450..ccd3cf7d2450 100644 --- a/arch/arm/mach-exynos/include/mach/mali/config.h +++ b/arch/arm/mach-exynos/include/mach-exynos/mali/config.h diff --git a/arch/arm/mach-exynos/include/mach/regs-iem.h b/arch/arm/mach-exynos/include/mach-exynos/regs-iem.h index d9bf17778584..d9bf17778584 100644 --- a/arch/arm/mach-exynos/include/mach/regs-iem.h +++ b/arch/arm/mach-exynos/include/mach-exynos/regs-iem.h diff --git a/arch/arm/mach-exynos/include/mach/ump/config.h b/arch/arm/mach-exynos/include/mach-exynos/ump/config.h index a82934f27990..a82934f27990 100644 --- a/arch/arm/mach-exynos/include/mach/ump/config.h +++ b/arch/arm/mach-exynos/include/mach-exynos/ump/config.h diff --git a/drivers/gpu/arm/mali/Makefile b/drivers/gpu/arm/mali/Makefile index 263e076a4a9a..b4a9e259fd62 100755 --- a/drivers/gpu/arm/mali/Makefile +++ b/drivers/gpu/arm/mali/Makefile @@ -18,7 +18,7 @@ KBUILDROOT = # Add platform configuration file for Mali #ifeq ($(CONFIG_ARCH_EXYNOS4),y) MACHDIR := $(srctree)/arch/arm/mach-exynos -MALICONFIGDIR :=$(MACHDIR)/include/mach/mali +MALICONFIGDIR :=$(MACHDIR)/include/mach-exynos/mali #endif USING_DED=0 diff --git a/drivers/gpu/arm/mali/linux/mali_osk_mali.c b/drivers/gpu/arm/mali/linux/mali_osk_mali.c index 06a27bc4f917..591430c123c0 100644 --- a/drivers/gpu/arm/mali/linux/mali_osk_mali.c +++ b/drivers/gpu/arm/mali/linux/mali_osk_mali.c @@ -19,8 +19,8 @@ #include "mali_osk.h" /* kernel side OS functions */ #include "mali_uk_types.h" #include "mali_kernel_linux.h" /* exports initialize/terminate_kernel_device() definition of mali_osk_low_level_mem_init() and term */ -#include <mach/irqs.h> -#include <mach/mali/config.h> /* contains the configuration of the arch we are compiling for */ +#include <mach-exynos/irqs.h> +#include <mach-exynos/mali/config.h> /* contains the configuration of the arch we are compiling for */ /* is called from mali_kernel_constructor in common code */ _mali_osk_errcode_t _mali_osk_init( void ) diff --git a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c index 04a55ab6185c..5bc06513b4b0 100644 --- a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c +++ b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c @@ -18,7 +18,7 @@ #include <linux/device.h> #include <linux/debugfs.h> -#include <mach/ump/config.h> /* Configuration for current platform. The symlinc for arch is set by Makefile */ +#include <mach-exynos/ump/config.h> /* Configuration for current platform. The symlinc for arch is set by Makefile */ #include "ump_ioctl.h" #include "ump_kernel_common.h" #include "ump_kernel_interface.h" diff --git a/drivers/gpu/arm/ump/linux/ump_memory_backend.c b/drivers/gpu/arm/ump/linux/ump_memory_backend.c index d4444cad7e14..1e5e3cc9373d 100644 --- a/drivers/gpu/arm/ump/linux/ump_memory_backend.c +++ b/drivers/gpu/arm/ump/linux/ump_memory_backend.c @@ -11,7 +11,7 @@ #include <linux/module.h> /* kernel module definitions */ #include <linux/ioport.h> /* request_mem_region */ -#include <mach/ump/config.h> /* Configuration for current platform. The symlink for arch is set by Makefile */ +#include <mach-exynos/ump/config.h> /* Configuration for current platform. The symlink for arch is set by Makefile */ #include "ump_osk.h" #include "ump_kernel_common.h" |