Merge branch 'master' from multiple repositories

Repositories:
	meta-fsl-arm
	meta-fsl-ppc

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

1 files changed, 23 insertions, 0 deletions

diff --git a/meta-fsl-ppc/conf/machine/bsc9132qds.conf b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
new file mode 100644
index 00000000..90ac2a3b
--- /dev/null
+++ b/meta-fsl-ppc/conf/machine/bsc9132qds.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Freescale BSC9132QDS
+#@SOC: bsc9132
+#@DESCRIPTION: Machine configuration for running BSC9132QDS
+#@MAINTAINER: Chunrong Guo <B40290@freescale.com>
+
+require conf/machine/include/e500v2.inc
+
+SOC_FAMILY = "bsc9132"
+UBOOT_MACHINES ?= " BSC9132QDS_NAND_DDRCLK133 BSC9132QDS_NAND_DDRCLK100 \
+    BSC9132QDS_NOR_DDRCLK100 BSC9132QDS_NOR_DDRCLK133 \
+    BSC9132QDS_SDCARD_DDRCLK100 BSC9132QDS_SDCARD_DDRCLK133 \
+    BSC9132QDS_SPIFLASH_DDRCLK100 BSC9132QDS_SPIFLASH_DDRCLK133 \
+    BSC9132QDS_NAND_DDRCLK100_SECURE BSC9132QDS_NAND_DDRCLK133_SECURE \
+    BSC9132QDS_NOR_DDRCLK100_SECURE BSC9132QDS_NOR_DDRCLK133_SECURE \
+    BSC9132QDS_SDCARD_DDRCLK100_SECURE BSC9132QDS_SDCARD_DDRCLK133_SECURE \
+    BSC9132QDS_SPIFLASH_DDRCLK100_SECURE BSC9132QDS_SPIFLASH_DDRCLK133_SECURE \
+"
+KERNEL_DEVICETREE ?= "bsc9132qds.dtb"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
+
+JFFS2_ERASEBLOCK = "0x10000"
+