From: Ting Liu <ting.liu@freescale.com>
Date: Fri, 17 Jul 2015 07:17:39 +0000 (+0800)
Subject: t1/t2/t4/b4: update KERNEL_DEFCONFIG
X-Git-Tag: 2.1~506
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e812eed2a7dc06bda9357187f39d51d08bedfea0;p=meta-freescale.git

t1/t2/t4/b4: update KERNEL_DEFCONFIG

The KERNEL_DEFCONFIG needs to be updated with the latest kernel codes.
* 85xx/e6500rev2_defconfig -> corenet64_fmanv3h_smp_defconfig
* corenet64_fmanv3_smp_defconfig -> corenet64_fmanv3l_smp_defconfig
* corenet32_fmanv3_smp_defconfig -> corenet32_fmanv3l_smp_defconfig

Signed-off-by: Ting Liu <ting.liu@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
index c0487d90..3df5e955 100644
--- a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500-64b.inc
 SOC_FAMILY = "b4:b4420"
 UBOOT_MACHINES ?= "B4420QDS"
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/b4420qds.conf b/meta-fsl-ppc/conf/machine/b4420qds.conf
index 94ab1d33..c5433e86 100644
--- a/meta-fsl-ppc/conf/machine/b4420qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500.inc
 SOC_FAMILY = "b4:b4420"
 UBOOT_MACHINES ?= "B4420QDS"
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
index 7e1f5bf9..3c00fdfd 100644
--- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500-64b.inc
 SOC_FAMILY = "b4:b4860"
 UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/b4860qds.conf b/meta-fsl-ppc/conf/machine/b4860qds.conf
index bae326e0..13b76629 100644
--- a/meta-fsl-ppc/conf/machine/b4860qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500.inc
 SOC_FAMILY = "b4:b4860"
 UBOOT_MACHINES ?= "B4860QDS B4860QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t1024rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1024rdb-64b.conf
index e9e66b21..9186be2d 100644
--- a/meta-fsl-ppc/conf/machine/t1024rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t1024rdb-64b.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e5500-64b.inc
 SOC_FAMILY = "t1:t1024"
 UBOOT_MACHINES ?= "T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1024RDB_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
diff --git a/meta-fsl-ppc/conf/machine/t1024rdb.conf b/meta-fsl-ppc/conf/machine/t1024rdb.conf
index 80d87bdd..275b5d1b 100644
--- a/meta-fsl-ppc/conf/machine/t1024rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t1024rdb.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e5500.inc
 SOC_FAMILY = "t1:t1024"
 UBOOT_MACHINES ?= "T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1024RDB_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
diff --git a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
index 88cb2c98..4f5f5c7d 100644
--- a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
@@ -11,7 +11,7 @@ UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \
     T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \
 "
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t2080qds.conf b/meta-fsl-ppc/conf/machine/t2080qds.conf
index 30478e9d..7fdc919b 100644
--- a/meta-fsl-ppc/conf/machine/t2080qds.conf
+++ b/meta-fsl-ppc/conf/machine/t2080qds.conf
@@ -11,7 +11,7 @@ UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \
     T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \
 "
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
index 3892ffba..d863924e 100644
--- a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
@@ -11,7 +11,7 @@ UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \
     T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \
 "
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t2080rdb.conf b/meta-fsl-ppc/conf/machine/t2080rdb.conf
index 28dca0db..31ae3293 100644
--- a/meta-fsl-ppc/conf/machine/t2080rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t2080rdb.conf
@@ -11,7 +11,7 @@ UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH \
     T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT T2080RDB_SECURE_BOOT \
 "
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
index c63aba88..fb0d9663 100644
--- a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500-64b.inc
 SOC_FAMILY = "t4:t4160"
 UBOOT_MACHINES ?= "T4160QDS T4160QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t4160qds.conf b/meta-fsl-ppc/conf/machine/t4160qds.conf
index 83fb5c84..d3dd58e3 100644
--- a/meta-fsl-ppc/conf/machine/t4160qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500.inc
 SOC_FAMILY = "t4:t4160"
 UBOOT_MACHINES ?= "T4160QDS T4160QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
index 006c2c1f..8c610fed 100644
--- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500-64b.inc
 SOC_FAMILY = "t4:t4240"
 UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t4240qds.conf b/meta-fsl-ppc/conf/machine/t4240qds.conf
index fe67584c..3f4b73c6 100644
--- a/meta-fsl-ppc/conf/machine/t4240qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500.inc
 SOC_FAMILY = "t4:t4240"
 UBOOT_MACHINES ?= "T4240QDS T4240QDS_SECURE_BOOT"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf b/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
index 09740664..bbc0bc74 100644
--- a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500-64b.inc
 SOC_FAMILY = "t4:t4240"
 UBOOT_MACHINES ?= "T4240RDB"
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
diff --git a/meta-fsl-ppc/conf/machine/t4240rdb.conf b/meta-fsl-ppc/conf/machine/t4240rdb.conf
index e4c31f90..ed5dfec8 100644
--- a/meta-fsl-ppc/conf/machine/t4240rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t4240rdb.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500.inc
 SOC_FAMILY = "t4:t4240"
 UBOOT_MACHINES ?= "T4240RDB"
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb"
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"