UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/arch/arm/configs
History
Linus Torvalds eaed435a7b Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPFmj/AAoJEIwa5zzehBx3utoP/2JKstlluwVdoIjzLDwJIZWS
 BiFO90iC6knKHb3c4ZXBNtD4yz8ImFGr2v3IY4pR+feECu+zS/AYeynrr4AjlaRj
 2wHI3/Cl2VktlzUR0k1KqfNrt1HLpZ8myxJ/pKchU8+KnxeQwCdV7MzkxocO0Abs
 BQFhXj2WuS6b+H3kObrTy7n3tIyVeGUOW/bPU9TfWeRYEWBpGlqtPOH6A2cGi5e3
 Iu9d9MPAiMt33+e7wZdmVHFky+ueqqeKevev+Vt8/JSJbPO7EseS/sbTOZH7Q1Yc
 BWe5iARFpV9viJJMlwlO+wJ08BrqzCZ6M/mBITMAZ+a/EMYRn0TwibsWDw1GcAsA
 H04Z1TW7pjni7SNFJavW3YWIR3TAKDZqwWbekGl2RzYqKmer1Hk6gwHAhxDQlMGY
 2S7dSnw97zRA0WxW6kMPw5VY9VpDD1qjW+29UpEEePfAVhKkwE+lKYlX4k/l0ElC
 9iYNoMVlhS4d5A7ZvhNU28XyGoxzAPNA4nC5OMUARZN++oSURDJ1kGNc73WQ8IbG
 x+zZ7AFvt7y8OgZqG4bE+SeiHlYVAjtyV08WLxtDx4vTyNYuiWIXguf2hLJWEJPY
 sqPGFHrMeh9YvYOXaa+DFb0fPkBJVJt663FPZ4TG2UBlphi26Ax5FtcnSBBvY4QV
 CCen+xhdxX/dp83A/A0k
 =ZgSs
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.

* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM i.MX: Update defconfig
  ARM i.MX: Merge i.MX5 support into mach-imx
  ARM i.MX5: remove unnecessary includes from board files

Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}

Pull request had been sent to the wrong email address, but happened
before the merge window closed.  I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
 		2012-01-23 14:50:30 -08:00
..
acs5k_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
acs5k_tiny_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
afeb9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
ag5evm_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
am200epdkit_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ap4evb_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
assabet_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
at91cap9_defconfig ARM: at91: refresh soc defconfig files for 3.2 2011-11-24 14:57:54 +00:00
at91rm9200_defconfig ARM: at91: refresh soc defconfig files for 3.2 2011-11-24 14:57:54 +00:00
at91sam9g20_defconfig ARM: at91: enable additional boards in existing soc defconfig files 2011-11-24 14:57:55 +00:00
at91sam9g45_defconfig ARM: at91: enable additional boards in existing soc defconfig files 2011-11-24 14:57:55 +00:00
at91sam9rl_defconfig ARM: at91: refresh soc defconfig files for 3.2 2011-11-24 14:57:54 +00:00
at91sam9260_defconfig ARM: at91: enable additional boards in existing soc defconfig files 2011-11-24 14:57:55 +00:00
at91sam9261_defconfig at91sam9261: rename at91sam9261ek to at91sam9261 defconfig 2011-05-25 23:04:33 +08:00
at91sam9263_defconfig at91sam9263: merge all boards defconfig into only one 2011-05-25 23:04:32 +08:00
at91x40_defconfig arm: at91: minimal defconfig for at91x40 SoC 2011-04-23 11:03:06 +08:00
badge4_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
bcmring_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
bonito_defconfig ARM: mach-shmobile: Unset initramfs source in bonito defconfig. 2011-11-11 16:58:48 +09:00
cam60_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
cerfcube_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
cm_x2xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
cm_x300_defconfig ARM: pxa/cm-x300: update cm_x300_defconfig 2011-07-11 14:43:28 +08:00
cns3420vb_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
colibri_pxa270_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
colibri_pxa300_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
collie_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
corgi_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
cpu9g20_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
cpu9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
da8xx_omapl_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
davinci_all_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
dove_defconfig ARM: Sync Marvell Dove defconfig with latest kernel 2011-05-03 15:38:52 -04:00
ebsa110_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
edb7211_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
em_x270_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ep93xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
eseries_pxa_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
exynos4_defconfig ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
ezx_defconfig ARM: pxa: fix inconsistent CONFIG_USB_PXA27X 2011-11-10 15:32:27 +08:00
footbridge_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
fortunet_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
g3evm_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
g4evm_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
h3600_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
h5000_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
h7201_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
h7202_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
hackkit_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
imote2_defconfig ARM: pxa: fix inconsistent CONFIG_USB_PXA27X 2011-11-10 15:32:27 +08:00
imx_v4_v5_defconfig Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
imx_v6_v7_defconfig ARM i.MX: Update defconfig 2011-11-16 08:37:53 +01:00
integrator_defconfig ARM: 7102/1: mach-integrator: update defconfig 2011-10-17 09:13:40 +01:00
iop13xx_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
iop32x_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
iop33x_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
ixp4xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ixp23xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ixp2000_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
jornada720_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
kirkwood_defconfig [ARM] Kirkwood: add LaCie d2 Network v2 to defconfig 2011-03-03 16:27:01 -05:00
kota2_defconfig ARM: mach-shmobile: Add kota2 defconfig. 2012-01-10 17:09:24 +09:00
ks8695_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
lart_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
lpd270_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
lubbock_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
mackerel_defconfig ARM: mach-shmobile: mackerel: Add mackerel defconfig 2010-11-29 13:25:22 +09:00
magician_defconfig ARM: pxa: fix inconsistent CONFIG_USB_PXA27X 2011-11-10 15:32:27 +08:00
mainstone_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
marzen_defconfig ARM: mach-shmobile: Add marzen defconfig. 2012-01-10 16:57:48 +09:00
mini2440_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
mmp2_defconfig ARM: mmp2: update mmp2_defconfig to support mmc 2011-07-20 17:20:52 -04:00
msm_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
mv78xx0_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mxs_defconfig ARM: mxs: Add initial support for DENX MX28 2011-10-13 09:06:58 +02:00
neponset_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
netwinder_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
netx_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
nhk8815_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
nuc910_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
nuc950_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
nuc960_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
omap1_defconfig ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
omap2plus_defconfig omap: Run make savedefconfig on omap2plus_defconfig to shrink it 2011-05-03 02:38:02 -07:00
orion5x_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
palmz72_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
pcm027_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pleb_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pnx4008_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pxa3xx_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
pxa168_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
pxa255-idp_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
pxa910_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
qil-a9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
raumfeld_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
realview-smp_defconfig ARM: 6903/1: Realview: Use physmap driver instead of integrator-flash 2011-05-20 22:27:08 +01:00
realview_defconfig ARM: 6903/1: Realview: Use physmap driver instead of integrator-flash 2011-05-20 22:27:08 +01:00
rpc_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s3c2410_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s3c6400_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s5p64x0_defconfig ARM: S5P: Update defconfig for HRT support 2011-03-12 08:05:19 +09:00
s5pc100_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s5pv210_defconfig ARM: S5P: Update defconfig for HRT support 2011-03-12 08:05:19 +09:00
sam9_l9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
shannon_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
shark_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
simpad_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
spear3xx_defconfig ARM: 6932/1: SPEAr3xx: Replace defconfigs with single unified defconfig 2011-05-20 22:34:25 +01:00
spear6xx_defconfig ARM: 6933/1: SPEAR6xx: Rename spear600_defconfig as spear6xx_defconfig 2011-05-20 22:34:25 +01:00
spitz_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
stamp9g20_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
tct_hammer_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
tegra_defconfig arm/tegra: refresh defconfig for tegra30 2011-12-19 18:00:03 -08:00
trizeps4_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
u300_defconfig ARM: u300: update defconfig 2011-11-29 10:34:45 +01:00
u8500_defconfig ARM: ux500: update defconfig 2011-11-29 10:34:51 +01:00
usb-a9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
versatile_defconfig ARM: 6907/1: Versatile: Use physmap driver instead of integrator-flash 2011-05-20 22:27:08 +01:00
vexpress_defconfig ARM: 6647/1: add Versatile Express defconfig 2011-02-19 10:55:12 +00:00
viper_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
xcep_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
zeus_defconfig ARM: pxa: fix inconsistent CONFIG_USB_PXA27X 2011-11-10 15:32:27 +08:00