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.

6 files changed, 42 insertions, 14 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index a86a4ac2e..3bc254ca6 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -14,16 +14,16 @@ KERNEL:=$(LINUX_DIR)/arch/arm/boot/uImage
 endif
 
 QEMU_ARGS:=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
 QEMU_ARGS+=-M spitz
 endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_TERRIER),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER),y)
 QEMU_ARGS+=-M terrier
 endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y)
 QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111
 endif
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
 QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -m 256 -net user -net nic,model=lan9118 -dtb $(FW_DIR)/vexpress-v2p-ca9.dtb
 endif
 ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
@@ -34,7 +34,7 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB)$(ADK_TARGET_QEMU_ARM_MODEL_TERRIER)$(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER)$(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@@ -131,7 +131,7 @@ kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 
 dtb-install:
-ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
 	env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \
 		dtbs $(MAKE_TRACE)
 endif
diff --git a/target/arm/systems/qemu-arm b/target/arm/systems/qemu-arm
deleted file mode 100644
index 2e3d17dd9..000000000
--- a/target/arm/systems/qemu-arm
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_ARM
-	bool "Qemu Emulator"
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	  Qemu Emulator for ARM architecture.
-
diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz
new file mode 100644
index 000000000..4cabc8a66
--- /dev/null
+++ b/target/arm/systems/qemu-arm-spitz
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
+	bool "Qemu Emulator (Spitz PDA)"
+	select ADK_CPU_XSCALE
+	select ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Qemu Emulator for ARM architecture (Spitz PDA).
+
diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier
new file mode 100644
index 000000000..e09e4c284
--- /dev/null
+++ b/target/arm/systems/qemu-arm-terrier
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
+	bool "Qemu Emulator (Terrier PDA)"
+	select ADK_CPU_XSCALE
+	select ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Qemu Emulator for ARM architecture (Terrier PDA).
+
diff --git a/target/arm/systems/qemu-arm-versatilepb b/target/arm/systems/qemu-arm-versatilepb
new file mode 100644
index 000000000..e55a9681f
--- /dev/null
+++ b/target/arm/systems/qemu-arm-versatilepb
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
+	bool "Qemu Emulator (Versatile/PB)"
+	select ADK_CPU_ARM926EJ_S
+	select ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Qemu Emulator for ARM architecture (Versatile/PB).
+
diff --git a/target/arm/systems/qemu-arm-vexpress-a9 b/target/arm/systems/qemu-arm-vexpress-a9
new file mode 100644
index 000000000..2b1f0679a
--- /dev/null
+++ b/target/arm/systems/qemu-arm-vexpress-a9
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
+	bool "Qemu Emulator (Vexpress A9)"
+	select ADK_CPU_CORTEX_A9
+	select ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Qemu Emulator for ARM architecture (Vexpress A9).
+