From 1f94ff184c4fc6d74b8147370600e29a71415729 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Sep 2015 15:52:02 +0200 Subject: refactor kernel mini.config. We do not need to manually set mini.config file anymore. Every target system, even Qemu emulating different models get it its own. Cleaner and simpler to add new targets. --- target/microblaze/Makefile | 4 ++-- target/microblaze/systems/qemu-microblaze | 8 -------- target/microblaze/systems/qemu-microblaze-ml605 | 8 ++++++++ target/microblaze/systems/qemu-microblaze-s3adsp1800 | 8 ++++++++ 4 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 target/microblaze/systems/qemu-microblaze create mode 100644 target/microblaze/systems/qemu-microblaze-ml605 create mode 100644 target/microblaze/systems/qemu-microblaze-s3adsp1800 (limited to 'target/microblaze') diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 8a31dbf26..8bbaadedc 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -8,10 +8,10 @@ include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL) QEMU_ARGS:=${ADK_QEMU_ARGS} -ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605),y) QEMU_ARGS+=-M petalogix-ml605 -dtb target/microblaze/ml605.dtb endif -ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800),y) QEMU_ARGS+=-M petalogix-s3adsp1800 endif diff --git a/target/microblaze/systems/qemu-microblaze b/target/microblaze/systems/qemu-microblaze deleted file mode 100644 index 588979b50..000000000 --- a/target/microblaze/systems/qemu-microblaze +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE - bool "Qemu Emulator" - select ADK_CPU_MICROBLAZE - select ADK_TARGET_QEMU - select ADK_TARGET_KERNEL_LINUXBIN - help - Qemu support for MICROBLAZE architecture. - diff --git a/target/microblaze/systems/qemu-microblaze-ml605 b/target/microblaze/systems/qemu-microblaze-ml605 new file mode 100644 index 000000000..f8dd57909 --- /dev/null +++ b/target/microblaze/systems/qemu-microblaze-ml605 @@ -0,0 +1,8 @@ +config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 + bool "Qemu Emulator (Xilinx ML605)" + select ADK_CPU_MICROBLAZE + select ADK_TARGET_QEMU + select ADK_TARGET_KERNEL_LINUXBIN + help + Qemu support for MICROBLAZE architecture (Xilinx ML605). + diff --git a/target/microblaze/systems/qemu-microblaze-s3adsp1800 b/target/microblaze/systems/qemu-microblaze-s3adsp1800 new file mode 100644 index 000000000..e3bcc1d8c --- /dev/null +++ b/target/microblaze/systems/qemu-microblaze-s3adsp1800 @@ -0,0 +1,8 @@ +config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 + bool "Qemu Emulator (Xilinx Spartan S3ADSP1800)" + select ADK_CPU_MICROBLAZE + select ADK_TARGET_QEMU + select ADK_TARGET_KERNEL_LINUXBIN + help + Qemu support for MICROBLAZE architecture (Xilinx Spartan S3ADSP1800). + -- cgit v1.2.3