From 9bb871a0bb4c239239944d28bd4d5cfa19d84f62 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 3 Mar 2018 15:46:47 +0100 Subject: add support for waldux --- target/config/Config.in.adk | 2 +- target/config/Config.in.binfmt | 2 +- target/config/Config.in.cmdline | 14 ++ target/config/Config.in.cpu | 36 +++-- target/config/Config.in.hardware | 3 +- target/config/Config.in.kernelcfg | 51 ------- target/config/Config.in.kernelcmd | 14 -- target/config/Config.in.kernelversion | 269 ---------------------------------- target/config/Config.in.libc | 6 +- target/config/Config.in.os | 6 + target/config/Config.in.qemuopts | 108 +++++++++----- target/config/Config.in.rootfs | 81 ++++++---- target/config/Config.in.runtime | 19 ++- target/config/Config.in.toolchain | 4 +- target/config/Config.in.tools | 12 +- 15 files changed, 200 insertions(+), 427 deletions(-) create mode 100644 target/config/Config.in.cmdline delete mode 100644 target/config/Config.in.kernelcfg delete mode 100644 target/config/Config.in.kernelcmd delete mode 100644 target/config/Config.in.kernelversion (limited to 'target/config') diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 9d9415afc..b414b70fd 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -39,7 +39,7 @@ config ADK_BUILD_WITH_DEBUG default n help If you want to create debug packages, you should enable this option. - WARNING: It will use a lot of additional disk space on you build system! + WARNING: It will use a lot of additional disk space on your build system! config ADK_DISABLE_CHECKSUM bool "Disable checksum check for downloads globally" diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt index 7567b07bc..750f1990a 100644 --- a/target/config/Config.in.binfmt +++ b/target/config/Config.in.binfmt @@ -3,7 +3,7 @@ choice prompt "Binary Format" -depends on ADK_TARGET_OS_LINUX +depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX config ADK_TARGET_BINFMT_ELF bool "ELF" diff --git a/target/config/Config.in.cmdline b/target/config/Config.in.cmdline new file mode 100644 index 000000000..e575f52d0 --- /dev/null +++ b/target/config/Config.in.cmdline @@ -0,0 +1,14 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_TARGET_CMDLINE + string "Kernel commandline" + default "fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default "geodewdt.nowayout=1" if ADK_TARGET_MODEL_PCENGINES_ALIX1C + default "kinetis_platform=k70-som" if ADK_TARGET_SYSTEM_KINETIS_K70 + default "metag_da.console_poll=1" if ADK_TARGET_SYSTEM_QEMU_METAG + default "earlycon=uart8250,mmio32,0x9d050020,115200n8 memmap=256M@0x60000000" if ADK_TARGET_CPU_XTENSA_DE212 + default "earlyprintk=uart8250-32bit,0x99600000" if ADK_TARGET_SYSTEM_ANDES_AG101P + default "earlycon noiotrap" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 + default "" + diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index f60e22b8b..0f5254a06 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -860,8 +860,9 @@ config ADK_TARGET_CPU_MIPS_MIPS32 select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU - select ADK_KERNEL_CPU_MIPS32_R1 select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY + select ADK_LINUX_KERNEL_CPU_MIPS32_R1 if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_CPU_MIPS32_R1 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS config ADK_TARGET_CPU_MIPS_MIPS32R2 @@ -871,8 +872,9 @@ config ADK_TARGET_CPU_MIPS_MIPS32R2 select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU - select ADK_KERNEL_CPU_MIPS32_R2 select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY + select ADK_LINUX_KERNEL_CPU_MIPS32_R2 if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_CPU_MIPS32_R2 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS config ADK_TARGET_CPU_MIPS_MIPS32R6 @@ -882,8 +884,9 @@ config ADK_TARGET_CPU_MIPS_MIPS32R6 select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_WITH_FPU - select ADK_KERNEL_CPU_MIPS32_R6 select ADK_TARGET_ARCH_MIPS_WITH_NAN_2008 + select ADK_LINUX_KERNEL_CPU_MIPS32_R6 if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_CPU_MIPS32_R6 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS config ADK_TARGET_CPU_MIPS_R4400 @@ -955,7 +958,8 @@ config ADK_TARGET_CPU_MIPS64_MIPS64 select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY - select ADK_KERNEL_CPU_MIPS64_R1 + select ADK_LINUX_KERNEL_CPU_MIPS64_R1 if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_CPU_MIPS64_R1 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS64 config ADK_TARGET_CPU_MIPS64_MIPS64R2 @@ -966,7 +970,8 @@ config ADK_TARGET_CPU_MIPS64_MIPS64R2 select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU select ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY - select ADK_KERNEL_CPU_MIPS64_R2 + select ADK_LINUX_KERNEL_CPU_MIPS64_R2 if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_CPU_MIPS64_R2 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS64 config ADK_TARGET_CPU_MIPS64_MIPS64R6 @@ -977,7 +982,8 @@ config ADK_TARGET_CPU_MIPS64_MIPS64R6 select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU select ADK_TARGET_ARCH_MIPS_WITH_NAN_2008 - select ADK_KERNEL_CPU_MIPS64_R6 + select ADK_LINUX_KERNEL_CPU_MIPS64_R6 if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_CPU_MIPS64_R6 if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_MIPS64 config ADK_TARGET_CPU_MIPS64_LOONGSON2F @@ -1795,9 +1801,11 @@ config ADK_TARGET_CPU_XTENSA_DC233C select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_WITH_MMU - select ADK_KERNEL_XTENSA_VARIANT_DC233C select ADK_TARGET_KERNEL_ZIMAGE - select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX + select ADK_LINUX_KERNEL_XTENSA_VARIANT_DC233C if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_XTENSA_VARIANT_DC233C if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_XTENSA config ADK_TARGET_CPU_XTENSA_DC232B @@ -1807,8 +1815,9 @@ config ADK_TARGET_CPU_XTENSA_DC232B select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_WITH_MMU - select ADK_KERNEL_XTENSA_VARIANT_DC232B select ADK_TARGET_KERNEL_ZIMAGE + select ADK_LINUX_KERNEL_XTENSA_VARIANT_DC232B if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_XTENSA_VARIANT_DC232B if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_XTENSA config ADK_TARGET_CPU_XTENSA_DE212 @@ -1818,8 +1827,9 @@ config ADK_TARGET_CPU_XTENSA_DE212 select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_WITHOUT_MMU select ADK_TARGET_UCLINUX - select ADK_KERNEL_XTENSA_VARIANT_CUSTOM select ADK_TARGET_KERNEL_ZIMAGE + select ADK_LINUX_KERNEL_XTENSA_VARIANT_CUSTOM if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_XTENSA_VARIANT_CUSTOM if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_XTENSA config ADK_TARGET_CPU_XTENSA_KC705_BE @@ -1829,8 +1839,9 @@ config ADK_TARGET_CPU_XTENSA_KC705_BE select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_WITH_MMU - select ADK_KERNEL_XTENSA_VARIANT_DC233C select ADK_TARGET_KERNEL_ZIMAGE + select ADK_LINUX_KERNEL_XTENSA_VARIANT_DC233C if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_XTENSA_VARIANT_DC233C if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_XTENSA config ADK_TARGET_CPU_XTENSA_FSF @@ -1840,8 +1851,9 @@ config ADK_TARGET_CPU_XTENSA_FSF select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_WITH_MMU - select ADK_KERNEL_XTENSA_VARIANT_FSF select ADK_TARGET_KERNEL_ZIMAGE + select ADK_LINUX_KERNEL_XTENSA_VARIANT_FSF if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_XTENSA_VARIANT_FSF if ADK_TARGET_OS_WALDUX depends on ADK_TARGET_ARCH_XTENSA endchoice diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware index 34e79c240..f136bbebc 100644 --- a/target/config/Config.in.hardware +++ b/target/config/Config.in.hardware @@ -112,7 +112,8 @@ config ADK_TARGET_WITH_SMP config ADK_TARGET_WITH_MMU bool - select ADK_KERNEL_MMU + select ADK_LINUX_KERNEL_MMU if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_MMU if ADK_TARGET_OS_WALDUX config ADK_TARGET_WITHOUT_MMU bool diff --git a/target/config/Config.in.kernelcfg b/target/config/Config.in.kernelcfg deleted file mode 100644 index f7b6217f8..000000000 --- a/target/config/Config.in.kernelcfg +++ /dev/null @@ -1,51 +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 "Kernel configuration" if !ADK_TARGET_CHOOSE_ARCH -depends on ADK_TARGET_OS_LINUX -default ADK_TARGET_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK && ADK_TARGET_KERNEL_VERSION_GIT -default ADK_TARGET_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_KERNEL_VERSION_GIT -default ADK_TARGET_KERNEL_USE_DEFCONFIG if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG && ADK_TARGET_KERNEL_VERSION_GIT - -config ADK_TARGET_KERNEL_USE_MINICONFIG - bool "Use mini.config from OpenADK" - -config ADK_TARGET_KERNEL_USE_DEFCONFIG - bool "Use defconfig from Linux kernel" - -config ADK_TARGET_KERNEL_USE_CUSTOMCONFIG - bool "Use custom Linux kernel configuration file" - -endchoice - -config ADK_TARGET_KERNEL_DEFCONFIG - string "Defconfig name" - depends on ADK_TARGET_KERNEL_USE_DEFCONFIG - default "bcmrpi_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI - default "bcmrpi_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI0 - default "bcm2709_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI2 - default "bcm2709_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI3 - default "bcmrpi3_defconfig" if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 - default "twr-k70f120m_defconfig" if ADK_TARGET_SYSTEM_KINETIS_K70 - default "imx_v7_cbi_hb_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_TARGET_KERNEL_VERSION_GIT - default "imx_v6_v7_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "mvebu_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG - default "nsim_700_defconfig" if ADK_TARGET_SYSTEM_NSIM_ARCV1 - default "nsim_hs_defconfig" if ADK_TARGET_SYSTEM_NSIM_ARCV2 - default "10m50_defconfig" if ADK_TARGET_SYSTEM_QEMU_NIOS2 - default "ag101p_defconfig" if ADK_TARGET_SYSTEM_ANDES_AG101P - default "bb.org_defconfig" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - default "am335x_phytec_defconfig" if ADK_TARGET_SYSTEM_PHYTEC_WEGA - default "j2_defconfig" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 - default "sunxi_defconfig" if ADK_TARGET_SYSTEM_ORANGE_PI0 - default "edosk2674_defconfig" if ADK_TARGET_SYSTEM_HITACHI_EDOSK2674 - default "x86_64_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86_64 - default "i386_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86 - default "" - -config ADK_TARGET_KERNEL_CUSTOMCONFIG_PATH - string "Kernel configuration file location" - depends on ADK_TARGET_KERNEL_USE_CUSTOMCONFIG - default ".kernelconfig" - diff --git a/target/config/Config.in.kernelcmd b/target/config/Config.in.kernelcmd deleted file mode 100644 index e575f52d0..000000000 --- a/target/config/Config.in.kernelcmd +++ /dev/null @@ -1,14 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -config ADK_TARGET_CMDLINE - string "Kernel commandline" - default "fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default "geodewdt.nowayout=1" if ADK_TARGET_MODEL_PCENGINES_ALIX1C - default "kinetis_platform=k70-som" if ADK_TARGET_SYSTEM_KINETIS_K70 - default "metag_da.console_poll=1" if ADK_TARGET_SYSTEM_QEMU_METAG - default "earlycon=uart8250,mmio32,0x9d050020,115200n8 memmap=256M@0x60000000" if ADK_TARGET_CPU_XTENSA_DE212 - default "earlyprintk=uart8250-32bit,0x99600000" if ADK_TARGET_SYSTEM_ANDES_AG101P - default "earlycon noiotrap" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 - default "" - diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion deleted file mode 100644 index 588b2ca64..000000000 --- a/target/config/Config.in.kernelversion +++ /dev/null @@ -1,269 +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 "Kernel version" if !ADK_TARGET_CHOOSE_ARCH -depends on ADK_TARGET_OS_LINUX -default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_BOARD_BCM28XX -default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG -default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK -default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_KINETIS_K70 -default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_ADSP_BF537 -default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_PHYTEC_WEGA -default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_CSKY -default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_LM32 -default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS -default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_H8300 -default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG -default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU -default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE -default ADK_TARGET_KERNEL_VERSION_4_14 if ADK_TARGET_SYSTEM_ORANGE_PI0 -default ADK_TARGET_KERNEL_VERSION_4_14 if ADK_TARGET_ARCH_OR1K -default ADK_TARGET_KERNEL_VERSION_4_15 if ADK_TARGET_ARCH_RISCV32 -default ADK_TARGET_KERNEL_VERSION_4_15 if ADK_TARGET_ARCH_RISCV64 -default ADK_TARGET_KERNEL_VERSION_4_9 - -config ADK_TARGET_KERNEL_VERSION_GIT - bool "git" - depends on !ADK_TARGET_ARCH_AVR32 - depends on !ADK_TARGET_ARCH_NDS32 - select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_KERNEL_VERSION_GIT - select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - select ADK_TARGET_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - -config ADK_TARGET_KERNEL_VERSION_4_15 - bool "4.15.4" - depends on !ADK_TARGET_ARCH_AVR32 - depends on !ADK_TARGET_ARCH_CRIS - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_METAG - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE - -config ADK_TARGET_KERNEL_VERSION_4_14 - bool "4.14.8" - depends on !ADK_TARGET_ARCH_AVR32 - depends on !ADK_TARGET_ARCH_CRIS - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_METAG - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE - -config ADK_TARGET_KERNEL_VERSION_4_9 - bool "4.9.77" - depends on !ADK_TARGET_ARCH_CRIS - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_METAG - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_OR1K - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE - depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 - -config ADK_TARGET_KERNEL_VERSION_4_4 - bool "4.4.112" - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_NIOS2 - depends on !ADK_TARGET_ARCH_OR1K - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 - depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 - depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 - depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 - -config ADK_TARGET_KERNEL_VERSION_4_1 - bool "4.1.45" - depends on !ADK_TARGET_ARCH_ARC - depends on !ADK_TARGET_ARCH_BFIN - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_H8300 - depends on !ADK_TARGET_ARCH_NIOS2 - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_OR1K - depends on !ADK_TARGET_ARCH_SPARC - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_SYSTEM_KINETIS_K70 - depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 - depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 - depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 - -config ADK_TARGET_KERNEL_VERSION_3_16 - bool "3.16.49" - depends on !ADK_TARGET_ARCH_ARC - depends on !ADK_TARGET_ARCH_BFIN - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_H8300 - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_NIOS2 - depends on !ADK_TARGET_ARCH_OR1K - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_ARCH_SPARC - depends on !ADK_TARGET_BOARD_ATH79 - depends on !ADK_TARGET_BOARD_BCM28XX - depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - depends on !ADK_TARGET_SYSTEM_KINETIS_K70 - depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 - depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 - depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 - depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 - -config ADK_TARGET_KERNEL_VERSION_3_10 - bool "3.10.107" - depends on !ADK_TARGET_ARCH_ARC - depends on !ADK_TARGET_ARCH_BFIN - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_H8300 - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_NIOS2 - depends on !ADK_TARGET_ARCH_OR1K - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_ARCH_SPARC - depends on !ADK_TARGET_BOARD_ATH79 - depends on !ADK_TARGET_BOARD_BCM28XX - depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - depends on !ADK_TARGET_SYSTEM_KINETIS_K70 - depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX - depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 - depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 - depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 - depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 - -config ADK_TARGET_KERNEL_VERSION_3_10_NDS32 - bool "3.10-nds32" - depends on ADK_TARGET_ARCH_NDS32 - select ADK_TARGET_KERNEL_NO_MIRROR - -config ADK_TARGET_KERNEL_VERSION_3_2 - bool "3.2.94" - depends on !ADK_TARGET_ARCH_ARC - depends on !ADK_TARGET_ARCH_BFIN - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_H8300 - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_NIOS2 - depends on !ADK_TARGET_ARCH_OR1K - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_ARCH_SPARC - depends on !ADK_TARGET_BOARD_ATH79 - depends on !ADK_TARGET_BOARD_BCM28XX - depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - depends on !ADK_TARGET_SYSTEM_KINETIS_K70 - depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 - depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 - depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 - depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 - -config ADK_TARGET_KERNEL_VERSION_2_6_32 - bool "2.6.32.70" - depends on !ADK_TARGET_ARCH_ARC - depends on !ADK_TARGET_ARCH_BFIN - depends on !ADK_TARGET_ARCH_CSKY - depends on !ADK_TARGET_ARCH_H8300 - depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_NIOS2 - depends on !ADK_TARGET_ARCH_OR1K - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 - depends on !ADK_TARGET_BOARD_ATH79 - depends on !ADK_TARGET_BOARD_BCM28XX - depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - depends on !ADK_TARGET_SYSTEM_KINETIS_K70 - depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 - depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2 - depends on !ADK_TARGET_CPU_MIPS_MIPS32R6 - depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6 - depends on !ADK_TARGET_SYSTEM_ORANGE_PI0 - -endchoice - -config ADK_TARGET_KERNEL_GIT_REPO - string "git repository" - depends on ADK_TARGET_KERNEL_VERSION_GIT - default "https://github.com/raspberrypi/linux.git" if ADK_TARGET_BOARD_BCM28XX - default "git://git.code.sf.net/p/adi-linux/code" if ADK_TARGET_SYSTEM_ADSP_BF537 - default "https://github.com/EmcraftSystems/linux-emcraft.git" if ADK_TARGET_SYSTEM_KINETIS_K70 - default "https://github.com/SolidRun/linux-fslc.git" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "https://github.com/SolidRun/linux-armada38x.git" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG - default "https://github.com/beagleboard/linux.git" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - default "https://git.phytec.de/git/linux-ti.git" if ADK_TARGET_SYSTEM_PHYTEC_WEGA - default "https://github.com/m-labs/linux-milkymist.git" if ADK_TARGET_ARCH_LM32 - default "https://github.com/c-sky/linux-4.9.y.git" if ADK_TARGET_ARCH_CSKY - default "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" - help - GIT repository to use. - -config ADK_TARGET_KERNEL_GIT_REPO_NAME - string - depends on ADK_TARGET_KERNEL_VERSION_GIT - default "csky" if ADK_TARGET_ARCH_CSKY - default "lm32" if ADK_TARGET_ARCH_LM32 - default "rpi" if ADK_TARGET_BOARD_BCM28XX - default "ad" if ADK_TARGET_SYSTEM_ADSP_BF537 - default "bb" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - default "emcraft" if ADK_TARGET_SYSTEM_KINETIS_K70 - default "phytec" if ADK_TARGET_SYSTEM_PHYTEC_WEGA - default "clearfog" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG - default "fslc" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "linus" - -config ADK_TARGET_KERNEL_GIT - string "git version" - depends on ADK_TARGET_KERNEL_VERSION_GIT - default "6064a9bdf48cefbccc4f6472dd04251f0dec1931" if ADK_TARGET_ARCH_CSKY - default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 - default "31a8651c138253007c66e1be176cdc839b416842" if ADK_TARGET_BOARD_BCM28XX - default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537 - default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70 - default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG - default "c85fbc86c61a8c8fd45ab1fe3d1bdd2df12f7962" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "8624998967676862843aed1f8ee2141e98987f81" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - default "v4.4.52-phy" if ADK_TARGET_SYSTEM_PHYTEC_WEGA - -config ADK_TARGET_KERNEL_GIT_VER - string "kernel version" - depends on ADK_TARGET_KERNEL_VERSION_GIT - default "4.9.56" if ADK_TARGET_ARCH_CSKY - default "4.9.70" if ADK_TARGET_BOARD_BCM28XX - default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK - default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA - default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70 - default "3.14.79" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - -config ADK_TARGET_KERNEL_GIT_TYPE - string - depends on ADK_TARGET_KERNEL_VERSION_GIT - default "branch" if ADK_TARGET_SYSTEM_PHYTEC_WEGA - default "hash" - -config ADK_TARGET_KERNEL_NO_MIRROR - bool - help - Select this if the kernel source is only available - on OpenADK webserver. diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index aa452d980..9453328ab 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -3,7 +3,7 @@ choice prompt "C library" -default ADK_TARGET_LIB_UCLIBC_NG if ADK_TARGET_OS_LINUX +default ADK_TARGET_LIB_UCLIBC_NG if ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX config ADK_TARGET_LIB_UCLIBC_NG bool "uClibc-ng embedded C library" @@ -37,9 +37,9 @@ config ADK_TARGET_LIB_UCLIBC_NG ADK_TARGET_ARCH_SPARC64 || \ ADK_TARGET_ARCH_X86 || \ ADK_TARGET_ARCH_X86_64 || \ - ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_OS_LINUX + ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX help - http://uclibc-ng.org + https://uclibc-ng.org config ADK_TARGET_LIB_MUSL bool "musl C library" diff --git a/target/config/Config.in.os b/target/config/Config.in.os index 7fff1d521..797567ce1 100644 --- a/target/config/Config.in.os +++ b/target/config/Config.in.os @@ -9,6 +9,11 @@ config ADK_TARGET_OS_LINUX help Create a Linux system or toolchain. +config ADK_TARGET_OS_WALDUX + bool "Waldux" + help + Create a Waldux system or toolchain. + config ADK_TARGET_OS_BAREMETAL bool "Bare metal" help @@ -34,6 +39,7 @@ endchoice config ADK_TARGET_OS string default "linux" if ADK_TARGET_OS_LINUX + default "waldux" if ADK_TARGET_OS_WALDUX default "frosted" if ADK_TARGET_OS_FROSTED default "rtems5.0.0" if ADK_TARGET_OS_RTEMS default "zephyr" if ADK_TARGET_OS_ZEPHYR diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 61fc8ff0c..0e82835b9 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -15,24 +15,42 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY config ADK_TARGET_QEMU_WITH_BLOCK bool select ADK_TARGET_WITH_BLOCK - 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 \ + select ADK_LINUX_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB + select ADK_LINUX_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 \ + select ADK_LINUX_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 \ + select ADK_LINUX_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_MAC_ESP if ADK_TARGET_SYSTEM_QEMU_M68K_Q800 - 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_SPITZ \ + select ADK_LINUX_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 + select ADK_LINUX_KERNEL_SCSI_MAC_ESP if ADK_TARGET_SYSTEM_QEMU_M68K_Q800 + select ADK_LINUX_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC + select ADK_LINUX_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64 + select ADK_LINUX_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH + select ADK_LINUX_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER - select ADK_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 - select ADK_KERNEL_BLK_DEV_CMD64X if ADK_TARGET_SYSTEM_QEMU_ALPHA + select ADK_LINUX_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 + select ADK_LINUX_KERNEL_BLK_DEV_CMD64X if ADK_TARGET_SYSTEM_QEMU_ALPHA + select ADK_WALDUX_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB + select ADK_WALDUX_KERNEL_MTD_M25P80 if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ + || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 + select ADK_WALDUX_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_WALDUX_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \ + || ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC + select ADK_WALDUX_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 + select ADK_WALDUX_KERNEL_SCSI_MAC_ESP if ADK_TARGET_SYSTEM_QEMU_M68K_Q800 + select ADK_WALDUX_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC + select ADK_WALDUX_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64 + select ADK_WALDUX_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH + select ADK_WALDUX_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \ + || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER + select ADK_WALDUX_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 + select ADK_WALDUX_KERNEL_BLK_DEV_CMD64X if ADK_TARGET_SYSTEM_QEMU_ALPHA menu "Qemu system configuration" depends on ADK_TARGET_QEMU && (ADK_TARGET_SYSTEM_QEMU_X86_64 \ @@ -72,23 +90,40 @@ config ADK_TARGET_QEMU_WITHOUT_GRAPHIC config ADK_TARGET_QEMU_WITH_GRAPHIC bool "enabled" select ADK_TARGET_WITH_VGA - select ADK_KERNEL_VT - select ADK_KERNEL_VT_CONSOLE - select ADK_KERNEL_FONTS - select ADK_KERNEL_FONT_8x16 - select ADK_KERNEL_FB - select ADK_KERNEL_FRAMEBUFFER_CONSOLE - select ADK_KERNEL_INPUT - select ADK_KERNEL_INPUT_KEYBOARD - select ADK_KERNEL_INPUT_MOUSE - select ADK_KERNEL_INPUT_MOUSEDEV - 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_BOCHS 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 - select ADK_KERNEL_MOUSE_PS2 if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 - select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH - select ADK_KERNEL_USB_OHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH + select ADK_LINUX_KERNEL_VT + select ADK_LINUX_KERNEL_VT_CONSOLE + select ADK_LINUX_KERNEL_FONTS + select ADK_LINUX_KERNEL_FONT_8x16 + select ADK_LINUX_KERNEL_FB + select ADK_LINUX_KERNEL_FRAMEBUFFER_CONSOLE + select ADK_LINUX_KERNEL_INPUT + select ADK_LINUX_KERNEL_INPUT_KEYBOARD + select ADK_LINUX_KERNEL_INPUT_MOUSE + select ADK_LINUX_KERNEL_INPUT_MOUSEDEV + select ADK_LINUX_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 + select ADK_LINUX_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH + select ADK_LINUX_KERNEL_DRM_BOCHS if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_LINUX_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_LINUX_KERNEL_MOUSE_PS2 if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_LINUX_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH + select ADK_LINUX_KERNEL_USB_OHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH + select ADK_WALDUX_KERNEL_VT + select ADK_WALDUX_KERNEL_VT_CONSOLE + select ADK_WALDUX_KERNEL_FONTS + select ADK_WALDUX_KERNEL_FONT_8x16 + select ADK_WALDUX_KERNEL_FB + select ADK_WALDUX_KERNEL_FRAMEBUFFER_CONSOLE + select ADK_WALDUX_KERNEL_INPUT + select ADK_WALDUX_KERNEL_INPUT_KEYBOARD + select ADK_WALDUX_KERNEL_INPUT_MOUSE + select ADK_WALDUX_KERNEL_INPUT_MOUSEDEV + select ADK_WALDUX_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 + select ADK_WALDUX_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH + select ADK_WALDUX_KERNEL_DRM_BOCHS if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_WALDUX_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_WALDUX_KERNEL_MOUSE_PS2 if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_WALDUX_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH + select ADK_WALDUX_KERNEL_USB_OHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH endchoice @@ -115,11 +150,16 @@ config ADK_TARGET_QEMU_WITHOUT_VIRTIO config ADK_TARGET_QEMU_WITH_VIRTIO bool "enabled" - select ADK_KERNEL_VIRTIO - select ADK_KERNEL_VIRTIO_PCI - select ADK_KERNEL_VIRTIO_NET - select ADK_KERNEL_VIRTIO_BLK - select ADK_KERNEL_VIRTIO_CONSOLE + select ADK_LINUX_KERNEL_VIRTIO + select ADK_LINUX_KERNEL_VIRTIO_PCI + select ADK_LINUX_KERNEL_VIRTIO_NET + select ADK_LINUX_KERNEL_VIRTIO_BLK + select ADK_LINUX_KERNEL_VIRTIO_CONSOLE + select ADK_WALDUX_KERNEL_VIRTIO + select ADK_WALDUX_KERNEL_VIRTIO_PCI + select ADK_WALDUX_KERNEL_VIRTIO_NET + select ADK_WALDUX_KERNEL_VIRTIO_BLK + select ADK_WALDUX_KERNEL_VIRTIO_CONSOLE endchoice diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index d6ff719cd..d479c8be3 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -52,7 +52,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 depends on !ADK_TARGET_SYSTEM_QEMU_METAG - select ADK_KERNEL_BLK_DEV_INITRD + select ADK_LINUX_KERNEL_BLK_DEV_INITRD if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_BLK_DEV_INITRD if ADK_TARGET_OS_WALDUX help create an read-only initramfs system. @@ -70,7 +71,8 @@ config ADK_TARGET_ROOTFS_SQUASHFS config ADK_TARGET_ROOTFS_JFFS2 bool "Compressed read-write root filesystem (jffs2)" - select ADK_KERNEL_JFFS2_FS + select ADK_LINUX_KERNEL_JFFS2_FS if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_JFFS2_FS if ADK_TARGET_OS_WALDUX select ADK_HOST_NEED_MTD_UTILS select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on ADK_TARGET_WITH_MTD \ @@ -81,7 +83,8 @@ config ADK_TARGET_ROOTFS_JFFS2 config ADK_TARGET_ROOTFS_UBIFS bool "UBIFS root filesystem (NAND)" - select ADK_KERNEL_UBIFS_FS + select ADK_LINUX_KERNEL_UBIFS_FS if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_UBIFS_FS if ADK_TARGET_OS_WALDUX select ADK_HOST_NEED_MTD_UTILS select ADK_HOST_NEED_KERNEL2MINOR depends on ADK_TARGET_WITH_NAND @@ -90,14 +93,22 @@ config ADK_TARGET_ROOTFS_UBIFS config ADK_TARGET_ROOTFS_NFSROOT bool "NFS root" - select ADK_KERNEL_NETWORK_FILESYSTEMS - select ADK_KERNEL_SUNRPC - select ADK_KERNEL_NFS_FS - select ADK_KERNEL_NFS_V3 - select ADK_KERNEL_ROOT_NFS - select ADK_KERNEL_NFS_COMMON - select ADK_KERNEL_IP_PNP - select ADK_KERNEL_IP_PNP_DHCP + select ADK_LINUX_KERNEL_NETWORK_FILESYSTEMS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_SUNRPC if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_NFS_FS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_NFS_V3 if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_ROOT_NFS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_NFS_COMMON if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_IP_PNP if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_IP_PNP_DHCP if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_NETWORK_FILESYSTEMS if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_SUNRPC if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_NFS_FS if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_NFS_V3 if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_ROOT_NFS if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_NFS_COMMON if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_IP_PNP if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_IP_PNP_DHCP if ADK_TARGET_OS_WALDUX depends on !ADK_TARGET_QEMU && \ !ADK_TARGET_SIM && \ !ADK_TARGET_VBOX && \ @@ -109,14 +120,22 @@ config ADK_TARGET_ROOTFS_NFSROOT config ADK_TARGET_ROOTFS_USB bool "Boot from USB stick" - select ADK_KERNEL_NLS - select ADK_KERNEL_SCSI - select ADK_KERNEL_BLK_DEV_SD - select ADK_KERNEL_USB - select ADK_KERNEL_USB_EHCI_HCD - select ADK_KERNEL_USB_OHCI_HCD - select ADK_KERNEL_USB_UHCI_HCD - select ADK_KERNEL_USB_STORAGE + select ADK_LINUX_KERNEL_NLS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_SCSI if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_BLK_DEV_SD if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_USB if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_USB_EHCI_HCD if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_USB_OHCI_HCD if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_USB_UHCI_HCD if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_USB_STORAGE if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_NLS if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_SCSI if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_BLK_DEV_SD if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_USB if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_USB_EHCI_HCD if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_USB_OHCI_HCD if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_USB_UHCI_HCD if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_USB_STORAGE if ADK_TARGET_OS_WALDUX select ADK_PACKAGE_ADKINSTALL depends on ADK_TARGET_WITH_USB_BOOT \ || ADK_TARGET_GENERIC @@ -125,10 +144,14 @@ config ADK_TARGET_ROOTFS_USB config ADK_TARGET_ROOTFS_ISO bool "ISO image" - select ADK_KERNEL_ISO9660_FS - select ADK_KERNEL_JOLIET - select ADK_KERNEL_SCSI - select ADK_KERNEL_BLK_DEV_SR + select ADK_LINUX_KERNEL_ISO9660_FS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_JOLIET if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_SCSI if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_BLK_DEV_SR if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_ISO9660_FS if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_JOLIET if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_SCSI if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_BLK_DEV_SR if ADK_TARGET_OS_WALDUX select ADK_HOST_NEED_CDRTOOLS select ADK_HOST_NEED_SYSLINUX depends on ADK_TARGET_ARCH_X86 @@ -141,14 +164,16 @@ config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE && !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 \ && !ADK_TARGET_SYSTEM_QEMU_METAG \ && !ADK_TARGET_SIM - select ADK_KERNEL_BLK_DEV_INITRD + select ADK_LINUX_KERNEL_BLK_DEV_INITRD if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_BLK_DEV_INITRD if ADK_TARGET_OS_WALDUX help Use this option if your planning to create a initramfs. config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for ext4 filesystems" select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX - select ADK_KERNEL_EXT4_FS + select ADK_LINUX_KERNEL_EXT4_FS if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_EXT4_FS if ADK_TARGET_OS_WALDUX select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on !ADK_TARGET_SIM \ && !ADK_TARGET_ARCH_NDS32 \ @@ -161,8 +186,10 @@ config ADK_TARGET_ROOTFS_ARCHIVE config ADK_TARGET_ROOTFS_GENIMAGE bool "Create a disk image for the target" - select ADK_KERNEL_EXT4_FS - select ADK_KERNEL_VFAT_FS + select ADK_LINUX_KERNEL_EXT4_FS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_VFAT_FS if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_EXT4_FS if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_VFAT_FS if ADK_TARGET_OS_WALDUX select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU select ADK_TARGET_QEMU_WITH_BOOTLOADER if ADK_TARGET_QEMU select ADK_HOST_BUILD_GENIMAGE diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 74caa19e8..88fe079d1 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -56,8 +56,10 @@ default ADK_RUNTIME_DEV_MDEV config ADK_RUNTIME_DEV_MDEV bool "Use mdev" - select ADK_KERNEL_DEVTMPFS - select ADK_KERNEL_DEVTMPFS_MOUNT + select ADK_LINUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_WALDUX depends on ADK_PACKAGE_BUSYBOX depends on !ADK_RUNTIME_INIT_SYSTEMD @@ -66,14 +68,18 @@ config ADK_RUNTIME_DEV_UDEV select ADK_PACKAGE_UDEV # needs depmod for module dependency generation on host select ADK_HOST_BUILD_KMOD - select ADK_KERNEL_DEVTMPFS - select ADK_KERNEL_DEVTMPFS_MOUNT + select ADK_LINUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_WALDUX depends on !ADK_RUNTIME_INIT_SYSTEMD config ADK_RUNTIME_DEV_SYSTEMD_UDEV bool "Use systemd udev" - select ADK_KERNEL_DEVTMPFS - select ADK_KERNEL_DEVTMPFS_MOUNT + select ADK_LINUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_LINUX + select ADK_LINUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_LINUX + select ADK_WALDUX_KERNEL_DEVTMPFS if ADK_TARGET_OS_WALDUX + select ADK_WALDUX_KERNEL_DEVTMPFS_MOUNT if ADK_TARGET_OS_WALDUX depends on ADK_RUNTIME_INIT_SYSTEMD config ADK_RUNTIME_DEV_STATIC @@ -220,6 +226,7 @@ config ADK_RUNTIME_DEFAULT_LOCALE choice prompt "bootup messages from kernel" +default ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY if ADK_TARGET_QEMU config ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY bool "output via VGA only" diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 75e885f65..0a6011917 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. choice -depends on ADK_TARGET_OS_LINUX +depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX bool "Library support" config ADK_TARGET_USE_SHARED_LIBS_ONLY @@ -160,7 +160,7 @@ config ADK_STATIC_TOOLCHAIN config ADK_PRELINK bool "Prelink binaries and libraries in Image" - depends on ADK_TARGET_OS_LINUX + depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX help Do prelinking for faster loading of binaries. diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 074989fc9..1049b173f 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -304,11 +304,11 @@ source "target/config/Config.in.prereq" config ADK_COMPRESSION_TOOL string - default "gzip -n9" if ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP - default "bzip2" if ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2 - default "xz -v --check=crc32 --lzma2=dict=1MiB" if ADK_KERNEL_INITRAMFS_COMPRESSION_XZ - default "lz4c -l" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZ4 - default "lzma -9" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA - default "lzop" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZO + default "gzip -n9" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_GZIP || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_GZIP + default "bzip2" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_BZIP2 || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_BZIP2 + default "xz -v --check=crc32 --lzma2=dict=1MiB" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_XZ || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_XZ + default "lz4c -l" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZ4 || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_LZ4 + default "lzma -9" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZMA || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_LZMA + default "lzop" if ADK_LINUX_KERNEL_INITRAMFS_COMPRESSION_LZO || ADK_WALDUX_KERNEL_INITRAMFS_COMPRESSION_LZO default "gzip -n9" help -- cgit v1.2.3