aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/virtex-4-ml405-powerpc-405.conf39
-rw-r--r--conf/machine/virtex4.conf37
2 files changed, 39 insertions, 37 deletions
diff --git a/conf/machine/virtex-4-ml405-powerpc-405.conf b/conf/machine/virtex-4-ml405-powerpc-405.conf
new file mode 100644
index 0000000..926e2c6
--- /dev/null
+++ b/conf/machine/virtex-4-ml405-powerpc-405.conf
@@ -0,0 +1,39 @@
+# Copyright (C) 2010, Adrian Alonso <aalonso00@gmail.com>
+# Copyright (C) 2013, Elvis Dowson <elvis.dowson@gmail.com>
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@Name: virtex-4-ml405-powerpc-405
+#@DESCRIPTION: Machine configuration for the Xilinx ML405 FPGA development platform with a Virtex-4 PowerPC 405 processor (with APU FPU).
+# Compatible targets include ML401, ML403, ML405, ML410.
+
+# Specify target cpu
+TARGET_CPU = "405"
+
+# Include Virtex-4 base definitions
+include conf/machine/include/virtex-4/virtex-4-base.inc
+
+# Specify tune file for PowerPC405 processor with APU FPU hardware floating point support
+require conf/machine/include/tune-ppc405e.inc
+
+# Specify linux kernel devicetree
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/virtex405-ml405.dts"
+
+# Specify u-boot machine configuration
+UBOOT_MACHINE ?= "ppc405-generic_config"
+UBOOT_ENTRYPOINT ?= "0x00000000"
+UBOOT_LOADADDRESS ?= "0x00000000"
+
+# Specify the Xilinx board name
+XILINX_BOARD = "ml405"
+
+# Xilinx EDK override hardware definitions for xilinx-bsp
+# Include the following environment variables in your local.conf
+# XILINX_BSP_PATH = "complete path to the Xilinx XPS project"
+
+# Specify serial console settings
+# Don't use tty1
+# USE_VT = "0"
+SERIAL_CONSOLE ?= "115200 ttyUL0"
+
+# Device nodes add xsa for (system ace)
+IMAGE_DEVICE_TABLES = "files/device_table_add-xsa.txt"
diff --git a/conf/machine/virtex4.conf b/conf/machine/virtex4.conf
deleted file mode 100644
index fbac9f9..0000000
--- a/conf/machine/virtex4.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2010, Adrian Alonso <aalonso00@gmail.com>
-# Released under the MIT license (see packages/COPYING)
-#@TYPE: Machine
-#@Name: Xilinx Virtex4 FPGA Development Platform
-#@DESCRIPTION: Machine configuration for Xilinx Virtex4 family
-# Supported targets ML401, ML403, ML405, ML410
-
-TARGET_CPU = "405"
-#tune for the selected cpu
-require conf/machine/include/tune-ppc405.inc
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx"
-PREFERRED_VERSION_u-boot_virtex4 = "u-boot-xilinx"
-# Add u-boot image
-EXTRA_IMAGEDEPENDS += "u-boot-xilinx"
-
-KERNEL_IMAGETYPE = "uImage"
-
-MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet"
-MACHINE_EXTRA_RECOMMENDS = "kernel-modules"
-
-UBOOT_MACHINE ?= "ml405_config"
-UBOOT_ENTRYPOINT ?= "0x00000000"
-UBOOT_LOADADDRESS ?= "0x00000000"
-
-# Xilinx EDK override hardware definitions for xilinx-bsp
-# Include in your local.conf
-# XILINX_BSP_PATH = "complete path for Xilinx XPS project"
-# XILINX_BOARD = "ml410"
-
-# Don't use tty1
-USE_VT = "0"
-SERIAL_CONSOLE ?= "115200 ttyUL0"
-
-# Device nodes add xsa for (system ace)
-IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
- files/device_table_add-xsa.txt"