diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-20 16:49:35 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-20 16:49:54 -0700 |
| commit | 3536c27c0fbe41f731ab6f61217ef95d0bdf2e05 (patch) | |
| tree | 097ec90ff618b5bb349b2555514c21f29170eb1c | |
| parent | 0cdea00ace1d6b9fb598f860241047f2f51035a6 (diff) | |
| parent | 8bede156f6f007ccbc25d336bfb183adaa84f1d9 (diff) | |
| download | olio-linux-3.10-3536c27c0fbe41f731ab6f61217ef95d0bdf2e05.tar.xz olio-linux-3.10-3536c27c0fbe41f731ab6f61217ef95d0bdf2e05.zip | |
Merge branch 'next/defconfig-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/defconfig
From Kukjin Kim:
This is for updating s3c6400_defconfig to build every s3c64xx stuff.
This helps to know at least building error before merging them.
* 'next/defconfig-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: s3c6400_defconfig: enable more boards in defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/s3c6400_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig index ba6a515086b..3a186d653da 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig @@ -9,11 +9,14 @@ CONFIG_ARCH_S3C64XX=y CONFIG_S3C_BOOT_ERROR_RESET=y CONFIG_MACH_SMDK6400=y CONFIG_MACH_ANW6410=y +CONFIG_MACH_MINI6410=y +CONFIG_MACH_REAL6410=y CONFIG_MACH_SMDK6410=y CONFIG_MACH_NCP=y CONFIG_MACH_HMT=y CONFIG_MACH_SMARTQ5=y CONFIG_MACH_SMARTQ7=y +CONFIG_MACH_WLF_CRAGG_6410=y CONFIG_CPU_32v6K=y CONFIG_AEABI=y CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144" |