diff options
author | Ting Liu <ting.liu@freescale.com> | 2015-01-13 23:04:31 +0800 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2015-01-14 10:54:10 +0800 |
commit | 66caa4ab876648016d63cb2ace3f0291e5addfe7 (patch) | |
tree | 3057ac2109b633aaf1c0c4b66a0e91dd819725c7 | |
parent | 95b9f0e9c32f8aa89f58f083192fd15377b7e48f (diff) | |
download | meta-fsl-ppc-66caa4ab876648016d63cb2ace3f0291e5addfe7.tar.gz |
move all common definitions onto qoriq-base.inc
Signed-off-by: Ting Liu <ting.liu@freescale.com>
-rw-r--r-- | conf/machine/include/qoriq-base.inc | 29 | ||||
-rw-r--r-- | conf/machine/include/qoriq-default-providers.inc | 3 | ||||
-rw-r--r-- | conf/machine/include/qoriq-default-settings.inc | 21 | ||||
-rw-r--r-- | conf/machine/include/qoriq-default-versions.inc | 3 |
4 files changed, 25 insertions, 31 deletions
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index 9b26d10..aae476d 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc | |||
@@ -1,8 +1,29 @@ | |||
1 | # Provides the QorIQ common settings | 1 | # Provides the QorIQ common settings |
2 | require conf/machine/include/soc-family.inc | ||
2 | 3 | ||
3 | require conf/machine/include/qoriq-default-settings.inc | 4 | # providers |
4 | require conf/machine/include/qoriq-default-versions.inc | 5 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" |
5 | require conf/machine/include/qoriq-default-providers.inc | 6 | PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" |
6 | 7 | ||
7 | require conf/machine/include/soc-family.inc | 8 | # versions |
9 | PREFERRED_VERSION_qemu = "1.7+fsl" | ||
10 | PREFERRED_VERSION_openssl = "1.0.1i" | ||
11 | |||
12 | # settings | ||
13 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" | ||
14 | MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" | ||
15 | MACHINEOVERRIDES .= ":qoriq-ppc" | ||
16 | |||
17 | IMAGE_CLASSES += "image_types_uboot" | ||
18 | EXTRA_IMAGEDEPENDS += "u-boot" | ||
19 | |||
20 | KERNEL_IMAGETYPE ?= "uImage" | ||
21 | |||
22 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" | ||
23 | SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" | ||
24 | |||
25 | USE_VT = "0" | ||
26 | |||
27 | MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600" | ||
28 | UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512" | ||
8 | 29 | ||
diff --git a/conf/machine/include/qoriq-default-providers.inc b/conf/machine/include/qoriq-default-providers.inc deleted file mode 100644 index 25197da..0000000 --- a/conf/machine/include/qoriq-default-providers.inc +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" | ||
2 | PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" | ||
3 | |||
diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc deleted file mode 100644 index 539f6a1..0000000 --- a/conf/machine/include/qoriq-default-settings.inc +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" | ||
2 | MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" | ||
3 | |||
4 | IMAGE_CLASSES += "image_types_uboot" | ||
5 | EXTRA_IMAGEDEPENDS += "u-boot" | ||
6 | |||
7 | KERNEL_IMAGETYPE ?= "uImage" | ||
8 | # disable the images below for now | ||
9 | # ext2.bz2 ext2.lzma \ | ||
10 | # ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot" | ||
11 | |||
12 | MACHINEOVERRIDES .= ":qoriq-ppc" | ||
13 | |||
14 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" | ||
15 | SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}" | ||
16 | |||
17 | USE_VT = "0" | ||
18 | |||
19 | MKUBIFS_ARGS ??= "-m 512 -e 15360 -c 3600" | ||
20 | UBINIZE_ARGS ??= "-m 512 -p 16KiB -s 512" | ||
21 | |||
diff --git a/conf/machine/include/qoriq-default-versions.inc b/conf/machine/include/qoriq-default-versions.inc deleted file mode 100644 index 639e61e..0000000 --- a/conf/machine/include/qoriq-default-versions.inc +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | PREFERRED_VERSION_qemu = "1.7+fsl" | ||
2 | PREFERRED_VERSION_openssl = "1.0.1i" | ||
3 | |||