diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-07-11 14:28:04 (GMT) |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 17:44:36 (GMT) |
commit | bf744d417ff2fe1e8e386c7ad06e79c34a078642 (patch) | |
tree | a54b733054a147041879367156e7c3af87684664 /arch/mips/configs/jmr3927_defconfig | |
parent | edcaf1a6a77315562e9781245cc8e028c9a921dc (diff) | |
download | linux-fsl-qoriq-bf744d417ff2fe1e8e386c7ad06e79c34a078642.tar.xz |
[MIPS] TXx9: Update and merge defconfigs
Merge rbhma4200(RBTX4927/37) and rbhma4500(RBTX4938) defconfig into
single rbtx49xx defconfig. And jmr3927 defconfig is also updated.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/configs/jmr3927_defconfig')
-rw-r--r-- | arch/mips/configs/jmr3927_defconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index ab16e67..9d5bd2a 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-rc9 -# Fri Jul 11 00:25:19 2008 +# Fri Jul 11 23:01:36 2008 # CONFIG_MIPS=y @@ -37,10 +37,11 @@ CONFIG_MIPS=y # CONFIG_SIBYTE_SENTOSA is not set # CONFIG_SIBYTE_BIGSUR is not set # CONFIG_SNI_RM is not set -CONFIG_TOSHIBA_JMR3927=y -# CONFIG_TOSHIBA_RBTX4927 is not set -# CONFIG_TOSHIBA_RBTX4938 is not set +CONFIG_MACH_TX39XX=y +# CONFIG_MACH_TX49XX is not set # CONFIG_WR_PPMC is not set +CONFIG_TOSHIBA_JMR3927=y +CONFIG_SOC_TX3927=y # CONFIG_TOSHIBA_FPCIB0 is not set CONFIG_PICMG_PCI_BACKPLANE_DEFAULT=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -67,7 +68,6 @@ CONFIG_CPU_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y CONFIG_IRQ_TXX9=y -CONFIG_MIPS_TX3927=y CONFIG_SWAP_IO_SPACE=y CONFIG_MIPS_L1_CACHE_SHIFT=5 |