diff options
46 files changed, 38 insertions, 237 deletions
diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf index 45c820e..a623c84 100644 --- a/conf/machine/b4420qds-64b.conf +++ b/conf/machine/b4420qds-64b.conf @@ -5,17 +5,11 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "b4420" - -# TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "B4420QDS" KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf index 9016cfb..fa1187b 100644 --- a/conf/machine/b4420qds.conf +++ b/conf/machine/b4420qds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "b4420" UBOOT_MACHINES ?= "B4420QDS" @@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" -BUILD_64BIT_KERNEL = "1" diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf index 4da069f..3ba5648 100644 --- a/conf/machine/b4860qds-64b.conf +++ b/conf/machine/b4860qds-64b.conf @@ -5,16 +5,11 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "b4860" -# TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "B4860QDS" KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf index c560f1c..972d29f 100644 --- a/conf/machine/b4860qds.conf +++ b/conf/machine/b4860qds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "b4860" UBOOT_MACHINES ?= "B4860QDS" @@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" -BUILD_64BIT_KERNEL = "1" diff --git a/conf/machine/bsc9131rdb.conf b/conf/machine/bsc9131rdb.conf index 64ba795..e65f7e4 100644 --- a/conf/machine/bsc9131rdb.conf +++ b/conf/machine/bsc9131rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "bsc9131" UBOOT_MACHINES ?= "BSC9131RDB_SPIFLASH BSC9131RDB_NAND BSC9131RDB_NAND_SYSCLK100 BSC9131RDB_SPIFLASH_SYSCLK100" @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/bsc9132qds.conf b/conf/machine/bsc9132qds.conf index a51cbd8..82078ee 100644 --- a/conf/machine/bsc9132qds.conf +++ b/conf/machine/bsc9132qds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.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" @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf index b22dfd0..6a63844 100644 --- a/conf/machine/c293pcie.conf +++ b/conf/machine/c293pcie.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "c293pcie" BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat" @@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc index a35d91b..09b5c69 100644 --- a/conf/machine/include/e500mc.inc +++ b/conf/machine/include/e500mc.inc @@ -1,17 +1,6 @@ TARGET_FPU = "hard" require conf/machine/include/tune-ppce500mc.inc - -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" -PREFERRED_VERSION_qemu = "1.7+fsl" -PREFERRED_VERSION_openssl = "1.0.1g" - -KERNEL_IMAGETYPE ?= "uImage" -# disable the images below for now -# ext2.bz2 ext2.lzma \ -# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" +require conf/machine/include/qoriq-base.inc MACHINEOVERRIDES .= ":e500mc:fslmachine" diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc index adaa3cd..178de18 100644 --- a/conf/machine/include/e500v2.inc +++ b/conf/machine/include/e500v2.inc @@ -1,15 +1,4 @@ require conf/machine/include/tune-ppce500v2.inc - -MACHINE_FEATURES = "pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" -PREFERRED_VERSION_qemu = "1.7+fsl" -PREFERRED_VERSION_openssl = "1.0.1g" - -KERNEL_IMAGETYPE ?= "uImage" -# disable the images below for now -# ext2.bz2 ext2.lzma \ -# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" +require conf/machine/include/qoriq-base.inc MACHINEOVERRIDES .= ":e500v2:fslmachine" diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc index c951843..47a9ad7 100644 --- a/conf/machine/include/e5500-64b.inc +++ b/conf/machine/include/e5500-64b.inc @@ -1,18 +1,7 @@ TARGET_FPU = "hard" - DEFAULTTUNE ?= "ppc64e5500" -require conf/machine/include/tune-ppce5500.inc - -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" -PREFERRED_VERSION_qemu = "1.7+fsl" -PREFERRED_VERSION_openssl = "1.0.1g" - -KERNEL_IMAGETYPE ?= "uImage" -# disable the images below for now -# ext2.bz2 ext2.lzma \ -# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" +require conf/machine/include/tune-ppce5500.inc +require conf/machine/include/qoriq-base.inc MACHINEOVERRIDES .= ":e5500-64b:fslmachine" diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc index 0babacc..e6f0400 100644 --- a/conf/machine/include/e5500.inc +++ b/conf/machine/include/e5500.inc @@ -1,17 +1,6 @@ TARGET_FPU = "hard" require conf/machine/include/tune-ppce5500.inc - -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" -PREFERRED_VERSION_qemu = "1.7+fsl" -PREFERRED_VERSION_openssl = "1.0.1g" - -KERNEL_IMAGETYPE ?= "uImage" -# disable the images below for now -# ext2.bz2 ext2.lzma \ -# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" +require conf/machine/include/qoriq-base.inc MACHINEOVERRIDES .= ":e5500:fslmachine" diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc index 36f55a2..0770cc3 100644 --- a/conf/machine/include/e6500-64b.inc +++ b/conf/machine/include/e6500-64b.inc @@ -1,18 +1,7 @@ TARGET_FPU = "hard" - DEFAULTTUNE ?= "ppc64e6500" -require conf/machine/include/tune-ppce6500.inc - -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" -PREFERRED_VERSION_qemu = "1.7+fsl" -PREFERRED_VERSION_openssl = "1.0.1g" - -KERNEL_IMAGETYPE ?= "uImage" -# disable the images below for now -# ext2.bz2 ext2.lzma \ -# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" +require conf/machine/include/tune-ppce6500.inc +require conf/machine/include/qoriq-base.inc MACHINEOVERRIDES .= ":e6500-64b:fslmachine" diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc index 81a2bf4..323e420 100644 --- a/conf/machine/include/e6500.inc +++ b/conf/machine/include/e6500.inc @@ -1,17 +1,9 @@ TARGET_FPU = "hard" require conf/machine/include/tune-ppce6500.inc +require conf/machine/include/qoriq-base.inc -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" -PREFERRED_VERSION_qemu = "1.7+fsl" -PREFERRED_VERSION_openssl = "1.0.1g" +MACHINEOVERRIDES .= ":e6500:fslmachine" -KERNEL_IMAGETYPE ?= "uImage" -# disable the images below for now -# ext2.bz2 ext2.lzma \ -# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" +BUILD_64BIT_KERNEL = "1" -MACHINEOVERRIDES .= ":e6500:fslmachine" diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc new file mode 100644 index 0000000..9b26d10 --- /dev/null +++ b/conf/machine/include/qoriq-base.inc @@ -0,0 +1,8 @@ +# Provides the QorIQ common settings + +require conf/machine/include/qoriq-default-settings.inc +require conf/machine/include/qoriq-default-versions.inc +require conf/machine/include/qoriq-default-providers.inc + +require conf/machine/include/soc-family.inc + diff --git a/conf/machine/include/qoriq-default-providers.inc b/conf/machine/include/qoriq-default-providers.inc new file mode 100644 index 0000000..824712b --- /dev/null +++ b/conf/machine/include/qoriq-default-providers.inc @@ -0,0 +1,2 @@ +PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" + diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc new file mode 100644 index 0000000..a4fc0ec --- /dev/null +++ b/conf/machine/include/qoriq-default-settings.inc @@ -0,0 +1,15 @@ +MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" +MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" + +KERNEL_IMAGETYPE ?= "uImage" +# disable the images below for now +# ext2.bz2 ext2.lzma \ +# ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" + +MACHINEOVERRIDES .= ":qoriq-ppc" + +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" +SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" + +USE_VT = "0" + diff --git a/conf/machine/include/qoriq-default-versions.inc b/conf/machine/include/qoriq-default-versions.inc new file mode 100644 index 0000000..3bb03ba --- /dev/null +++ b/conf/machine/include/qoriq-default-versions.inc @@ -0,0 +1,3 @@ +PREFERRED_VERSION_qemu = "1.7+fsl" +PREFERRED_VERSION_openssl = "1.0.1g" + diff --git a/conf/machine/p1010rdb.conf b/conf/machine/p1010rdb.conf index 10b1c92..ee7a9b6 100644 --- a/conf/machine/p1010rdb.conf +++ b/conf/machine/p1010rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p1010" BOOTFORMAT_CONFIG = "config_sram_p1010rdb.dat" @@ -17,6 +16,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig" JFFS2_ERASEBLOCK = "0x20000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf index 3fa7377..e2b706e 100644 --- a/conf/machine/p1020rdb.conf +++ b/conf/machine/p1020rdb.conf @@ -5,18 +5,12 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p1020" BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat" UBOOT_MACHINES ?= " P1020RDB-PD P1020RDB-PD_NAND P1020RDB-PD_SDCARD P1020RDB-PD_SPIFLASH" - KERNEL_DEVICETREE ?= "p1020rdb-pd_32b.dtb" - KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf index 711a62d..4c793e8 100644 --- a/conf/machine/p1021rdb.conf +++ b/conf/machine/p1021rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p1021" BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat" @@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf index 107cbe4..823131a 100644 --- a/conf/machine/p1022ds.conf +++ b/conf/machine/p1022ds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p1022" BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat" @@ -25,6 +24,3 @@ XSERVER = " \ JFFS2_ERASEBLOCK = "0x20000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1023rdb.conf b/conf/machine/p1023rdb.conf index 59a9ce6..02ec4a5 100644 --- a/conf/machine/p1023rdb.conf +++ b/conf/machine/p1023rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p1023" UBOOT_MACHINES ?= "P1023RDB" @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/p1023_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p1025twr.conf b/conf/machine/p1025twr.conf index e7d25fe..67fa569 100644 --- a/conf/machine/p1025twr.conf +++ b/conf/machine/p1025twr.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p1025" BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat" @@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf index 7510787..96433a2 100644 --- a/conf/machine/p2020ds.conf +++ b/conf/machine/p2020ds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p2020" BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat" @@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf index c3d08c9..9544c25 100644 --- a/conf/machine/p2020rdb.conf +++ b/conf/machine/p2020rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500v2.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p2020" BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat" @@ -15,6 +14,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" JFFS2_ERASEBLOCK = "0x20000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf index d06df45..f641a00 100644 --- a/conf/machine/p2041rdb.conf +++ b/conf/machine/p2041rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500mc.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p2041" UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH" @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf index 7be35b9..01c51e4 100644 --- a/conf/machine/p3041ds.conf +++ b/conf/machine/p3041ds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500mc.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p3041" UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH" @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf index 51c0fed..1b6fad7 100644 --- a/conf/machine/p4080ds.conf +++ b/conf/machine/p4080ds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e500mc.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p4080" UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH " @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf index a901b48..057e9f3 100644 --- a/conf/machine/p5020ds-64b.conf +++ b/conf/machine/p5020ds-64b.conf @@ -5,16 +5,11 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e5500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p5020" -# TODO: fix 32bit build of u-boot for p5020ds-64b UBOOT_MACHINES ?= "P5020DS" KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf index 42ab769..7effe1e 100644 --- a/conf/machine/p5020ds.conf +++ b/conf/machine/p5020ds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e5500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p5020" UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH " @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf index c462970..fbbe9e2 100644 --- a/conf/machine/p5040ds-64b.conf +++ b/conf/machine/p5040ds-64b.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e5500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p5040" UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH" @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf index 8f5ea62..1cd9512 100644 --- a/conf/machine/p5040ds.conf +++ b/conf/machine/p5040ds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e5500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "p5040" UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH" @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/t1040rdb-64b.conf b/conf/machine/t1040rdb-64b.conf index bc4de7b..b4ea5c8 100644 --- a/conf/machine/t1040rdb-64b.conf +++ b/conf/machine/t1040rdb-64b.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e5500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t1040" UBOOT_MACHINES ?= "T1040RDB" @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/t1040rdb.conf b/conf/machine/t1040rdb.conf index d2ec7a4..684cf8e 100644 --- a/conf/machine/t1040rdb.conf +++ b/conf/machine/t1040rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e5500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t1040" UBOOT_MACHINES ?= "T1040RDB" @@ -14,6 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/t1042rdb-64b.conf b/conf/machine/t1042rdb-64b.conf index 58b2bd0..0141e10 100644 --- a/conf/machine/t1042rdb-64b.conf +++ b/conf/machine/t1042rdb-64b.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e5500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t1042" UBOOT_MACHINES ?= "T1042RDB_PI" @@ -14,10 +13,6 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" - PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER = " \ xserver-xorg \ diff --git a/conf/machine/t1042rdb.conf b/conf/machine/t1042rdb.conf index e5c4112..1f13d86 100644 --- a/conf/machine/t1042rdb.conf +++ b/conf/machine/t1042rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e5500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t1042" UBOOT_MACHINES ?= "T1042RDB_PI" @@ -14,10 +13,6 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" - PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER = " \ xserver-xorg \ diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf index bd1cd1d..e2b5682 100644 --- a/conf/machine/t2080qds-64b.conf +++ b/conf/machine/t2080qds-64b.conf @@ -5,16 +5,11 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t2080" -# TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT" KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf index 2892baa..dfa6b09 100644 --- a/conf/machine/t2080qds.conf +++ b/conf/machine/t2080qds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t2080" UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT" @@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" -BUILD_64BIT_KERNEL = "1" diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf index 2d28f9c..5d4eed4 100644 --- a/conf/machine/t2080rdb-64b.conf +++ b/conf/machine/t2080rdb-64b.conf @@ -5,16 +5,11 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t2080" -# TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT" KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf index 256a3d0..08d2dd7 100644 --- a/conf/machine/t2080rdb.conf +++ b/conf/machine/t2080rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t2080" UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT" @@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" -BUILD_64BIT_KERNEL = "1" diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf index 1865078..3f35e57 100644 --- a/conf/machine/t4160qds-64b.conf +++ b/conf/machine/t4160qds-64b.conf @@ -5,16 +5,11 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t4160" -# TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "T4160QDS" KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf index 07ea41b..f87b58e 100644 --- a/conf/machine/t4160qds.conf +++ b/conf/machine/t4160qds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t4160" UBOOT_MACHINES ?= "T4160QDS" @@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" -BUILD_64BIT_KERNEL = "1" diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf index ff56c3b..510b813 100644 --- a/conf/machine/t4240qds-64b.conf +++ b/conf/machine/t4240qds-64b.conf @@ -5,16 +5,11 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t4240" -# TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "T4240QDS" KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf index 0df32f6..58e5200 100644 --- a/conf/machine/t4240qds.conf +++ b/conf/machine/t4240qds.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t4240" UBOOT_MACHINES ?= "T4240QDS" @@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" -BUILD_64BIT_KERNEL = "1" diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf index 0838187..ea45895 100644 --- a/conf/machine/t4240rdb-64b.conf +++ b/conf/machine/t4240rdb-64b.conf @@ -5,16 +5,11 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500-64b.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t4240" -# TODO: fix 32bit build of u-boot UBOOT_MACHINES ?= "T4240RDB" KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb" KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf index dc5f45c..ec9c5bb 100644 --- a/conf/machine/t4240rdb.conf +++ b/conf/machine/t4240rdb.conf @@ -5,7 +5,6 @@ #@MAINTAINER: Chunrong Guo <B40290@freescale.com> require conf/machine/include/e6500.inc -require conf/machine/include/soc-family.inc SOC_FAMILY = "t4240" UBOOT_MACHINES ?= "T4240RDB" @@ -14,7 +13,3 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig" JFFS2_ERASEBLOCK = "0x10000" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -USE_VT = "0" -BUILD_64BIT_KERNEL = "1" |