diff options
30 files changed, 60 insertions, 51 deletions
diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf index 1b379b3..460a049 100644 --- a/conf/machine/b4420qds-64b.conf +++ b/conf/machine/b4420qds-64b.conf @@ -6,9 +6,9 @@ # 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500-64b.inc +MACHINEOVERRIDES =. "b4:b4420:" -SOC_FAMILY = "b4:b4420" +require conf/machine/include/e6500-64b.inc UBOOT_CONFIG ??= "nor" UBOOT_CONFIG[nor] = "B4420QDS_config" diff --git a/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf index e142e6f..fc5214d 100644 --- a/conf/machine/b4420qds.conf +++ b/conf/machine/b4420qds.conf @@ -6,9 +6,9 @@ # 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500.inc +MACHINEOVERRIDES =. "b4:b4420:" -SOC_FAMILY = "b4:b4420" +require conf/machine/include/e6500.inc UBOOT_CONFIG ??= "nor" UBOOT_CONFIG[nor] = "B4420QDS_config" diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf index 5e8d9f4..cd1365c 100644 --- a/conf/machine/b4860qds-64b.conf +++ b/conf/machine/b4860qds-64b.conf @@ -6,9 +6,9 @@ # 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500-64b.inc +MACHINEOVERRIDES =. "b4:b4860:" -SOC_FAMILY = "b4:b4860" +require conf/machine/include/e6500-64b.inc UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "B4860QDS_config" diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf index 2b8cdab..4a113b2 100644 --- a/conf/machine/b4860qds.conf +++ b/conf/machine/b4860qds.conf @@ -6,9 +6,9 @@ # 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500.inc +MACHINEOVERRIDES =. "b4:b4860:" -SOC_FAMILY = "b4:b4860" +require conf/machine/include/e6500.inc UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "B4860QDS_config" diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf index 4ab730d..cb33204 100644 --- a/conf/machine/c293pcie.conf +++ b/conf/machine/c293pcie.conf @@ -5,9 +5,9 @@ # PCI Express Adapter Platform with ppce500v2 core #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e500v2.inc +MACHINEOVERRIDES =. "c29x:" -SOC_FAMILY = "c293pcie" +require conf/machine/include/e500v2.inc UBOOT_CONFIG ??= "spi secboot spi-secboot nor" UBOOT_CONFIG[nor] = "C29XPCIE_config" diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf index de57dac..98f58a0 100644 --- a/conf/machine/p2041rdb.conf +++ b/conf/machine/p2041rdb.conf @@ -5,9 +5,10 @@ # Design Board, rev2 silicon with ppce500mc core #@MAINTAINER: Chunrong Guo <B40290@freescale.com> +MACHINEOVERRIDES =. "p2041:" + require conf/machine/include/e500mc.inc -SOC_FAMILY = "p2041" UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" UBOOT_CONFIG[nor] = "P2041RDB_config" UBOOT_CONFIG[nand] = "P2041RDB_NAND_config,,u-boot.pbl" diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf index 48a4a4a..05f8290 100644 --- a/conf/machine/p3041ds.conf +++ b/conf/machine/p3041ds.conf @@ -5,9 +5,10 @@ # System with ppce500mc core #@MAINTAINER: Chunrong Guo <B40290@freescale.com> +MACHINEOVERRIDES =. "p3041:" + require conf/machine/include/e500mc.inc -SOC_FAMILY = "p3041" UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" UBOOT_CONFIG[nor] = "P3041DS_config" UBOOT_CONFIG[nand] = "P3041DS_NAND_config,,u-boot.pbl" diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf index 5473642..fbf60d7 100644 --- a/conf/machine/p4080ds.conf +++ b/conf/machine/p4080ds.conf @@ -5,9 +5,10 @@ # System with ppce500mc core #@MAINTAINER: Chunrong Guo <B40290@freescale.com> +MACHINEOVERRIDES =. "p4080:" + require conf/machine/include/e500mc.inc -SOC_FAMILY = "p4080" UBOOT_CONFIG ??= "secure-boot sdcard spi nor" UBOOT_CONFIG[nor] = "P4080DS_config" UBOOT_CONFIG[secure-boot] = "P4080DS_SECURE_BOOT_config" diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf index 17fe02b..4fb2df3 100644 --- a/conf/machine/p5020ds-64b.conf +++ b/conf/machine/p5020ds-64b.conf @@ -5,9 +5,10 @@ # System with ppce5500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> +MACHINEOVERRIDES =. "p5020:" + require conf/machine/include/e5500-64b.inc -SOC_FAMILY = "p5020" UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" UBOOT_CONFIG[nor] = "P5020DS_config" UBOOT_CONFIG[nand] = "P5020DS_NAND_config,,u-boot.pbl" diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf index 037a713..c38b9b5 100644 --- a/conf/machine/p5020ds.conf +++ b/conf/machine/p5020ds.conf @@ -5,9 +5,10 @@ # System with ppce5500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> +MACHINEOVERRIDES =. "p5020:" + require conf/machine/include/e5500.inc -SOC_FAMILY = "p5020" UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" UBOOT_CONFIG[nor] = "P5020DS_config" UBOOT_CONFIG[nand] = "P5020DS_NAND_config,,u-boot.pbl" diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf index 74f6f52..ff63bbe 100644 --- a/conf/machine/p5040ds-64b.conf +++ b/conf/machine/p5040ds-64b.conf @@ -5,9 +5,10 @@ # System with ppce5500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> +MACHINEOVERRIDES =. "p5040:" + require conf/machine/include/e5500-64b.inc -SOC_FAMILY = "p5040" UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" UBOOT_CONFIG[nor] = "P5040DS_config" UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl" diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf index b9f8ce7..7522380 100644 --- a/conf/machine/p5040ds.conf +++ b/conf/machine/p5040ds.conf @@ -5,9 +5,10 @@ # System with ppce5500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> +MACHINEOVERRIDES =. "p5040:" + require conf/machine/include/e5500.inc -SOC_FAMILY = "p5040" UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor" UBOOT_CONFIG[nor] = "P5040DS_config" UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl" diff --git a/conf/machine/t1023rdb-64b.conf b/conf/machine/t1023rdb-64b.conf index acc7e2f..0cc82f6 100644 --- a/conf/machine/t1023rdb-64b.conf +++ b/conf/machine/t1023rdb-64b.conf @@ -5,9 +5,10 @@ # Design Board with ppce5500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> +MACHINEOVERRIDES =. "t1:t1023:" + require conf/machine/include/e5500-64b.inc -SOC_FAMILY = "t1:t1023" UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1023RDB_config" UBOOT_CONFIG[nand] = "T1023RDB_NAND_config,,u-boot-with-spl-pbl.bin" diff --git a/conf/machine/t1023rdb.conf b/conf/machine/t1023rdb.conf index c8b6e3c..52480e0 100644 --- a/conf/machine/t1023rdb.conf +++ b/conf/machine/t1023rdb.conf @@ -5,9 +5,10 @@ # Design Board with ppce5500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> +MACHINEOVERRIDES =. "t1:t1023:" + require conf/machine/include/e5500.inc -SOC_FAMILY = "t1:t1023" UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1023RDB_config" UBOOT_CONFIG[nand] = "T1023RDB_NAND_config,,u-boot-with-spl-pbl.bin" diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf index e72564a..ec1f180 100644 --- a/conf/machine/t1024rdb-64b.conf +++ b/conf/machine/t1024rdb-64b.conf @@ -5,9 +5,9 @@ # Design Board with ppce5500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e5500-64b.inc +MACHINEOVERRIDES =. "t1:t1024:" -SOC_FAMILY = "t1:t1024" +require conf/machine/include/e5500-64b.inc UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1024RDB_config" diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf index e44f767..e98ef2d 100644 --- a/conf/machine/t1024rdb.conf +++ b/conf/machine/t1024rdb.conf @@ -5,9 +5,9 @@ # Design Board with ppce5500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e5500.inc +MACHINEOVERRIDES =. "t1:t1024:" -SOC_FAMILY = "t1:t1024" +require conf/machine/include/e5500.inc UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1024RDB_config" diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf index 5acfd23..2de48d9 100644 --- a/conf/machine/t1040d4rdb-64b.conf +++ b/conf/machine/t1040d4rdb-64b.conf @@ -5,9 +5,9 @@ # Design Board with ppce5500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e5500-64b.inc +MACHINEOVERRIDES =. "t1:t1040:" -SOC_FAMILY = "t1:t1040" +require conf/machine/include/e5500-64b.inc UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1040D4RDB_config" diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf index bd6b787..5372579 100644 --- a/conf/machine/t1040d4rdb.conf +++ b/conf/machine/t1040d4rdb.conf @@ -5,9 +5,9 @@ # Design Board with ppce5500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e5500.inc +MACHINEOVERRIDES =. "t1:t1040:" -SOC_FAMILY = "t1:t1040" +require conf/machine/include/e5500.inc UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1040D4RDB_config" diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf index d6194d5..830a291 100644 --- a/conf/machine/t1042d4rdb-64b.conf +++ b/conf/machine/t1042d4rdb-64b.conf @@ -5,9 +5,9 @@ # Design Board with ppce5500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e5500-64b.inc +MACHINEOVERRIDES =. "t1:t1042:" -SOC_FAMILY = "t1:t1042" +require conf/machine/include/e5500-64b.inc UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1042D4RDB_config" diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf index 5edfaa2..fc84dcf 100644 --- a/conf/machine/t1042d4rdb.conf +++ b/conf/machine/t1042d4rdb.conf @@ -5,9 +5,9 @@ # Design Board with ppce5500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e5500.inc +MACHINEOVERRIDES =. "t1:t1042:" -SOC_FAMILY = "t1:t1042" +require conf/machine/include/e5500.inc UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1042D4RDB_config" diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf index 6e35e33..cbe9c42 100644 --- a/conf/machine/t2080qds-64b.conf +++ b/conf/machine/t2080qds-64b.conf @@ -5,9 +5,9 @@ # System with ppce6500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500-64b.inc +MACHINEOVERRIDES =. "t2:t2080:" -SOC_FAMILY = "t2:t2080" +require conf/machine/include/e6500-64b.inc UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" UBOOT_CONFIG[nor] = "T2080QDS_config" diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf index 944b21b..8a16cd2 100644 --- a/conf/machine/t2080qds.conf +++ b/conf/machine/t2080qds.conf @@ -5,9 +5,9 @@ # System with ppce6500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500.inc +MACHINEOVERRIDES =. "t2:t2080:" -SOC_FAMILY = "t2:t2080" +require conf/machine/include/e6500.inc UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" UBOOT_CONFIG[nor] = "T2080QDS_config" diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf index 6f17ff7..54626fa 100644 --- a/conf/machine/t2080rdb-64b.conf +++ b/conf/machine/t2080rdb-64b.conf @@ -5,9 +5,9 @@ # Design Board with ppce6500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500-64b.inc +MACHINEOVERRIDES =. "t2:t2080:" -SOC_FAMILY = "t2:t2080" +require conf/machine/include/e6500-64b.inc UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" UBOOT_CONFIG[nor] = "T2080RDB_config" diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf index 05df258..a46fcc0 100644 --- a/conf/machine/t2080rdb.conf +++ b/conf/machine/t2080rdb.conf @@ -5,9 +5,9 @@ # Design Board with ppce6500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500.inc +MACHINEOVERRIDES =. "t2:t2080:" -SOC_FAMILY = "t2:t2080" +require conf/machine/include/e6500.inc UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor" UBOOT_CONFIG[nor] = "T2080RDB_config" diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf index 2cbfff4..86cd021 100644 --- a/conf/machine/t4160qds-64b.conf +++ b/conf/machine/t4160qds-64b.conf @@ -5,9 +5,9 @@ # System with ppce6500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500-64b.inc +MACHINEOVERRIDES =. "t4:t4160:" -SOC_FAMILY = "t4:t4160" +require conf/machine/include/e6500-64b.inc UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "T4160QDS_config" diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf index b4471ea..2e65862 100644 --- a/conf/machine/t4160qds.conf +++ b/conf/machine/t4160qds.conf @@ -5,9 +5,9 @@ # System with ppce6500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500.inc +MACHINEOVERRIDES =. "t4:t4160:" -SOC_FAMILY = "t4:t4160" +require conf/machine/include/e6500.inc UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "T4160QDS_config" diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf index e236a1c..abc408e 100644 --- a/conf/machine/t4240qds-64b.conf +++ b/conf/machine/t4240qds-64b.conf @@ -5,9 +5,9 @@ # System with ppce6500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500-64b.inc +MACHINEOVERRIDES =. "t4:t4240:" -SOC_FAMILY = "t4:t4240" +require conf/machine/include/e6500-64b.inc UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "T4240QDS_config" diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf index 0a4ac44..01f145f 100644 --- a/conf/machine/t4240qds.conf +++ b/conf/machine/t4240qds.conf @@ -5,9 +5,9 @@ # System with ppce6500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500.inc +MACHINEOVERRIDES =. "t4:t4240:" -SOC_FAMILY = "t4:t4240" +require conf/machine/include/e6500.inc UBOOT_CONFIG ??= "secure-boot nor" UBOOT_CONFIG[nor] = "T4240QDS_config" diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf index 92f7e9a..ac0c1fb 100644 --- a/conf/machine/t4240rdb-64b.conf +++ b/conf/machine/t4240rdb-64b.conf @@ -5,9 +5,9 @@ # Design Board with ppce6500 core in 64b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500-64b.inc +MACHINEOVERRIDES =. "t4:t4240:" -SOC_FAMILY = "t4:t4240" +require conf/machine/include/e6500-64b.inc UBOOT_CONFIG ??= "nor" UBOOT_CONFIG[nor] = "T4240RDB_config" diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf index d76fab0..2e8b70c 100644 --- a/conf/machine/t4240rdb.conf +++ b/conf/machine/t4240rdb.conf @@ -5,9 +5,9 @@ # Design Board with ppce6500 core in 32b mode #@MAINTAINER: Chunrong Guo <B40290@freescale.com> -require conf/machine/include/e6500.inc +MACHINEOVERRIDES =. "t4:t4240:" -SOC_FAMILY = "t4:t4240" +require conf/machine/include/e6500.inc UBOOT_CONFIG ??= "nor" UBOOT_CONFIG[nor] = "T4240RDB_config" |