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.

5 files changed, 32 insertions, 142 deletions

diff --git a/target/config/Config.in.kernelcfg b/target/config/Config.in.kernelcfg
index 458405198..3a654bfdb 100644
--- a/target/config/Config.in.kernelcfg
+++ b/target/config/Config.in.kernelcfg
@@ -16,57 +16,3 @@ config ADK_TARGET_KERNEL_DEFCONFIG
 	string
 	depends on ADK_TARGET_KERNEL_USE_DEFCONFIG
 
-config ADK_TARGET_KERNEL_MINICONFIG
-	string
-	depends on ADK_TARGET_KERNEL_USE_MINICONFIG
-	default "arm-fm" if ADK_TARGET_SYSTEM_ARM_FM
-	default "qemu-cris" if ADK_TARGET_SYSTEM_QEMU_CRIS
-	default "qemu-microblaze-s3adsp1800" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	default "qemu-aarch64" if ADK_TARGET_SYSTEM_QEMU_AARCH64
-	default "qemu-arm-versatilepb" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	default "qemu-arm-vexpress-a9" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	default "qemu-arm-spitz" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default "qemu-arm-terrier" if ADK_TARGET_QEMU_ARM_MODEL_TERRIER
-	default "qemu-mips" if ADK_TARGET_SYSTEM_QEMU_MIPS
-	default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64
-	default "qemu-ppc-mac99" if ADK_TARGET_QEMU_PPC_MACPPC
-	default "qemu-ppc-bamboo" if ADK_TARGET_QEMU_PPC_BAMBOO
-	default "qemu-virtex-ml507" if ADK_TARGET_QEMU_PPC_VIRTEX_ML507
-	default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64
-	default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH
-	default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC
-	default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64
-	default "qemu-x86" if ADK_TARGET_SYSTEM_QEMU_X86
-	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64
-	default "qemu-xtensa" if ADK_TARGET_SYSTEM_QEMU_XTENSA
-	default "qemu-alpha" if ADK_TARGET_SYSTEM_QEMU_ALPHA
-	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
-	default "vbox-x86" if ADK_TARGET_SYSTEM_VBOX_X86
-	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
-	default "solidrun-imx6" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
-	default "raspberry-pi2" if ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default "linksys-nslu2" if ADK_TARGET_SYSTEM_LINKSYS_NSLU2
-	default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default "mikrotik-rb4xx" if ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	default "mikrotik-rb532" if ADK_TARGET_SYSTEM_MIKROTIK_RB532
-	default "dragino-ms14s" if ADK_TARGET_SYSTEM_DRAGINO_MS14S
-	default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC
-	default "pcengines-apu" if ADK_TARGET_SYSTEM_PCENGINES_APU
-	default "atmel-ngw100" if ADK_TARGET_SYSTEM_ATMEL_NGW100
-	default "apple-macmini" if ADK_TARGET_SYSTEM_APPLE_MACMINI
-	default "sun-voyager" if ADK_TARGET_SYSTEM_SUN_VOYAGER
-	default "banana-pro" if ADK_TARGET_SYSTEM_BANANA_PRO
-	default "xilinx-kintex7" if ADK_TARGET_SYSTEM_XILINX_KINTEX7
-	default "pcengines-alix" if ADK_TARGET_SYSTEM_PCENGINES_ALIX
-	default "kinetis-k70" if ADK_TARGET_SYSTEM_KINETIS_K70
-	default "sim-bfin" if ADK_TARGET_SYSTEM_SIM_BFIN
-	default "sim-h8300h" if ADK_TARGET_SYSTEM_SIM_H8300H
-	default "qemu-m68k-mcf5208" if ADK_TARGET_QEMU_M68K_MCF5208
-	default "qemu-m68k-q800" if ADK_TARGET_QEMU_M68K_Q800
-	default "imgtec-ci20" if ADK_TARGET_SYSTEM_IMGTEC_CI20
-	default "qemu-metag" if ADK_TARGET_SYSTEM_QEMU_METAG
-	default "qemu-or1k" if ADK_TARGET_SYSTEM_QEMU_OR1K
-	default "beaglebone-black" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu
deleted file mode 100644
index f47f5fa62..000000000
--- a/target/config/Config.in.qemu
+++ /dev/null
@@ -1,70 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice
-prompt "Qemu PPC Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_PPC
-
-config ADK_TARGET_QEMU_PPC_BAMBOO
-	bool "Bamboo PPC"
-	select ADK_CPU_PPC_440
-	select ADK_TARGET_SOFT_FLOAT
-
-config ADK_TARGET_QEMU_PPC_MACPPC
-	bool "Mac99 PPC"
-	select ADK_CPU_PPC
-	select ADK_TARGET_CPU_WITH_FPU
-
-endchoice
-
-choice
-prompt "Qemu M68K Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_M68K
-
-config ADK_TARGET_QEMU_M68K_Q800
-	bool "M68K Q800"
-	select ADK_CPU_68040
-
-config ADK_TARGET_QEMU_M68K_MCF5208
-	bool "Coldfire MCF5208"
-	select ADK_CPU_CF_5208
-	select ADK_TARGET_BINFMT_FLAT
-	select ADK_TARGET_UCLINUX
-
-endchoice
-
-choice
-prompt "Qemu MICROBLAZE Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
-
-config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	bool "Xilinx Spartan S3ADSP1800"
-
-config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	bool "Xilinx ML605"
-
-endchoice
-
-choice
-prompt "Qemu ARM Emulation"
-depends on ADK_TARGET_SYSTEM_QEMU_ARM
-
-config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
-	bool "ARM Ltd. Versatile Express with Cortex-A9"
-	select ADK_CPU_CORTEX_A9
-
-config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	bool "ARM Ltd. Versatile/PB with ARM926EJ-S"
-	select ADK_CPU_ARM926EJ_S
-
-config ADK_TARGET_QEMU_ARM_MODEL_TERRIER
-	bool "Xscale PXA270 Terrier PDA with XSCALE"
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
-
-config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	bool "Xscale PXA270 Spitz PDA with XSCALE"
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
-
-endchoice
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index cec56dc32..b75facf75 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -10,7 +10,7 @@ config ADK_QEMU_ARGS
 config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	bool
 	select ADK_TARGET_WITH_VGA
-	depends on ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+	depends on ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 
 choice 
 prompt "Bootloader"
@@ -27,14 +27,15 @@ endchoice
 
 choice
 prompt "Qemu Emulation with storage device"
-depends on ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB \
-	|| ADK_TARGET_QEMU_ARM_MODEL_TERRIER \
-	|| ADK_TARGET_QEMU_ARM_MODEL_SPITZ \
-	|| ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 \
-	|| ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 \
+depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
+	|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \
+	|| ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ \
+	|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
+	|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
 	|| ADK_TARGET_SYSTEM_QEMU_MIPS \
 	|| ADK_TARGET_SYSTEM_QEMU_MIPS64 \
-	|| ADK_TARGET_SYSTEM_QEMU_PPC \
+	|| ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC \
+	|| ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
 	|| ADK_TARGET_SYSTEM_QEMU_PPC64 \
 	|| ADK_TARGET_SYSTEM_QEMU_SH \
 	|| ADK_TARGET_SYSTEM_QEMU_SPARC \
@@ -51,21 +52,27 @@ config ADK_TARGET_QEMU_WITHOUT_BLOCK
 config ADK_TARGET_QEMU_WITH_BLOCK
 	bool "enabled"
 	select ADK_TARGET_WITH_BLOCK
-	select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	select ADK_KERNEL_ATA_PIIX if ADK_TARGET_SYSTEM_QEMU_MIPS || ADK_TARGET_SYSTEM_QEMU_MIPS64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
-	select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC
+	select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
+	select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
+					|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	select ADK_KERNEL_ATA_PIIX if ADK_TARGET_SYSTEM_QEMU_MIPS \
+					|| ADK_TARGET_SYSTEM_QEMU_MIPS64 \
+					|| ADK_TARGET_SYSTEM_QEMU_X86 \
+					|| ADK_TARGET_SYSTEM_QEMU_X86_64
+	select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
+					|| ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
 	select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
 	select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64
 	select ADK_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH
-	select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
+	select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \
+					|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 
 endchoice
 
 choice
 prompt "Qemu Emulation with graphical output"
-depends on ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 \
+depends on ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \
 	|| ADK_TARGET_SYSTEM_QEMU_SH \
 	|| ADK_TARGET_SYSTEM_QEMU_X86_64 \
 	|| ADK_TARGET_SYSTEM_QEMU_X86
@@ -86,7 +93,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_INPUT_MOUSE
 	select ADK_KERNEL_INPUT_MOUSEDEV
-	select ADK_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
+	select ADK_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
 	select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH
 	select ADK_KERNEL_DRM_CIRRUS_QEMU if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 133c426e5..ec89dcc01 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -228,8 +228,11 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 		|| ADK_TARGET_QEMU \
 		|| ADK_TARGET_SIM
 	default "hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
-	default "ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 || ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_SYSTEM_QEMU_AARCH64
+	default "ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	default "ttyAMA0" if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
+				|| ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \
+				|| ADK_TARGET_SYSTEM_ARM_FM \
+				|| ADK_TARGET_SYSTEM_QEMU_AARCH64
 	default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
 	default "ttySC0" if ADK_TARGET_SYSTEM_SIM_H8300H
 	default "ttymxc0" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 77eec48c3..ce74c4bba 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -57,7 +57,9 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 	select ADK_HOST_NEED_SQUASHFS
 	select ADK_HOST_NEED_QEMU if ADK_TARGET_QEMU
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU
-	depends on ADK_TARGET_WITH_MTD || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
+	depends on ADK_TARGET_WITH_MTD \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	help
 	  highly compressed read-only filesystem for MTD flash systems.
 
@@ -66,7 +68,9 @@ config ADK_TARGET_ROOTFS_JFFS2
 	select ADK_KERNEL_JFFS2_FS
 	select ADK_HOST_NEED_MTD_UTILS
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU
-	depends on ADK_TARGET_WITH_MTD || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
+	depends on ADK_TARGET_WITH_MTD \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	help
 	  compressed read-write filesystem for MTD flash systems.