]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
ARM: at91: udpate defconfigs
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Wed, 15 May 2013 15:19:21 +0000 (17:19 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Fri, 17 May 2013 13:05:08 +0000 (15:05 +0200)
commitb3f442b0eedbc20b5ce3f4a96530588d14901199
tree0c5da47086f672f31365985dd5502a9b9dfed63b
parent5e8b3bc392180c89da15c7d73915517fba7cc140
ARM: at91: udpate defconfigs

Merge 9g20 with 9260 and 9g10 with 9261 as those SoCs can run from the same
kernel even in non DT world.

Fix the sam9261ek to allow 9g10 and sam9261 to compile together.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
arch/arm/configs/at91_dt_defconfig
arch/arm/configs/at91rm9200_defconfig
arch/arm/configs/at91sam9260_9g20_defconfig [moved from arch/arm/configs/at91sam9g20_defconfig with 67% similarity]
arch/arm/configs/at91sam9260_defconfig [deleted file]
arch/arm/configs/at91sam9261_9g10_defconfig [moved from arch/arm/configs/at91sam9261_defconfig with 91% similarity]
arch/arm/configs/at91sam9263_defconfig
arch/arm/configs/at91sam9g45_defconfig
arch/arm/configs/sama5_defconfig
arch/arm/mach-at91/Kconfig.non_dt
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/board-sam9261ek.c