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/linux/config/Config.in.block | 10 ++++++---- target/linux/config/Config.in.ethernet | 36 +++++++++++++++++----------------- target/linux/config/Config.in.flash | 10 ++++++---- target/linux/config/Config.in.graphics | 8 ++++---- target/linux/config/Config.in.input | 26 +++++++++++++----------- target/linux/config/Config.in.serial | 4 ++-- 6 files changed, 51 insertions(+), 43 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 31b6bc299..5e5bf4d19 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -200,7 +200,7 @@ config ADK_KERNEL_PATA_MACIO select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - depends on ADK_TARGET_SYSTEM_QEMU_PPC + depends on ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC config ADK_KERNEL_PATA_PLATFORM tristate "PATA platform driver" @@ -266,7 +266,9 @@ config ADK_KERNEL_PATA_PXA select ADK_KERNEL_BLK_DEV_SD select ADK_KERNEL_PATA_PCMCIA select ADK_KERNEL_PCMCIA_PXA2XX - depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS || ADK_TARGET_QEMU_ARM_MODEL_TERRIER || ADK_TARGET_QEMU_ARM_MODEL_SPITZ + depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS \ + || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \ + || ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default n help @@ -276,7 +278,7 @@ endmenu menu "SCSI driver support" depends on ADK_TARGET_WITH_SCSI || \ - ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || \ + ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB || \ ADK_TARGET_SYSTEM_QEMU_PPC64 || \ ADK_TARGET_SYSTEM_QEMU_SPARC @@ -288,7 +290,7 @@ config ADK_KERNEL_SCSI_SYM53C8XX_2 select ADK_KERNEL_SCSI_LOWLEVEL select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - depends on ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB + depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB config ADK_KERNEL_SCSI_IBMVSCSI tristate "IBM VSCSI support" diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index 0219f4ef9..7d54775a5 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -74,10 +74,10 @@ config ADK_KERNEL_FEC select ADK_KERNEL_NET_VENDOR_FREESCALE select ADK_KERNEL_AT803X_PHY depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 || \ - ADK_TARGET_QEMU_M68K_MCF5208 || \ + ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 || \ ADK_TARGET_SYSTEM_KINETIS_K70 default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default y if ADK_TARGET_QEMU_M68K_MCF5208 + default y if ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 default y if ADK_TARGET_SYSTEM_KINETIS_K70 default n help @@ -105,8 +105,8 @@ config ADK_KERNEL_SMC91X tristate "SMC91X ethernet driver" select ADK_KERNEL_NET_VENDOR_SMSC select ADK_KERNEL_GPIOLIB - depends on ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB - default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB + depends on ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB + default y if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB default y if ADK_TARGET_SYSTEM_ARM_FM default n help @@ -115,9 +115,9 @@ config ADK_KERNEL_SMC91X config ADK_KERNEL_SMSC911X tristate "SMC911X ethernet driver" select ADK_KERNEL_NET_VENDOR_SMSC - default y if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 + default y if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 default n - depends on ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 + depends on ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 help SMC911X ethernet driver @@ -136,8 +136,8 @@ config ADK_KERNEL_VIA_RHINE config ADK_KERNEL_XILINX_AXI_EMAC tristate "Xilinx AXI ethernet driver" select ADK_KERNEL_NET_VENDOR_XILINX - depends on ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 default n help Xilinx AXI ethernet driver @@ -145,8 +145,8 @@ config ADK_KERNEL_XILINX_AXI_EMAC config ADK_KERNEL_XILINX_LL_TEMAC tristate "Xilinx Temac ethernet driver" select ADK_KERNEL_NET_VENDOR_XILINX - depends on ADK_TARGET_QEMU_PPC_VIRTEX_ML507 - default y if ADK_TARGET_QEMU_PPC_VIRTEX_ML507 + depends on ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507 + default y if ADK_TARGET_SYSTEM_QEMU_PPC_VIRTEX_ML507 default n help Xilinx Temac ethernet driver @@ -154,8 +154,8 @@ config ADK_KERNEL_XILINX_LL_TEMAC config ADK_KERNEL_XILINX_EMACLITE tristate "Xilinx Emaclite ethernet driver" select ADK_KERNEL_NET_VENDOR_XILINX - depends on ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 + default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 default n help Xilinx Emaclite ethernet driver @@ -220,8 +220,8 @@ config ADK_KERNEL_E1000 ADK_TARGET_SYSTEM_QEMU_X86_64 || \ ADK_TARGET_SYSTEM_QEMU_MIPS || \ ADK_TARGET_SYSTEM_QEMU_MIPS64 || \ - ADK_TARGET_QEMU_PPC_MACPPC || \ - ADK_TARGET_QEMU_PPC_BAMBOO || \ + ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC || \ + ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO || \ ADK_TARGET_SYSTEM_QEMU_ALPHA || \ ADK_TARGET_VBOX default y if ADK_TARGET_SYSTEM_IBM_X40 @@ -229,8 +229,8 @@ config ADK_KERNEL_E1000 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_QEMU_MIPS default y if ADK_TARGET_SYSTEM_QEMU_MIPS64 - default y if ADK_TARGET_QEMU_PPC_MACPPC - default y if ADK_TARGET_QEMU_PPC_BAMBOO + default y if ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC + default y if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO default y if ADK_TARGET_SYSTEM_QEMU_ALPHA default y if ADK_TARGET_VBOX default n @@ -303,8 +303,8 @@ config ADK_KERNEL_ETRAX_ETHERNET config ADK_KERNEL_MACSONIC bool "MAC sonic ethernet driver" select ADK_KERNEL_NET_VENDOR_NATSEMI - depends on ADK_TARGET_QEMU_M68K_Q800 - default y if ADK_TARGET_QEMU_M68K_Q800 + depends on ADK_TARGET_SYSTEM_QEMU_M68K_Q800 + default y if ADK_TARGET_SYSTEM_QEMU_M68K_Q800 default n config ADK_KERNEL_STMMAC_ETH diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index eb4e8e776..d39ac114b 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -82,7 +82,8 @@ config ADK_KERNEL_MTD_M25P80 select ADK_KERNEL_MTD_OF_PARTS select ADK_KERNEL_SPI select ADK_KERNEL_SPI_MASTER - depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE + depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \ + || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 default n config ADK_KERNEL_MTD_NAND_PLATFORM @@ -103,9 +104,10 @@ config ADK_KERNEL_MTD_NAND_PLATFORM config ADK_TARGET_MTD_SIZE int - depends on ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - default "16777216" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - default "33554432" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \ + || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 + default "16777216" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 + default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 default "0" endmenu diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 928053411..91ab6fcd1 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -249,11 +249,11 @@ config ADK_KERNEL_FB_PXA select ADK_KERNEL_FRAMEBUFFER_CONSOLE select ADK_KERNEL_FRAMEBUFFER_CONSOLE_ROTATION depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS \ - || ADK_TARGET_QEMU_ARM_MODEL_TERRIER \ - || ADK_TARGET_QEMU_ARM_MODEL_SPITZ + || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \ + || ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER - default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ + default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER + default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ default n help Framebuffer support for Sharp Zaurus CL Series. diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 0eeb235c4..5584ad068 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -1,5 +1,9 @@ menu "Input devices" -depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN || ADK_TARGET_QEMU || ADK_TARGET_VBOX +depends on ADK_TARGET_WITH_USB \ + || ADK_TARGET_WITH_INPUT \ + || ADK_TARGET_WITH_TOUCHSCREEN \ + || ADK_TARGET_QEMU \ + || ADK_TARGET_VBOX config ADK_KERNEL_INPUT bool @@ -9,8 +13,8 @@ config ADK_KERNEL_INPUT default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ - default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER + default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ + default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default n config ADK_KERNEL_HID_LOGITECH @@ -32,15 +36,15 @@ config ADK_KERNEL_MOUSE_ATARI config ADK_KERNEL_KEYBOARD_GPIO bool default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ - default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER + default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ + default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default n config ADK_KERNEL_KEYBOARD_MATRIX bool default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ - default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER + default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ + default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default n config ADK_KERNEL_INPUT_TOUCHSCREEN @@ -60,8 +64,8 @@ config ADK_KERNEL_INPUT_KEYBOARD default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ - default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER + default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ + default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default n config ADK_KERNEL_INPUT_MOUSE @@ -72,8 +76,8 @@ config ADK_KERNEL_INPUT_MOUSE default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ - default y if ADK_TARGET_QEMU_ARM_MODEL_TERRIER + default y if ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ + default y if ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER default n config ADK_KERNEL_INPUT_MOUSEDEV diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 6d4555e39..2e23f653d 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -87,8 +87,8 @@ config ADK_KERNEL_SERIAL_PMACZILOG bool "pmac serial driver" select ADK_KERNEL_SERIAL_PMACZILOG_TTYS select ADK_KERNEL_SERIAL_PMACZILOG_CONSOLE - depends on ADK_TARGET_QEMU_M68K_Q800 - default y if ADK_TARGET_QEMU_M68K_Q800 + depends on ADK_TARGET_SYSTEM_QEMU_M68K_Q800 + default y if ADK_TARGET_SYSTEM_QEMU_M68K_Q800 default n help Serial driver for PMAC Q800 M68K. -- cgit v1.2.3