From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- Config.in | 147 +--- mk/build.mk | 13 +- mk/image.mk | 20 +- mk/vars.mk | 10 +- scripts/update-sys | 56 +- target/aarch64/sys-available/toolchain-aarch64 | 2 +- target/arm/sys-available/cubox-i | 4 +- target/arm/sys-available/qemu-arm | 5 +- target/arm/sys-available/qemu-armhf | 12 - target/arm/sys-available/raspberry-pi | 2 +- target/arm/sys-available/toolchain-arm | 8 +- target/arm/sys-available/toolchain-armhf | 14 - target/config/Config.in | 755 +-------------------- target/config/Config.in.abi | 5 + target/config/Config.in.abi.choice | 36 + target/config/Config.in.abi.default | 64 ++ target/config/Config.in.adk | 45 +- target/config/Config.in.arch.choice | 14 +- target/config/Config.in.arch.default | 7 + target/config/Config.in.arm | 5 + target/config/Config.in.arm.choice | 34 + target/config/Config.in.arm.default | 25 + target/config/Config.in.cpu | 129 ++++ target/config/Config.in.endian | 5 + target/config/Config.in.endian.choice | 17 + target/config/Config.in.endian.default | 18 + target/config/Config.in.hardware | 3 + target/config/Config.in.kernel | 57 ++ target/config/Config.in.kernelversion | 6 + target/config/Config.in.kernelversion.choice | 44 ++ target/config/Config.in.kernelversion.default | 15 + target/config/Config.in.libc | 5 + target/config/Config.in.libc.choice | 44 ++ target/config/Config.in.libc.default | 44 ++ target/config/Config.in.qemu | 102 +-- target/config/Config.in.qemuopts | 91 +++ target/config/Config.in.system.choice | 1 + target/config/Config.in.target | 272 ++++++++ target/config/Config.in.toolchain | 104 +++ target/config/Config.in.tools | 10 + target/config/Config.in.x86 | 5 + target/config/Config.in.x86.choice | 24 + target/config/Config.in.x86.default | 22 + target/linux/config/Config.in.kernel | 49 ++ target/m68k/sys-available/toolchain-m68k | 2 +- target/microblaze/sys-available/qemu-microblaze | 8 +- target/microblaze/sys-available/qemu-microblazeel | 11 - .../microblaze/sys-available/toolchain-microblaze | 7 +- .../sys-available/toolchain-microblazeel | 10 - target/mips/Makefile | 17 +- target/mips/kernel/lemote-yeelong | 18 - target/mips/kernel/qemu-mips | 1 - target/mips/kernel/qemu-mips64 | 9 - target/mips/kernel/qemu-mips64el | 9 - target/mips/kernel/qemu-mipsel | 7 - target/mips/sys-available/lemote-yeelong | 19 - target/mips/sys-available/qemu-mips | 7 +- target/mips/sys-available/qemu-mips64 | 13 - target/mips/sys-available/qemu-mips64el | 12 - target/mips/sys-available/qemu-mips64eln32 | 12 - target/mips/sys-available/qemu-mips64eln64 | 12 - target/mips/sys-available/qemu-mips64n32 | 13 - target/mips/sys-available/qemu-mips64n64 | 13 - target/mips/sys-available/qemu-mipsel | 10 - target/mips/sys-available/toolchain-mips | 7 +- target/mips/sys-available/toolchain-mips64 | 12 - target/mips/sys-available/toolchain-mips64el | 12 - target/mips/sys-available/toolchain-mips64eln32 | 12 - target/mips/sys-available/toolchain-mips64eln64 | 12 - target/mips/sys-available/toolchain-mips64n32 | 12 - target/mips/sys-available/toolchain-mips64n64 | 12 - target/mips/sys-available/toolchain-mipsel | 10 - target/mips64/Config.in | 9 + target/mips64/Makefile | 111 +++ target/mips64/kernel/lemote-yeelong | 18 + target/mips64/kernel/qemu-mips64 | 9 + target/mips64/sys-available/lemote-yeelong | 19 + target/mips64/sys-available/qemu-mips64 | 11 + target/mips64/sys-available/toolchain-mips64 | 11 + target/mips64/target.mk | 4 + target/mips64/uclibc.config | 263 +++++++ target/ppc/sys-available/qemu-ppc | 4 +- target/ppc/sys-available/toolchain-ppc | 4 +- target/ppc64/sys-available/qemu-ppc64 | 4 +- target/ppc64/sys-available/toolchain-ppc64 | 4 +- target/sh/sys-available/qemu-sh4 | 7 +- target/sh/sys-available/qemu-sh4eb | 11 - target/sh/sys-available/toolchain-sh4 | 7 +- target/sh/sys-available/toolchain-sh4eb | 11 - target/sparc/sys-available/qemu-sparc | 4 +- target/sparc/sys-available/toolchain-sparc | 4 +- target/sparc64/sys-available/qemu-sparc64 | 4 +- target/sparc64/sys-available/toolchain-sparc64 | 4 +- target/tarch.lst | 10 - target/x86/sys-available/generic-pc | 5 +- target/x86/sys-available/ibm-x40 | 1 + target/x86/sys-available/qemu-i486 | 10 - target/x86/sys-available/qemu-i686 | 10 - target/x86/sys-available/qemu-x86 | 9 + target/x86/sys-available/qemu-x86_64-32 | 11 - target/x86/sys-available/toolchain-i686 | 10 - target/x86/sys-available/toolchain-x86 | 9 + target/x86_64/sys-available/qemu-x86_64 | 5 +- target/x86_64/sys-available/qemu-x86_64_x32 | 12 - target/x86_64/sys-available/toolchain-x86_64 | 5 +- target/x86_64/sys-available/toolchain-x86_64_x32 | 12 - toolchain/binutils/Makefile | 6 +- toolchain/gcc/Makefile | 4 +- 108 files changed, 1741 insertions(+), 1550 deletions(-) delete mode 100644 target/arm/sys-available/qemu-armhf delete mode 100644 target/arm/sys-available/toolchain-armhf create mode 100644 target/config/Config.in.abi create mode 100644 target/config/Config.in.abi.choice create mode 100644 target/config/Config.in.abi.default create mode 100644 target/config/Config.in.arm create mode 100644 target/config/Config.in.arm.choice create mode 100644 target/config/Config.in.arm.default create mode 100644 target/config/Config.in.cpu create mode 100644 target/config/Config.in.endian create mode 100644 target/config/Config.in.endian.choice create mode 100644 target/config/Config.in.endian.default create mode 100644 target/config/Config.in.kernel create mode 100644 target/config/Config.in.kernelversion create mode 100644 target/config/Config.in.kernelversion.choice create mode 100644 target/config/Config.in.kernelversion.default create mode 100644 target/config/Config.in.libc create mode 100644 target/config/Config.in.libc.choice create mode 100644 target/config/Config.in.libc.default create mode 100644 target/config/Config.in.qemuopts create mode 100644 target/config/Config.in.target create mode 100644 target/config/Config.in.toolchain create mode 100644 target/config/Config.in.x86 create mode 100644 target/config/Config.in.x86.choice create mode 100644 target/config/Config.in.x86.default delete mode 100644 target/microblaze/sys-available/qemu-microblazeel delete mode 100644 target/microblaze/sys-available/toolchain-microblazeel delete mode 100644 target/mips/kernel/lemote-yeelong delete mode 100644 target/mips/kernel/qemu-mips64 delete mode 100644 target/mips/kernel/qemu-mips64el delete mode 100644 target/mips/kernel/qemu-mipsel delete mode 100644 target/mips/sys-available/lemote-yeelong delete mode 100644 target/mips/sys-available/qemu-mips64 delete mode 100644 target/mips/sys-available/qemu-mips64el delete mode 100644 target/mips/sys-available/qemu-mips64eln32 delete mode 100644 target/mips/sys-available/qemu-mips64eln64 delete mode 100644 target/mips/sys-available/qemu-mips64n32 delete mode 100644 target/mips/sys-available/qemu-mips64n64 delete mode 100644 target/mips/sys-available/qemu-mipsel delete mode 100644 target/mips/sys-available/toolchain-mips64 delete mode 100644 target/mips/sys-available/toolchain-mips64el delete mode 100644 target/mips/sys-available/toolchain-mips64eln32 delete mode 100644 target/mips/sys-available/toolchain-mips64eln64 delete mode 100644 target/mips/sys-available/toolchain-mips64n32 delete mode 100644 target/mips/sys-available/toolchain-mips64n64 delete mode 100644 target/mips/sys-available/toolchain-mipsel create mode 100644 target/mips64/Config.in create mode 100644 target/mips64/Makefile create mode 100644 target/mips64/kernel/lemote-yeelong create mode 100644 target/mips64/kernel/qemu-mips64 create mode 100644 target/mips64/sys-available/lemote-yeelong create mode 100644 target/mips64/sys-available/qemu-mips64 create mode 100644 target/mips64/sys-available/toolchain-mips64 create mode 100644 target/mips64/target.mk create mode 100644 target/mips64/uclibc.config delete mode 100644 target/sh/sys-available/qemu-sh4eb delete mode 100644 target/sh/sys-available/toolchain-sh4eb delete mode 100644 target/x86/sys-available/qemu-i486 delete mode 100644 target/x86/sys-available/qemu-i686 create mode 100644 target/x86/sys-available/qemu-x86 delete mode 100644 target/x86/sys-available/qemu-x86_64-32 delete mode 100644 target/x86/sys-available/toolchain-i686 create mode 100644 target/x86/sys-available/toolchain-x86 delete mode 100644 target/x86_64/sys-available/qemu-x86_64_x32 delete mode 100644 target/x86_64/sys-available/toolchain-x86_64_x32 diff --git a/Config.in b/Config.in index 892fab4a4..de2c0225e 100644 --- a/Config.in +++ b/Config.in @@ -1,10 +1,6 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -config MODULES - bool - default y - config ADK_HAVE_DOT_CONFIG bool default y @@ -18,6 +14,7 @@ config ADK_CHOOSE_TARGET_SYSTEM default y if ADK_CHOOSE_TARGET_SYSTEM_M68K default y if ADK_CHOOSE_TARGET_SYSTEM_MICROBLAZE default y if ADK_CHOOSE_TARGET_SYSTEM_MIPS + default y if ADK_CHOOSE_TARGET_SYSTEM_MIPS64 default y if ADK_CHOOSE_TARGET_SYSTEM_PPC default y if ADK_CHOOSE_TARGET_SYSTEM_PPC64 default y if ADK_CHOOSE_TARGET_SYSTEM_SPARC @@ -27,6 +24,20 @@ config ADK_CHOOSE_TARGET_SYSTEM default y if ADK_CHOOSE_TARGET_SYSTEM_X86_64 default n +source "target/config/Config.in.cpu" +source "target/config/Config.in.hardware" +source "target/config/Config.in.kernel" +source "target/config/Config.in.arch" +source "target/config/Config.in.system" +source "target/config/Config.in.endian" +source "target/config/Config.in.abi" +source "target/config/Config.in.arm" +source "target/config/Config.in.x86" +source "target/config/Config.in.qemu" +source "target/config/Config.in.kernelversion" +source "target/config/Config.in.libc" +source "target/config/Config.in.toolchain" +source "target/config/Config.in.qemuopts" source "target/config/Config.in" menu "Package collection" @@ -86,134 +97,10 @@ depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM source "target/config/Config.in.runtime" endmenu -choice -prompt "Kernel Version" -depends on ADK_TOOLCHAIN_ONLY - -config ADK_KERNEL_VERSION_TOOLCHAIN - prompt "3.14.4" - boolean - depends on ADK_TOOLCHAIN_ONLY - -endchoice - menu "Kernel configuration" -depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING - -choice -prompt "Kernel Version" -default ADK_KERNEL_VERSION_3_14_4 - -config ADK_KERNEL_VERSION_3_15_RC6 - prompt "3.15-rc6" - boolean - -config ADK_KERNEL_VERSION_3_14_4 - prompt "3.14.4" - depends on !ADK_TARGET_SYSTEM_CUBOX_I - boolean - -config ADK_KERNEL_VERSION_3_13_11 - prompt "3.13.11" - depends on !ADK_TARGET_SYSTEM_CUBOX_I - boolean - -config ADK_KERNEL_VERSION_3_12_20 - prompt "3.12.20" - depends on !ADK_TARGET_SYSTEM_CUBOX_I - boolean - -config ADK_KERNEL_VERSION_3_10_40 - prompt "3.10.40" - depends on !ADK_TARGET_SYSTEM_CUBOX_I - boolean - -config ADK_KERNEL_VERSION_3_10_30 - prompt "3.10.30" - depends on ADK_TARGET_SYSTEM_CUBOX_I - boolean - -config ADK_KERNEL_VERSION_3_4_90 - prompt "3.4.90" - depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI - depends on !ADK_TARGET_SYSTEM_CUBOX_I - boolean - -endchoice - -config ADK_KERNEL_VERSION - string - default "3.15-rc6" if ADK_KERNEL_VERSION_3_15_RC6 - default "3.14.4" if ADK_KERNEL_VERSION_3_14_4 - default "3.13.11" if ADK_KERNEL_VERSION_3_13_11 - default "3.12.20" if ADK_KERNEL_VERSION_3_12_20 - default "3.11.10" if ADK_KERNEL_VERSION_3_11_10 - default "3.10.40" if ADK_KERNEL_VERSION_3_10_40 - default "3.10.30" if ADK_KERNEL_VERSION_3_10_30 - default "3.4.90" if ADK_KERNEL_VERSION_3_4_90 - help - -config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI - boolean - select ADK_KERNEL_RD_GZIP - select ADK_KERNEL_KERNEL_GZIP - select ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP - depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y - -choice -prompt "Kernel Compression" -depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_MIKROTIK_RB532 - -config ADK_KERNEL_COMP_XZ - prompt "use XZ compression" - boolean - select ADK_KERNEL_RD_XZ - select ADK_KERNEL_KERNEL_XZ - select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ - -config ADK_KERNEL_COMP_LZMA - prompt "use LZMA compression" - boolean - select ADK_KERNEL_RD_LZMA - select ADK_KERNEL_KERNEL_LZMA - select ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA - -config ADK_KERNEL_COMP_LZO - prompt "use LZO compression" - boolean - select ADK_KERNEL_RD_LZO - select ADK_KERNEL_KERNEL_LZO - select ADK_KERNEL_INITRAMFS_COMPRESSION_LZO - -config ADK_KERNEL_COMP_GZIP - prompt "use GZIP compression" - boolean - select ADK_KERNEL_RD_GZIP - select ADK_KERNEL_KERNEL_GZIP - select ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP - -config ADK_KERNEL_COMP_BZIP2 - prompt "use BZIP2 compression" - boolean - select ADK_KERNEL_RD_BZIP2 - select ADK_KERNEL_KERNEL_BZIP2 - select ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2 - -endchoice - -config ADK_COMPRESSION_TOOL - string - default "gzip -n9" if ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP - default "bzip2" if ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2 - default "xz --check=crc32" if ADK_KERNEL_INITRAMFS_COMPRESSION_XZ - default "lzma -9" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA - default "lzop" if ADK_KERNEL_INITRAMFS_COMPRESSION_LZO - default "gzip -n9" - help - +depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM source "target/linux/Config.in" endmenu +source "target/config/Config.in.target" source "target/config/Config.in.adk" -source "toolchain/Config.in" diff --git a/mk/build.mk b/mk/build.mk index b59fa65f1..98f5ce3ee 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -35,10 +35,9 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PKG_TEST=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ - ADK_TOOLCHAIN_USE_SSP=n \ - ADK_TOOLCHAIN_USE_LTO=n \ - ADK_TOOLCHAIN_GOLD=n \ - ADK_TOOLCHAIN_USE_GOLD=n \ + ADK_TOOLCHAIN_WITH_SSP=n \ + ADK_TOOLCHAIN_WITH_LTO=n \ + ADK_TOOLCHAIN_WITH_GOLD=n \ ADK_LINUX_ARM_WITH_THUMB=n \ BUSYBOX_IFPLUGD=n \ BUSYBOX_EXTRA_COMPAT=n \ @@ -114,12 +113,6 @@ POSTCONFIG= -@\ touch .rebuild.bkeymaps;\ rebuild=1;\ fi; \ - if [ "$$(grep ^ADK_KERNEL_VERSION_ .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION_ .config.old|md5sum)" ];then \ - make kernelclean;\ - fi; \ - if [ "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config|md5sum)" != "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config.old|md5sum)" ];then \ - echo "You should make cleandir, after changing thumb mode";\ - fi; \ if [ $$rebuild -eq 1 ];then \ cp .config .config.old;\ fi; \ diff --git a/mk/image.mk b/mk/image.mk index 9c657d404..62ac155f8 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -64,8 +64,8 @@ endif ifeq ($(ADK_LINUX_X86_64),y) ifeq ($(ADK_TARGET_ABI_32),) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} @@ -75,8 +75,8 @@ endif endif ifeq ($(ADK_LINUX_PPC64),y) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} @@ -85,8 +85,8 @@ ifeq ($(ADK_LINUX_PPC64),y) endif ifeq ($(ADK_LINUX_SPARC64),y) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} @@ -95,8 +95,8 @@ ifeq ($(ADK_LINUX_SPARC64),y) endif ifeq ($(ADK_TARGET_ABI_N32),y) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} @@ -105,8 +105,8 @@ ifeq ($(ADK_TARGET_ABI_N32),y) endif ifeq ($(ADK_TARGET_ABI_N64),y) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} diff --git a/mk/vars.mk b/mk/vars.mk index 30bf39247..12b26084d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -113,13 +113,13 @@ TARGET_CXXFLAGS+= -static TARGET_LDFLAGS+= -static endif -ifneq ($(ADK_TOOLCHAIN_USE_SSP),) -TARGET_CFLAGS+= -fstack-protector -TARGET_CXXFLAGS+= -fstack-protector -TARGET_LDFLAGS+= -fstack-protector +ifneq ($(ADK_TARGET_USE_SSP),) +TARGET_CFLAGS+= -fstack-protector-all +TARGET_CXXFLAGS+= -fstack-protector-all +TARGET_LDFLAGS+= -fstack-protector-all endif -ifneq ($(ADK_TOOLCHAIN_USE_LTO),) +ifneq ($(ADK_TARGET_USE_LTO),) TARGET_CFLAGS+= -flto TARGET_CXXFLAGS+= -flto TARGET_LDFLAGS+= -flto diff --git a/scripts/update-sys b/scripts/update-sys index 47b73d52b..e4f584c33 100755 --- a/scripts/update-sys +++ b/scripts/update-sys @@ -1,62 +1,16 @@ #!/usr/bin/env bash -#set -x -# 1. create Config.in.systems with all available target systems for each architecture -# 2. if ADK configuration exist, create Config.in.arch/Config.in.system with fixed values -# 3. exit when native system build is detected +# create Config.in.systems with all available target systems for each architecture topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P)) -defaults() { - echo 'source "target/config/Config.in.arch.default"' > $topdir/target/config/Config.in.arch - echo 'source "target/config/Config.in.arch.choice"' >> $topdir/target/config/Config.in.arch - echo 'source "target/config/Config.in.system.default"' > $topdir/target/config/Config.in.system - echo 'source "target/config/Config.in.system.choice"' >> $topdir/target/config/Config.in.system - exit 0 -} +echo 'source "target/config/Config.in.arch.default"' > $topdir/target/config/Config.in.arch +echo 'source "target/config/Config.in.arch.choice"' >> $topdir/target/config/Config.in.arch +echo 'source "target/config/Config.in.system.default"' > $topdir/target/config/Config.in.system +echo 'source "target/config/Config.in.system.choice"' >> $topdir/target/config/Config.in.system for i in $(ls $topdir/target/);do if [ -d "$topdir/target/$i/sys-enabled" ];then cat $topdir/target/$i/sys-enabled/* > $topdir/target/$i/Config.in.systems 2>/dev/null fi done -if [ -f $topdir/.config ];then - -arch=$(grep ^ADK_TARGET_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') -cpuarch=$(grep ^ADK_TARGET_CPU_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') -systemsym=$(grep ^ADK_TARGET_SYSTEM_ $topdir/.config|cut -f 1 -d =) -system=$(grep ^ADK_TARGET_SYSTEM= $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') -systems=$(grep ^ADK_TARGET_SYSTEM= $topdir/.config|cut -f 2 -d = | sed -e 's#"##g'|sed -e 's#-#_#g') -archsym=$(echo ADK_LINUX_$arch|tr '[:lower:]' '[:upper:]') - -if [ -z "$arch" -o -z "$system" ];then - defaults -fi - -cat > $topdir/target/config/Config.in.arch << EOF -source "target/config/Config.in.arch.default" -config $archsym - boolean -EOF - -if [ "${system}" = "toolchain" -o "${system}" = "qemu" -o "${system}" = "vbox" -o "${system}" = "aranym" ];then - sys=${system}-$cpuarch -else - sys=$system -fi - -cat > $topdir/target/config/Config.in.system << EOF -source "target/config/Config.in.system.default" -comment "Architecture: $arch" -comment "CPU Architecture: $cpuarch" -comment "System: $sys" - -config $systemsym - boolean - select $archsym -$(grep select $topdir/target/$arch/sys-available/$sys) - default y -EOF -else - defaults -fi exit 0 diff --git a/target/aarch64/sys-available/toolchain-aarch64 b/target/aarch64/sys-available/toolchain-aarch64 index 638c3cdcf..bcdfd2289 100644 --- a/target/aarch64/sys-available/toolchain-aarch64 +++ b/target/aarch64/sys-available/toolchain-aarch64 @@ -6,9 +6,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64 select ADK_soft_float select ADK_fpu_vfp select ADK_eabi - select ADK_TOOLCHAIN select ADK_CPU_ARMV8 select ADK_LINUX_64 + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help AARCH64 toolchain. diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i index 2dce4fb31..d3edb99c6 100644 --- a/target/arm/sys-available/cubox-i +++ b/target/arm/sys-available/cubox-i @@ -2,11 +2,11 @@ config ADK_TARGET_SYSTEM_CUBOX_I bool "Cubox-i" select ADK_arm select ADK_little - select ADK_hard_float select ADK_eabihf select ADK_fpu_neon select ADK_cubox_i select ADK_CPU_CORTEX_A9 + select ADK_TARGET_CPU_WITH_FPU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_CPU_FREQ select ADK_TARGET_WITH_USB @@ -22,5 +22,5 @@ config ADK_TARGET_SYSTEM_CUBOX_I select ADK_TARGET_WITH_ROOT_RW select ADK_PACKAGE_U_BOOT_IMX6 help - Cubox-i + Solidrun Cubox-i diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm index 1fa057c4b..848179629 100644 --- a/target/arm/sys-available/qemu-arm +++ b/target/arm/sys-available/qemu-arm @@ -3,9 +3,8 @@ config ADK_TARGET_SYSTEM_QEMU_ARM select ADK_arm select ADK_qemu_arm select ADK_little - select ADK_soft_float select ADK_eabi - select ADK_HARDWARE_QEMU + select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE help - Support for Qemu Emulator (arm). + Qemu Emulator for arm architecture. diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf deleted file mode 100644 index dab039931..000000000 --- a/target/arm/sys-available/qemu-armhf +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_ARMHF - bool "Qemu Emulator (hard-float)" - select ADK_arm - select ADK_qemu_armhf - select ADK_little - select ADK_hard_float - select ADK_eabihf - select ADK_fpu_vfp - select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_ZIMAGE - help - Support for Qemu Emulator (armhf). diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 6326a1e57..45fd531d3 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -2,11 +2,11 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI bool "Raspberry PI" select ADK_arm select ADK_little - select ADK_hard_float select ADK_eabihf select ADK_fpu_vfp select ADK_raspberry_pi select ADK_CPU_ARM1176JZF_S + select ADK_TARGET_CPU_WITH_FPU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_CPU_FREQ select ADK_TARGET_WITH_USB diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index 876bcd84a..a98f9c225 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -1,12 +1,10 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM - bool "Toolchain only (soft float)" + bool "Toolchain only" select ADK_arm select ADK_toolchain_arm select ADK_little - select ADK_soft_float select ADK_eabi - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ - select ADK_CPU_CORTEX_A9 help - ARM toolchain (soft float) for Cortex A9. + ARM toolchain. diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf deleted file mode 100644 index 252a41aa2..000000000 --- a/target/arm/sys-available/toolchain-armhf +++ /dev/null @@ -1,14 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF - bool "Toolchain only (hard float)" - select ADK_arm - select ADK_little - select ADK_hard_float - select ADK_eabihf - select ADK_fpu_vfp - select ADK_toolchain_armhf - select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - select ADK_CPU_CORTEX_A9 - help - ARM toolchain (hard float) for Cortex A9. - diff --git a/target/config/Config.in b/target/config/Config.in index 25582aa5b..edabfa5e3 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -1,245 +1,20 @@ # 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 - boolean - -config ADK_TARGET_KERNEL_ZIMAGE - boolean - -config ADK_TARGET_KERNEL_LINUXBIN - boolean - -config ADK_TARGET_KERNEL_IMAGE - boolean - -config ADK_TARGET_KERNEL_UIMAGE - boolean - -config ADK_TARGET_KERNEL_BZIMAGE - boolean - -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" - -config ADK_big - boolean - -config ADK_little - boolean - -config ADK_soft_float - boolean - -config ADK_hard_float - boolean - -config ADK_fpu_neon - boolean - -config ADK_fpu_vfp - boolean - -config ADK_TARGET_FLOAT - string - default "hard" if ADK_hard_float - default "soft" if ADK_soft_float - -config ADK_TARGET_FPU - string - default "vfp" if ADK_fpu_vfp - default "neon" if ADK_fpu_neon - -config ADK_TARGET_ENDIAN - string - default "little" if ADK_little - default "big" if ADK_big - -config ADK_JFFS2_OPTS - string - default "-l" if ADK_little - default "-b" if ADK_big - -config ADK_TOOLCHAIN - boolean - -source "target/config/Config.in.arch" -source "target/config/Config.in.system" -source "target/config/Config.in.hardware" -source "target/config/Config.in.qemu" - -config ADK_LINUX_MIPS64 - boolean - default y if ADK_LINUX_MIPS && ADK_LINUX_64 - -choice -prompt "Toolchain options" -depends on ADK_TOOLCHAIN -config ADK_TOOLCHAIN_ONLY - boolean "Only build toolchain and selected packages" - -config ADK_TOOLCHAIN_ARCHIVE - boolean "Build a complete system usable f.e. via chroot" - -endchoice - -config ADK_32 - boolean - -config ADK_64 - boolean - -config ADK_x32 - boolean - -config ADK_o32 - boolean - -config ADK_n32 - boolean - -config ADK_n64 - boolean - -config ADK_eabi - boolean - -config ADK_eabihf +# global symbols +config ADK_LINUX_64 boolean -config ADK_TARGET_ABI - string - default "n32" if ADK_n32 - default "n64" if ADK_n64 - default "32" if ADK_32 - default "x32" if ADK_x32 - default "eabi" if ADK_eabi - default "eabihf" if ADK_eabihf - -config ADK_TARGET_MIPS_ABI - depends on ADK_LINUX_MIPS - string - default "32" if ADK_o32 - default "n32" if ADK_n32 - default "64" if ADK_n64 - -choice -prompt "Target ABI" -depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU - -config ADK_TARGET_ABI_N32 - boolean "N32 ABI (new)" - select ADK_n32 - -config ADK_TARGET_ABI_O32 - boolean "O32 ABI (old)" - select ADK_o32 - -config ADK_TARGET_ABI_N64 - boolean "N64 ABI" - select ADK_n64 - -endchoice - -choice -prompt "Target ABI" -depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU - -config ADK_TARGET_ABI_64 - boolean "64 Bit ABI" - select ADK_64 - -config ADK_TARGET_ABI_X32 - boolean "x32 ABI (new)" - select ADK_x32 - -config ADK_TARGET_ABI_32 - boolean "32 Bit ABI" - select ADK_32 - -endchoice - -config ADK_TARGET_LIBC_PATH - string - default "lib" if ADK_32 - default "lib32" if ADK_n32 - default "libx32" if ADK_x32 - default "lib64" if ADK_n64 \ - || ADK_64 \ - || ADK_LINUX_SPARC64 \ - || ADK_LINUX_PPC64 \ - || ADK_LINUX_X86_64 - default "lib" - -config ADK_TARGET_KERNEL_MINICONFIG - string - default "arm-fm" if ADK_TARGET_SYSTEM_ARM_FM - default "qemu-microblaze-s3adsp1800" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - 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-mips" if ADK_TARGET_SYSTEM_QEMU_MIPS - default "qemu-mipsel" if ADK_TARGET_SYSTEM_QEMU_MIPSEL - default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64 || ADK_TARGET_SYSTEM_QEMU_MIPS64N32 || ADK_TARGET_SYSTEM_QEMU_MIPS64N64 - default "qemu-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL || ADK_TARGET_SYSTEM_QEMU_MIPS64ELN32 || ADK_TARGET_SYSTEM_QEMU_MIPS64ELN64 - default "qemu-ppc" if ADK_TARGET_SYSTEM_QEMU_PPC - default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64 - default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4 - default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4EB - 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_I686 || ADK_TARGET_SYSTEM_QEMU_I486 - default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32 - default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K - default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40 - default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I - default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI - default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default "mikrotik-rb532" if ADK_TARGET_SYSTEM_MIKROTIK_RB532 - default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC - -choice -prompt "Cubox-i model" -depends on ADK_TARGET_SYSTEM_CUBOX_I - -config ADK_TARGET_CUBOX_I4PRO - boolean "Solidrun Cubox-i4Pro" - -config ADK_TARGET_CUBOX_I2ULTRA - boolean "Solidrun Cubox-i2Ultra" - -config ADK_TARGET_CUBOX_I2 - boolean "Solidrun Cubox-i2" - -config ADK_TARGET_CUBOX_I1 - boolean "Solidrun Cubox-i1" - -endchoice - -# global symbols config ADK_TARGET_KERNEL_64 boolean config ADK_TOOLCHAIN_ONLY boolean -config ADK_LINUX_64 - boolean - -config ADK_HARDWARE_QEMU +config ADK_TARGET_TOOLCHAIN boolean -config ADK_HARDWARE_VBOX +config ADK_TARGET_QEMU boolean # the inverse of ADK_TARGET_KERNEL_CUSTOMISING, @@ -253,525 +28,15 @@ config ADK_TARGET_KERNEL_CUSTOMISING default y depends on !ADK_TARGET_FIXED_KERNEL -# cpu features -config ADK_TARGET_CPU_WITH_VT - boolean - -config ADK_TARGET_CPU_WITH_MTRR - boolean - -config ADK_TARGET_CPU_WITH_MMX - boolean - -config ADK_TARGET_CPU_WITH_MMXEXT - boolean - -config ADK_TARGET_CPU_WITH_SSE - boolean - -config ADK_TARGET_CPU_WITH_SSE2 - boolean - -config ADK_TARGET_CPU_WITH_SSE3 - boolean - -config ADK_TARGET_CPU_WITH_SSSE3 - boolean - -config ADK_TARGET_CPU_WITH_IWMMXT - boolean - -# hyper threading -config ADK_TARGET_CPU_WITH_HT - boolean - -config ADK_TARGET_CPU_WITH_3DNOW - boolean - -config ADK_TARGET_CPU_WITH_3DNOWEXT - boolean - -# cpu configuration -config ADK_CPU_SH4 - boolean - -config ADK_CPU_SPARC_V8 - boolean - -config ADK_CPU_SPARC_V9 - boolean - -config ADK_CPU_I486 - boolean - -config ADK_CPU_I586 - boolean - -config ADK_CPU_I686 - boolean - -config ADK_CPU_X86_64 - boolean - -config ADK_CPU_GEODE - boolean - -config ADK_CPU_PPC - boolean - -config ADK_CPU_PPC64 - boolean - -config ADK_CPU_PENTIUM_M - boolean - -config ADK_CPU_ATOM - boolean - -config ADK_CPU_AMDFAM10 - select ADK_TARGET_CPU_WITH_VT - boolean - -config ADK_CPU_LOONGSON2F - boolean - -config ADK_CPU_XSCALE - boolean - -config ADK_CPU_M68K - boolean - -config ADK_CPU_MIPS32 - boolean - -config ADK_CPU_MIPS64 - boolean - -config ADK_CPU_MICROBLAZE - boolean - -config ADK_CPU_ARM926EJ_S - boolean - -config ADK_CPU_ARM1176JZF_S - boolean - -config ADK_CPU_CORTEX_A9 - boolean - -config ADK_CPU_ARMV8 - boolean - -config ADK_TARGET_CPU_ARCH - string - default "x86_64" if ADK_CPU_X86_64 - default "x86_64" if ADK_CPU_AMDFAM10 - default "i486" if ADK_CPU_I486 - default "i586" if ADK_CPU_I586 - default "i686" if ADK_CPU_I686 - default "i586" if ADK_CPU_GEODE - default "i686" if ADK_CPU_PENTIUM_M - default "i686" if ADK_CPU_ATOM - default "m68k" if ADK_LINUX_M68K - default "microblaze" if ADK_LINUX_MICROBLAZE && ADK_big - default "microblazeel" if ADK_LINUX_MICROBLAZE && ADK_little - default "mips64" if ADK_LINUX_MIPS && ADK_big && ADK_LINUX_64 - default "mips64el" if ADK_LINUX_MIPS && ADK_little && ADK_LINUX_64 - default "mips" if ADK_LINUX_MIPS && ADK_big - default "mipsel" if ADK_LINUX_MIPS && ADK_little - default "aarch64" if ADK_LINUX_AARCH64 && ADK_little - default "arm" if ADK_LINUX_ARM && ADK_little - default "sparc" if ADK_LINUX_SPARC - default "sparc64" if ADK_LINUX_SPARC64 - default "sh4" if ADK_LINUX_SH && ADK_little - default "sh4eb" if ADK_LINUX_SH && ADK_big - default "ppc" if ADK_CPU_PPC - default "ppc64" if ADK_CPU_PPC64 - default "mips64el" if ADK_native && ADK_lemote_yeelong - -config ADK_TARGET_ABI_CFLAGS - string - default "-mabi=32" if ADK_o32 - default "-mabi=n32" if ADK_n32 - default "-mabi=64" if ADK_n64 - default "-m32" if ADK_32 - default "-mx32" if ADK_x32 - default "-m64" if ADK_64 - -config ADK_TARGET_CFLAGS - string - default "-m4 -ml" if ADK_CPU_SH4 && ADK_little - default "-m4 -mb" if ADK_CPU_SH4 && ADK_big - default "-march=geode" if ADK_CPU_GEODE - default "-march=i486" if ADK_CPU_I486 - default "-march=i586" if ADK_CPU_I586 - default "-march=i686" if ADK_CPU_I686 - default "-march=pentium-m" if ADK_CPU_PENTIUM_M - default "-march=atom" if ADK_CPU_ATOM - default "-march=amdfam10" if ADK_CPU_AMDFAM10 - default "-mcpu=v8" if ADK_CPU_SPARC_V8 - default "-m64 -mcpu=ultrasparc" if ADK_CPU_SPARC_V9 - default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F - default "-march=mips32" if ADK_CPU_MIPS32 - default "-march=mips64" if ADK_CPU_MIPS64 - default "-march=armv8-a" if ADK_CPU_ARMV8 - default "-march=armv5te -mtune=iwmmxt" if ADK_CPU_XSCALE - default "-march=armv5te -mtune=arm926ej-s -mfloat-abi=soft" if ADK_CPU_ARM926EJ_S && ADK_soft_float - default "-march=armv5te -mtune=arm926ej-s -mfloat-abi=hard" if ADK_CPU_ARM926EJ_S && ADK_hard_float - default "-march=armv6 -mtune=arm1176jzf-s -mfloat-abi=soft" if ADK_CPU_ARM1176JZF_S && ADK_soft_float - default "-march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" if ADK_CPU_ARM1176JZF_S && ADK_hard_float - default "-march=armv7-a -mtune=cortex-a9 -mfloat-abi=soft" if ADK_CPU_CORTEX_A9 && ADK_soft_float - default "-march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard" if ADK_CPU_CORTEX_A9 && ADK_hard_float - -config ADK_TARGET_CMDLINE - string - default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI - default "console=ttymxc0,115200 console=tty0" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_VGA - default "console=tty0 console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_SERIAL - default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_VGA - default "console=tty0 console=ttyS0,115200" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_SERIAL - default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100 - default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP - default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686 - default "console=tty0" if ADK_TARGET_SYSTEM_ARANYM_M68K - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_I686 - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_X86_64 - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_SPARC64 - default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_QEMU_PPC - default "console=hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64 - default "console=ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - default "console=ttyS0,115200" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 - default "console=ttyS0,115200" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ - default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB - default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 - default "console=ttyAMA0" if ADK_TARGET_SYSTEM_ARM_FM - default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4 - default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4EB - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 - default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 - default "" - -# c library -config ADK_uclibc - boolean - -config ADK_glibc - boolean - -config ADK_musl - boolean - -config ADK_TARGET_LIBC - string - default "uclibc" if ADK_uclibc - default "glibc" if ADK_glibc - default "musl" if ADK_musl - -choice -prompt "Target C library" -depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH -config ADK_TARGET_LIB_UCLIBC - prompt "uClibc embedded C library" - boolean - select ADK_uclibc - depends on \ - !ADK_LINUX_AARCH64 && \ - !ADK_LINUX_M68K && \ - !ADK_LINUX_MICROBLAZE && \ - !ADK_LINUX_SPARC64 && \ - !ADK_LINUX_PPC64 && \ - !ADK_x32 && \ - !ADK_32 - help - http://uclibc.org - -config ADK_TARGET_LIB_GLIBC - prompt "GNU C library" - boolean - select ADK_glibc - depends on \ - ADK_LINUX_AARCH64 || \ - ADK_LINUX_ARM || \ - ADK_LINUX_M68K || \ - ADK_LINUX_MICROBLAZE || \ - ADK_LINUX_MIPS || \ - ADK_LINUX_PPC || \ - ADK_LINUX_PPC64 || \ - ADK_LINUX_SH || \ - ADK_LINUX_SPARC || \ - ADK_LINUX_SPARC64 || \ - ADK_LINUX_X86 || \ - ADK_LINUX_X86_64 - help - http://www.gnu.org/libc - -config ADK_TARGET_LIB_MUSL - prompt "musl C library" - boolean - select ADK_musl - depends on !ADK_LINUX_MIPS64 - depends on \ - ADK_LINUX_ARM || \ - ADK_LINUX_MICROBLAZE || \ - ADK_LINUX_MIPS || \ - ADK_LINUX_PPC || \ - ADK_LINUX_SH || \ - ADK_LINUX_X86 || \ - ADK_LINUX_X86_64 - - help - http://musl-libc.org - -endchoice - -config ADK_TARGET_SUFFIX - string - default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_eabihf - default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_eabi - default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 - default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 - default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 - default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_LINUX_64 - default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_LINUX_64 - default "gnu" if ADK_TARGET_LIB_GLIBC - default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_eabihf - default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_eabi - default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 - default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 - default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 - default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_LINUX_64 - default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_LINUX_64 - default "uclibc" if ADK_TARGET_LIB_UCLIBC - default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf - default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi - default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 - default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 - default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 - default "musl32" if ADK_TARGET_LIB_MUSL && ADK_32 && ADK_LINUX_64 - default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_LINUX_64 - default "musl" if ADK_TARGET_LIB_MUSL - -choice -prompt "Target firmware type" -depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH && !ADK_TOOLCHAIN -default ADK_TARGET_ROOTFS_ARCHIVE - -config ADK_TARGET_ROOTFS_INITRAMFS - boolean "initramfs filesystem" - depends on \ - ADK_HARDWARE_QEMU || \ - ADK_LINUX_M68K || \ - ADK_LINUX_ARM || \ - ADK_LINUX_MICROBLAZE || \ - ADK_LINUX_MIPS || \ - ADK_LINUX_PPC || \ - ADK_LINUX_SPARC || \ - ADK_LINUX_X86 || \ - ADK_LINUX_X86_64 || \ - ADK_LINUX_NATIVE - depends on !ADK_HARDWARE_VBOX - depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI - depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 - select ADK_KERNEL_BLK_DEV_INITRD - help - create an read-only initramfs system. - -config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK - boolean "initramfs filesystem included into kernel image" - select ADK_LINUX_INITRAMFS_BUILTIN - depends on \ - ADK_HARDWARE_QEMU || \ - ADK_LINUX_AARCH64 || \ - ADK_LINUX_ARM || \ - ADK_LINUX_M68K || \ - ADK_LINUX_MICROBLAZE || \ - ADK_LINUX_MIPS || \ - ADK_LINUX_PPC || \ - ADK_LINUX_SPARC || \ - ADK_LINUX_X86 || \ - ADK_LINUX_X86_64 - depends on !ADK_HARDWARE_VBOX - depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 - depends on !ADK_TARGET_SYSTEM_ARANYM_M68K - help - create an read-only initramfs system. - -config ADK_TARGET_ROOTFS_SQUASHFS - boolean "compressed read-only root filesystem for NOR flash" - select ADK_KERNEL_SQUASHFS - select ADK_HOST_NEED_SQUASHFS - select ADK_HOST_NEED_QEMU if ADK_HARDWARE_QEMU - select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU - depends on ADK_TARGET_WITH_MTD - help - highly compressed read-only filesystem for MTD flash systems. - -config ADK_TARGET_ROOTFS_JFFS2 - boolean "compressed read-write root filesystem for NOR flash" - select ADK_KERNEL_JFFS2_FS - select ADK_HOST_NEED_MTD_UTILS - select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU - depends on ADK_TARGET_WITH_MTD - help - compressed read-write filesystem for MTD NOR flash systems. - -config ADK_TARGET_ROOTFS_YAFFS - boolean "YAFFS2 root filesystem for NAND flash" - select ADK_KERNEL_MISC_FILESYSTEMS - select ADK_KERNEL_YAFFS_FS - select ADK_KERNEL_YAFFS_YAFFS2 - select ADK_KERNEL_YAFFS_AUTO_YAFFS2 - depends on ADK_TARGET_WITH_NAND - help - Root filesystem on NAND flash with YAFFS2. - -config ADK_TARGET_ROOTFS_NFSROOT - boolean "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_PACKAGE_ADKINSTALL - depends on !ADK_HARDWARE_QEMU && !ADK_HARDWARE_VBOX && !ADK_TARGET_SYSTEM_ARANYM_M68K - depends on !ADK_TARGET_SYSTEM_ARM_FM - help - Root filesystem mounted via NFS and DHCP. - -config ADK_TARGET_ROOTFS_USB - boolean "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_KERNEL_EXT2_FS - select ADK_PACKAGE_ADKINSTALL - depends on ADK_TARGET_WITH_USB_BOOT - help - Boot system from USB stick. - -config ADK_TARGET_ROOTFS_ISO - boolean "create ISO image" - select ADK_KERNEL_ISO9660_FS - select ADK_KERNEL_JOLIET - select ADK_KERNEL_SCSI - select ADK_KERNEL_BLK_DEV_SR - select ADK_HOST_NEED_CDRTOOLS - select ADK_HOST_NEED_SYSLINUX - select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU - depends on ADK_HOST_LINUX - depends on ADK_LINUX_X86 - help - Use this option to create a bootable ISO image. - -config ADK_TARGET_ROOTFS_INITRAMFS_ARCHIVE - boolean "archive usable for initramfs creation" - depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 - depends on !ADK_TARGET_SYSTEM_ARM_FM - depends on !ADK_TARGET_SYSTEM_ARANYM_M68K - help - Use this option if your planning to create a initramfs, - useful for adk-test-framework. - -config ADK_TARGET_ROOTFS_ARCHIVE - boolean "archive usable for different filesystems" - select ADK_HOST_NEED_GENEXT2FS if ADK_HARDWARE_QEMU - select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU - select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU - depends on !ADK_TARGET_SYSTEM_ARANYM_M68K - depends on !ADK_TARGET_SYSTEM_QEMU_MICROBLAZE - help - Use this option if your root filesystem is ext2/ext3/ext4/xfs. - -endchoice - -config ADK_TARGET_ROOT_EXT4_RASPBERRY_PI - boolean - depends on ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_TARGET_ROOTFS_ARCHIVE - select ADK_KERNEL_EXT4_FS - default y - help - Compile EXT4 filesystem into kernel and use it as root filesystem. - choice -prompt "Root filesystem type" -depends on ADK_TARGET_ROOTFS_ARCHIVE && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_HARDWARE_QEMU -default ADK_TARGET_ROOT_EXT4 - -config ADK_TARGET_ROOT_EXT4 - boolean - prompt "EXT4 filesystem" - select ADK_KERNEL_EXT4_FS - help - Compile EXT4 filesystem into kernel and use it as root filesystem. - -config ADK_TARGET_ROOT_XFS - boolean - prompt "XFS filesystem" - select ADK_KERNEL_XFS_FS - help - Compile XFS filesystem into kernel and use it as root filesystem. - -config ADK_TARGET_ROOT_EXT2 - boolean - prompt "EXT2 filesystem" - select ADK_KERNEL_EXT2_FS - help - Compile EXT2 filesystem into kernel and use it as root filesystem. +prompt "Toolchain options" +depends on ADK_TOOLCHAIN +config ADK_TOOLCHAIN_ONLY + boolean "Only build toolchain and selected packages" -config ADK_TARGET_ROOT_EXT3 - boolean - prompt "EXT3 filesystem" - select ADK_KERNEL_EXT3_FS - help - Compile EXT3 filesystem into kernel and use it as root filesystem. +config ADK_TOOLCHAIN_ARCHIVE + boolean "Build a complete system usable f.e. via chroot" endchoice -config ADK_TARGET_ROOTFS - string - default "xfs" if ADK_TARGET_ROOT_XFS - default "ext2" if ADK_TARGET_ROOT_EXT2 - default "ext3" if ADK_TARGET_ROOT_EXT3 - default "ext4" if ADK_TARGET_ROOT_EXT4 - help - -config ADK_PACKAGE_SUFFIX - string - default "ipk" if ADK_TARGET_PACKAGE_IPKG - default "tar.xz" if ADK_TARGET_PACKAGE_TXZ - help - -choice -prompt "Target package format" -default ADK_TARGET_PACKAGE_TXZ if ADK_PKG_TEST -default ADK_TARGET_PACKAGE_IPKG -depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH - -config ADK_TARGET_PACKAGE_IPKG - boolean - prompt "ipkg" - select BUSYBOX_IPKG - help - Create ipkg packages and use ipkg package management on the target. - -config ADK_TARGET_PACKAGE_TXZ - boolean - prompt "xz compressed tar archive" - help - Create compressed tar archives of packages. - Pre- and post install scripts will be executed in the target - directory. There will be no package manager installed onto the target. - -endchoice source "target/config/Config.in.tools" diff --git a/target/config/Config.in.abi b/target/config/Config.in.abi new file mode 100644 index 000000000..6e900441b --- /dev/null +++ b/target/config/Config.in.abi @@ -0,0 +1,5 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +source target/config/Config.in.abi.choice +source target/config/Config.in.abi.default diff --git a/target/config/Config.in.abi.choice b/target/config/Config.in.abi.choice new file mode 100644 index 000000000..53f6ed1c8 --- /dev/null +++ b/target/config/Config.in.abi.choice @@ -0,0 +1,36 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +choice +prompt "Target ABI" +depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM +depends on ADK_LINUX_MIPS64 + +config ADK_TARGET_ABI_N32 + boolean "N32 ABI" + select ADK_n32 + +config ADK_TARGET_ABI_N64 + boolean "N64 ABI" + select ADK_n64 + +config ADK_TARGET_ABI_O32 + boolean "O32 ABI" + select ADK_o32 + +endchoice + +choice +prompt "Target ABI" +depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM +depends on ADK_LINUX_X86_64 + +config ADK_TARGET_ABI_64 + boolean "64 Bit ABI" + select ADK_64 + +config ADK_TARGET_ABI_X32 + boolean "x32 ABI" + select ADK_x32 + +endchoice diff --git a/target/config/Config.in.abi.default b/target/config/Config.in.abi.default new file mode 100644 index 000000000..64aff0782 --- /dev/null +++ b/target/config/Config.in.abi.default @@ -0,0 +1,64 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_o32 + boolean + +config ADK_n32 + boolean + +config ADK_n64 + boolean + +config ADK_32 + boolean + +config ADK_64 + boolean + +config ADK_x32 + boolean + +config ADK_eabi + boolean + +config ADK_eabihf + boolean + +config ADK_TARGET_ABI + string + default "n32" if ADK_n32 + default "n64" if ADK_n64 + default "32" if ADK_32 + default "x32" if ADK_x32 + default "eabi" if ADK_eabi + default "eabihf" if ADK_eabihf + +config ADK_TARGET_MIPS_ABI + depends on ADK_LINUX_MIPS64 + string + default "32" if ADK_o32 + default "n32" if ADK_n32 + default "64" if ADK_n64 + +config ADK_TARGET_LIBC_PATH + string + default "lib" if ADK_32 + default "lib32" if ADK_n32 + default "libx32" if ADK_x32 + default "lib64" if ADK_n64 \ + || ADK_64 \ + || ADK_LINUX_SPARC64 \ + || ADK_LINUX_PPC64 \ + || ADK_LINUX_X86_64 + default "lib" + +config ADK_TARGET_ABI_CFLAGS + string + default "-mabi=32" if ADK_o32 + default "-mabi=n32" if ADK_n32 + default "-mabi=64" if ADK_n64 + default "-m32" if ADK_32 + default "-mx32" if ADK_x32 + default "-m64" if ADK_64 + diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 7487ac056..53b61406f 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -1,10 +1,7 @@ -menu "Global settings" +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. -config ADK_VENDOR - string "vendor name" - default "openadk" - help - Vendor string is used for toolchain. +menu "Global ADK settings" config ADK_HOST string "webserver for packages and distfiles" @@ -19,41 +16,6 @@ config ADK_DL_DIR Configure the download directory for all source packages. Use an absolute path. -config ADK_TARGET_CFLAGS_OPT - string "optimization flags for compiler" - default "-Os -pipe" - help - Compilation is only verfied with optimization for code size (Os). - Other stuff (O2) might break. Will not be used when ADK_DEBUG is on. - -config ADK_DEBUG - bool "Compile applications with debug support by default" - default n - help - All packages and libc will be compiled and packaged with debug information. - Mostly useful for NFS root or big USB/CF or hard disk setups. - -config ADK_DEBUG_OPTS - bool "use optimization cflags" - depends on ADK_DEBUG - default n - help - All packages and libc will be compiled with debug information and optimization flags on. - -config ADK_DEBUG_STRIP - bool "strip target binaries/libraries for gdbserver usage" - depends on ADK_DEBUG - default n - help - All packages and libc will be compiled with debug information, but stripped for the target. - -config ADK_STATIC - bool "Link applications statically by default" - default n - select BUSYBOX_STATIC - help - Useful for toolchain only target devices. - config ADK_DISABLE_HONOUR_CFLAGS bool "Disable honour CFLAGS checks globally" default n @@ -133,5 +95,4 @@ config ADK_HOST_CYGWIN boolean endchoice - endmenu diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice index 54141eb3a..517d6a00f 100644 --- a/target/config/Config.in.arch.choice +++ b/target/config/Config.in.arch.choice @@ -34,29 +34,35 @@ config ADK_LINUX_MIPS help Support for MIPS systems. +config ADK_LINUX_MIPS64 + bool "mips64 system" + select ADK_mips64 + help + Support for MIPS64 systems. + config ADK_LINUX_PPC bool "ppc system" select ADK_ppc help - Support for powerpc systems. + Support for PPC systems. config ADK_LINUX_PPC64 bool "ppc64 system" select ADK_ppc64 help - Support for powerpc64 systems. + Support for PPC64 systems. config ADK_LINUX_SPARC bool "sparc system" select ADK_sparc help - Support for sparc systems. + Support for SPARC systems. config ADK_LINUX_SPARC64 bool "sparc64 system" select ADK_sparc64 help - Support for sparc64 systems. + Support for SPARC64 systems. config ADK_LINUX_SH bool "superh system" diff --git a/target/config/Config.in.arch.default b/target/config/Config.in.arch.default index df7e422f3..2b8abc7a1 100644 --- a/target/config/Config.in.arch.default +++ b/target/config/Config.in.arch.default @@ -1,3 +1,6 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + # target architectures config ADK_aarch64 bool @@ -14,6 +17,9 @@ config ADK_microblaze config ADK_mips bool +config ADK_mips64 + bool + config ADK_ppc bool @@ -42,6 +48,7 @@ config ADK_TARGET_ARCH default "m68k" if ADK_m68k default "microblaze" if ADK_microblaze default "mips" if ADK_mips + default "mips64" if ADK_mips64 default "ppc" if ADK_ppc default "ppc64" if ADK_ppc64 default "sparc" if ADK_sparc diff --git a/target/config/Config.in.arm b/target/config/Config.in.arm new file mode 100644 index 000000000..5c25bf08c --- /dev/null +++ b/target/config/Config.in.arm @@ -0,0 +1,5 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +source target/config/Config.in.arm.choice +source target/config/Config.in.arm.default diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice new file mode 100644 index 000000000..0b6d2081d --- /dev/null +++ b/target/config/Config.in.arm.choice @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +choice +prompt "Cubox-i model" +depends on ADK_TARGET_SYSTEM_CUBOX_I + +config ADK_TARGET_CUBOX_I4PRO + boolean "Solidrun Cubox-i4Pro" + +config ADK_TARGET_CUBOX_I2ULTRA + boolean "Solidrun Cubox-i2Ultra" + +config ADK_TARGET_CUBOX_I2 + boolean "Solidrun Cubox-i2" + +config ADK_TARGET_CUBOX_I1 + boolean "Solidrun Cubox-i1" + +endchoice + +choice ADK_TARGET_ARM_FLOAT +prompt "Target float type" +depends on ADK_TARGET_CPU_WITH_FPU || ADK_TARGET_SYSTEM_QEMU_ARM + +config ADK_TARGET_ARM_HARD_FLOAT + boolean "Use hard-float for system with FPU" + select ADK_hard_float + +config ADK_TARGET_ARM_SOFT_FLOAT + boolean "Use soft-float for system without FPU" + select ADK_soft_float + +endchoice diff --git a/target/config/Config.in.arm.default b/target/config/Config.in.arm.default new file mode 100644 index 000000000..a2d486512 --- /dev/null +++ b/target/config/Config.in.arm.default @@ -0,0 +1,25 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_soft_float + boolean + +config ADK_hard_float + boolean + +config ADK_fpu_neon + boolean + +config ADK_fpu_vfp + boolean + +config ADK_TARGET_FLOAT + string + default "hard" if ADK_hard_float + default "soft" if ADK_soft_float + +config ADK_TARGET_FPU + string + default "vfp" if ADK_fpu_vfp + default "neon" if ADK_fpu_neon + diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu new file mode 100644 index 000000000..a079b8c9f --- /dev/null +++ b/target/config/Config.in.cpu @@ -0,0 +1,129 @@ +# 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_CPU_WITH_FPU + boolean + +config ADK_TARGET_CPU_WITH_VT + boolean + +config ADK_TARGET_CPU_WITH_MTRR + boolean + +config ADK_TARGET_CPU_WITH_MMX + boolean + +config ADK_TARGET_CPU_WITH_MMXEXT + boolean + +config ADK_TARGET_CPU_WITH_SSE + boolean + +config ADK_TARGET_CPU_WITH_SSE2 + boolean + +config ADK_TARGET_CPU_WITH_SSE3 + boolean + +config ADK_TARGET_CPU_WITH_SSSE3 + boolean + +config ADK_TARGET_CPU_WITH_IWMMXT + boolean + +config ADK_TARGET_CPU_WITH_HT + boolean + +config ADK_TARGET_CPU_WITH_3DNOW + boolean + +config ADK_TARGET_CPU_WITH_3DNOWEXT + boolean + +config ADK_CPU_SH4 + boolean + +config ADK_CPU_SPARC_V8 + boolean + +config ADK_CPU_SPARC_V9 + boolean + +config ADK_CPU_X86 + boolean + +config ADK_CPU_X86_64 + boolean + +config ADK_CPU_GEODE + boolean + +config ADK_CPU_PPC + boolean + +config ADK_CPU_PPC64 + boolean + +config ADK_CPU_PENTIUM_M + boolean + +config ADK_CPU_AMDFAM10 + select ADK_TARGET_CPU_WITH_VT + boolean + +config ADK_CPU_LOONGSON2F + boolean + +config ADK_CPU_XSCALE + boolean + +config ADK_CPU_M68K + boolean + +config ADK_CPU_MIPS32 + boolean + +config ADK_CPU_MIPS64 + boolean + +config ADK_CPU_MICROBLAZE + boolean + +config ADK_CPU_ARM926EJ_S + boolean + +config ADK_CPU_ARM1176JZF_S + boolean + +config ADK_CPU_CORTEX_A9 + boolean + +config ADK_CPU_ARMV8 + boolean + +config ADK_TARGET_CPU_ARCH + string + default "x86_64" if ADK_CPU_X86_64 + default "x86_64" if ADK_CPU_AMDFAM10 + default "i486" if ADK_CPU_I486 + default "i586" if ADK_CPU_I586 + default "i686" if ADK_CPU_I686 + default "i586" if ADK_CPU_GEODE + default "i686" if ADK_CPU_PENTIUM_M + default "i686" if ADK_CPU_ATOM + default "m68k" if ADK_LINUX_M68K + default "microblaze" if ADK_LINUX_MICROBLAZE && ADK_big + default "microblazeel" if ADK_LINUX_MICROBLAZE && ADK_little + default "mips64" if ADK_LINUX_MIPS64 && ADK_big + default "mips64el" if ADK_LINUX_MIPS64 && ADK_little + default "mips" if ADK_LINUX_MIPS && ADK_big + default "mipsel" if ADK_LINUX_MIPS && ADK_little + default "aarch64" if ADK_LINUX_AARCH64 && ADK_little + default "arm" if ADK_LINUX_ARM && ADK_little + default "sparc" if ADK_LINUX_SPARC + default "sparc64" if ADK_LINUX_SPARC64 + default "sh4" if ADK_LINUX_SH && ADK_little + default "sh4eb" if ADK_LINUX_SH && ADK_big + default "ppc" if ADK_CPU_PPC + default "ppc64" if ADK_CPU_PPC64 + diff --git a/target/config/Config.in.endian b/target/config/Config.in.endian new file mode 100644 index 000000000..c21085389 --- /dev/null +++ b/target/config/Config.in.endian @@ -0,0 +1,5 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +source target/config/Config.in.endian.choice +source target/config/Config.in.endian.default diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice new file mode 100644 index 000000000..2ad269525 --- /dev/null +++ b/target/config/Config.in.endian.choice @@ -0,0 +1,17 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +choice ADK_TARGET_ENDIAN_MODE +prompt "Target Endianess" +depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM +depends on ADK_LINUX_SH || ADK_LINUX_MIPS || ADK_LINUX_MICROBLAZE || ADK_LINUX_MIPS64 + +config ADK_TARGET_LITTLE_ENDIAN + boolean "Little endian" + select ADK_little + +config ADK_TARGET_BIG_ENDIAN + boolean "Big endian" + select ADK_big + +endchoice diff --git a/target/config/Config.in.endian.default b/target/config/Config.in.endian.default new file mode 100644 index 000000000..6599016eb --- /dev/null +++ b/target/config/Config.in.endian.default @@ -0,0 +1,18 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_big + boolean + +config ADK_little + boolean + +config ADK_TARGET_ENDIAN + string + default "little" if ADK_little + default "big" if ADK_big + +config ADK_JFFS2_OPTS + string + default "-l" if ADK_little + default "-b" if ADK_big diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware index d522ec56c..9bdfac2fd 100644 --- a/target/config/Config.in.hardware +++ b/target/config/Config.in.hardware @@ -1,3 +1,6 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + # hardware features, do not use for qemu config ADK_TARGET_WITH_CPU_FREQ boolean diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel new file mode 100644 index 000000000..cd1007a91 --- /dev/null +++ b/target/config/Config.in.kernel @@ -0,0 +1,57 @@ +# 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 + boolean + +config ADK_TARGET_KERNEL_ZIMAGE + boolean + +config ADK_TARGET_KERNEL_LINUXBIN + boolean + +config ADK_TARGET_KERNEL_IMAGE + boolean + +config ADK_TARGET_KERNEL_UIMAGE + boolean + +config ADK_TARGET_KERNEL_BZIMAGE + boolean + +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" + +config ADK_TARGET_KERNEL_MINICONFIG + string + default "arm-fm" if ADK_TARGET_SYSTEM_ARM_FM + default "qemu-microblaze-s3adsp1800" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + 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-mips" if ADK_TARGET_SYSTEM_QEMU_MIPS + default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64 + default "qemu-ppc" if ADK_TARGET_SYSTEM_QEMU_PPC + default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64 + default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4 + 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 "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K + default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40 + default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I + default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI + default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "mikrotik-rb532" if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC + diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion new file mode 100644 index 000000000..e87c1ab67 --- /dev/null +++ b/target/config/Config.in.kernelversion @@ -0,0 +1,6 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +source target/config/Config.in.k