diff options
| -rw-r--r-- | Config.in | 3 | ||||
| -rw-r--r-- | target/arm/systems/kinetis-k70 | 4 | ||||
| -rw-r--r-- | target/config/Config.in.kernelcfg (renamed from target/config/Config.in.kernel) | 36 | ||||
| -rw-r--r-- | target/config/Config.in.kernelfmt | 35 |
4 files changed, 49 insertions, 29 deletions
@@ -21,7 +21,7 @@ menu "Target configuration" source "target/config/Config.in.cpu" source "target/config/Config.in.hardware" source "target/config/Config.in.boards" -source "target/config/Config.in.kernel" +source "target/config/Config.in.kernelfmt" source "target/config/Config.in.arch" source "target/config/Config.in.system" source "target/config/Config.in.subsystem" @@ -96,6 +96,7 @@ menu "Kernel configuration" visible if !ADK_CHOOSE_APPLIANCE && ADK_TARGET_KERNEL_CUSTOMISING source "target/config/Config.in.kernelversion" +source "target/config/Config.in.kernelcfg" source "target/linux/Config.in" endmenu diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70 index 96dca0071..7afe39a21 100644 --- a/target/arm/systems/kinetis-k70 +++ b/target/arm/systems/kinetis-k70 @@ -9,8 +9,8 @@ config ADK_TARGET_SYSTEM_KINETIS_K70 select ADK_TARGET_WITH_BLOCK select ADK_TARGET_UCLINUX select ADK_TARGET_KERNEL_UIMAGE - select ADK_KERNEL_REPO "https://github.com/EmcraftSystems/linux-emcraft.git" - select ADK_KERNEL_HASH "a5125a7f66b441008f505e4ce5d45ebb24ea28a7" + select ADK_TARGET_KERNEL_REPO "https://github.com/EmcraftSystems/linux-emcraft.git" + select ADK_TARGET_KERNEL_HASH "a5125a7f66b441008f505e4ce5d45ebb24ea28a7" help Kinetis K70 diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernelcfg index c03f854fd..458405198 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernelcfg @@ -1,40 +1,24 @@ # 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_KERNEL_VMLINUZ - bool +choice +prompt "Kernel configuration" -config ADK_TARGET_KERNEL_ZIMAGE - bool +config ADK_TARGET_KERNEL_USE_MINICONFIG + bool "Use mini.config from OpenADK" -config ADK_TARGET_KERNEL_LINUXBIN - bool +config ADK_TARGET_KERNEL_USE_DEFCONFIG + bool "Use defconfig from Linux kernel" -config ADK_TARGET_KERNEL_IMAGE - bool +endchoice -config ADK_TARGET_KERNEL_UIMAGE - bool - -config ADK_TARGET_KERNEL_BZIMAGE - bool - -config ADK_TARGET_KERNEL_VMLINUX_AOUT - bool - -config ADK_TARGET_KERNEL +config ADK_TARGET_KERNEL_DEFCONFIG string - default "uImage" if ADK_TARGET_KERNEL_UIMAGE - default "zImage" if ADK_TARGET_KERNEL_ZIMAGE - default "Image" if ADK_TARGET_KERNEL_IMAGE - default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN - default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ - default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE - default "vmlinux.aout" if ADK_TARGET_KERNEL_VMLINUX_AOUT - default "vmlinux" + 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 diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt new file mode 100644 index 000000000..6c7180b0e --- /dev/null +++ b/target/config/Config.in.kernelfmt @@ -0,0 +1,35 @@ +# 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_KERNEL_VMLINUZ + bool + +config ADK_TARGET_KERNEL_ZIMAGE + bool + +config ADK_TARGET_KERNEL_LINUXBIN + bool + +config ADK_TARGET_KERNEL_IMAGE + bool + +config ADK_TARGET_KERNEL_UIMAGE + bool + +config ADK_TARGET_KERNEL_BZIMAGE + bool + +config ADK_TARGET_KERNEL_VMLINUX_AOUT + bool + +config ADK_TARGET_KERNEL + string + default "uImage" if ADK_TARGET_KERNEL_UIMAGE + default "zImage" if ADK_TARGET_KERNEL_ZIMAGE + default "Image" if ADK_TARGET_KERNEL_IMAGE + default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN + default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ + default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE + default "vmlinux.aout" if ADK_TARGET_KERNEL_VMLINUX_AOUT + default "vmlinux" + |