From patchwork Sat Oct 13 19:46:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-zynq-balister,2/2] zynq-zc702: Refactor machine configuration. Date: Sat, 13 Oct 2012 19:46:30 -0000 From: Elvis Dowson X-Patchwork-Id: 38143 Message-Id: <1350157590-14336-2-git-send-email-elvis.dowson@gmail.com> To: openembedded-devel@lists.openembedded.org Cc: Elvis Dowson This commit * refactors the zynq-zc702 machine configuration * adds u-boot to the generated rootfs Signed-off-by: Elvis Dowson --- conf/machine/include/zynq-base.inc | 21 +++++++++++++++++++++ conf/machine/include/zynq-default-providers.inc | 4 ++++ conf/machine/zynq-zc702.conf | 14 +++++--------- 3 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 conf/machine/include/zynq-base.inc create mode 100644 conf/machine/include/zynq-default-providers.inc diff --git a/conf/machine/include/zynq-base.inc b/conf/machine/include/zynq-base.inc new file mode 100644 index 0000000..1b30a4d --- /dev/null +++ b/conf/machine/include/zynq-base.inc @@ -0,0 +1,21 @@ +# Provides the Xilinx Zynq common settings + +include conf/machine/include/zynq-default-providers.inc + +# Add u-boot image to rootfs +EXTRA_IMAGEDEPENDS = "u-boot-zynq" + +# Specify kernel image type +KERNEL_IMAGETYPE = "uImage" + +# Specify machine features +MACHINE_FEATURES = "apm vfat ethernet" + +# Ship kernel modules +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" + +# Specify rootfs image filesystem types +IMAGE_FSTYPES += "tar.gz" + +# Specify serial console settings +SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/include/zynq-default-providers.inc b/conf/machine/include/zynq-default-providers.inc new file mode 100644 index 0000000..10934c7 --- /dev/null +++ b/conf/machine/include/zynq-default-providers.inc @@ -0,0 +1,4 @@ +# Xilinx Zynq BSP default providers + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-zynq" +PREFERRED_PROVIDER_u-boot ?= "u-boot-zynq" diff --git a/conf/machine/zynq-zc702.conf b/conf/machine/zynq-zc702.conf index 74a1271..09ef4a1 100644 --- a/conf/machine/zynq-zc702.conf +++ b/conf/machine/zynq-zc702.conf @@ -1,14 +1,10 @@ -include conf/machine/include/tune-cortexa9.inc - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-zynq" - -MACHINE_FEATURES = "apm vfat ethernet" +#@TYPE: Machine +#@Name: Xilinx ZC702 FPGA Development Platform for the Zynq-7020 processor. +#@DESCRIPTION: Machine configuration for the Xilinx ZC702 FPGA Development Platform. -IMAGE_FSTYPES += "tar.gz" - -SERIAL_CONSOLE = "115200 ttyPS0" +include conf/machine/include/zynq-base.inc +include conf/machine/include/tune-cortexa9.inc UBOOT_MACHINE = "zynq_zc702_config" #UBOOT_ENTRYPOINT = "0x80008000" #UBOOT_LOADADDRESS = "0x80008000" -