From 3dbb3b4c0899274183ad81ad1b69b28c2ffa26bd Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Fri, 10 Jul 2015 17:45:19 +0800 Subject: rename ls-base.inc -> qoriq-arm.inc Preparation for next merge stage with qoriq-ppc. Signed-off-by: Ting Liu Signed-off-by: Otavio Salvador --- conf/machine/include/ls-base.inc | 17 ----------------- conf/machine/include/qoriq-arm.inc | 17 +++++++++++++++++ conf/machine/ls1021atwr.conf | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 conf/machine/include/ls-base.inc create mode 100644 conf/machine/include/qoriq-arm.inc diff --git a/conf/machine/include/ls-base.inc b/conf/machine/include/ls-base.inc deleted file mode 100644 index 20a7594..0000000 --- a/conf/machine/include/ls-base.inc +++ /dev/null @@ -1,17 +0,0 @@ -require conf/machine/include/soc-family.inc - -# Freescale BSP default providers -PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-ls1" -PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-ls1" -PREFERRED_PROVIDER_virtual/kernel_ls102xa ?= "linux-ls1" - -# Define the default image type -IMAGE_CLASSES ?= "image_types_uboot" -KERNEL_IMAGETYPE ?= "uImage" - -UBOOT_ENTRYPOINT_ls102xa = "0x80008000" - -MACHINE_FEATURES = "pci ext2 ext3 serial" -MACHINE_EXTRA_RRECOMMENDS = "udev-extraconf" - -DEFAULTTUNE_ls102xa ?= "cortexa7hf-neon" diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc new file mode 100644 index 0000000..20a7594 --- /dev/null +++ b/conf/machine/include/qoriq-arm.inc @@ -0,0 +1,17 @@ +require conf/machine/include/soc-family.inc + +# Freescale BSP default providers +PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-ls1" +PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-ls1" +PREFERRED_PROVIDER_virtual/kernel_ls102xa ?= "linux-ls1" + +# Define the default image type +IMAGE_CLASSES ?= "image_types_uboot" +KERNEL_IMAGETYPE ?= "uImage" + +UBOOT_ENTRYPOINT_ls102xa = "0x80008000" + +MACHINE_FEATURES = "pci ext2 ext3 serial" +MACHINE_EXTRA_RRECOMMENDS = "udev-extraconf" + +DEFAULTTUNE_ls102xa ?= "cortexa7hf-neon" diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf index 916fb4b..4478e95 100644 --- a/conf/machine/ls1021atwr.conf +++ b/conf/machine/ls1021atwr.conf @@ -4,7 +4,7 @@ #@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode #@MAINTAINER: Zhenhua Luo -require conf/machine/include/ls-base.inc +require conf/machine/include/qoriq-arm.inc require conf/machine/include/tune-cortexa7.inc SOC_FAMILY = "ls102xa" -- cgit v1.2.3-54-g00ecf