From 31030399d3f01d6348b3fba4d1ff42e8b11ec0d3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Apr 2014 17:23:54 +0200 Subject: remove unused --- target/sh/sys-available/toolchain-sh4 | 2 +- target/sh/sys-available/toolchain-sh4eb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target') diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/sys-available/toolchain-sh4 index 4d7fff826..91110cb0c 100644 --- a/target/sh/sys-available/toolchain-sh4 +++ b/target/sh/sys-available/toolchain-sh4 @@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4 bool "Toolchain only (little endian)" select ADK_sh select ADK_little - select ADK_toolchain_sh + select ADK_toolchain_sh4 select ADK_CPU_SH4 select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ diff --git a/target/sh/sys-available/toolchain-sh4eb b/target/sh/sys-available/toolchain-sh4eb index cccc163e1..70b99cb8e 100644 --- a/target/sh/sys-available/toolchain-sh4eb +++ b/target/sh/sys-available/toolchain-sh4eb @@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4EB bool "Toolchain only (big endian)" select ADK_sh select ADK_big - select ADK_toolchain_sheb + select ADK_toolchain_sh4eb select ADK_CPU_SH4 select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ -- cgit v1.2.3 From f71879b1e9e706b6159dfcc62b64b62e63b6f6cb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 Apr 2014 08:50:21 +0200 Subject: fix description, do not select fpu --- target/arm/sys-available/toolchain-arm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'target') diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index b9ba30aa5..876bcd84a 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -1,10 +1,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM - bool "Toolchain only (little endian)" + bool "Toolchain only (soft float)" select ADK_arm select ADK_toolchain_arm select ADK_little select ADK_soft_float - select ADK_fpu_vfp select ADK_eabi select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ -- cgit v1.2.3 From 96b68fb7047d2d355a6d3cc8409a0f1db95acec9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Apr 2014 01:07:06 +0200 Subject: fix 32 bit userland with 64 bit kernel support after onger discussion with Phil, I understood his old patches and fixed support for x86 systems with 32 Bit userland and 64 Bit kernel by using a biarch toolchain instead of a multilib one. --- package/genext2fs/Makefile | 2 + target/config/Config.in | 2 +- target/x86/Makefile | 18 +++++++-- target/x86/kernel/qemu-x86_64 | 20 +++++++++ target/x86/sys-available/qemu-x86_64-32 | 11 +++++ target/x86_64/sys-available/toolchain-x86_64_32 | 12 ------ toolchain/binutils/Makefile | 6 +-- toolchain/gcc/Makefile | 13 ++++-- toolchain/gcc/patches/4.8.2/abi32.patch | 54 ------------------------- 9 files changed, 58 insertions(+), 80 deletions(-) create mode 100644 target/x86/kernel/qemu-x86_64 create mode 100644 target/x86/sys-available/qemu-x86_64-32 delete mode 100644 target/x86_64/sys-available/toolchain-x86_64_32 delete mode 100644 toolchain/gcc/patches/4.8.2/abi32.patch (limited to 'target') diff --git a/package/genext2fs/Makefile b/package/genext2fs/Makefile index 4e8fea5bd..cf88ab095 100644 --- a/package/genext2fs/Makefile +++ b/package/genext2fs/Makefile @@ -11,6 +11,8 @@ PKG_DESCR:= genext2fs utility PKG_SECTION:= fs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=genext2fs/} +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + PKG_CFLINE_GENEXT2FS:= depends on ADK_HOST_ONLY include $(TOPDIR)/mk/host.mk diff --git a/target/config/Config.in b/target/config/Config.in index 3d613bb1e..b1725b876 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -242,7 +242,7 @@ config ADK_TARGET_CUBOX_I1 endchoice # global symbols -config ADK_TARGET_KERNEL_MAY_64BIT +config ADK_TARGET_KERNEL_64 boolean config ADK_TOOLCHAIN_ONLY diff --git a/target/x86/Makefile b/target/x86/Makefile index 736f1c359..89e59095a 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -8,6 +8,16 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage + +QEMU_ARGS:=-M pc +QEMU_ARGS+=${ADK_QEMU_ARGS} + +ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64_32),y) +QEMU_ARCH:=x86_84 +else +QEMU_ARCH:=i386 +endif + ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y) CREATE:=./scripts/create.sh -g -t @@ -43,9 +53,9 @@ ifeq ($(ADK_HARDWARE_QEMU),y) @echo "$(CREATE) qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) - @echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img' else - @echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif ifeq ($(ADK_HARDWARE_VBOX),y) @@ -72,7 +82,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -81,7 +91,7 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-i386 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif ifeq (${ADK_TARGET_FS},iso) diff --git a/target/x86/kernel/qemu-x86_64 b/target/x86/kernel/qemu-x86_64 new file mode 100644 index 000000000..7bf96c74c --- /dev/null +++ b/target/x86/kernel/qemu-x86_64 @@ -0,0 +1,20 @@ +CONFIG_X86=y +CONFIG_64BIT=y +CONFIG_X86_64=y +CONFIG_GENERIC_CPU=y +CONFIG_PROCESSOR_SELECT=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_MTRR=y +CONFIG_X86_PAT=y +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +CONFIG_IA32_EMULATION=y +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E1000=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/x86/sys-available/qemu-x86_64-32 b/target/x86/sys-available/qemu-x86_64-32 new file mode 100644 index 000000000..f96e6ea35 --- /dev/null +++ b/target/x86/sys-available/qemu-x86_64-32 @@ -0,0 +1,11 @@ +config ADK_TARGET_SYSTEM_QEMU_X86_64_32 + bool "Qemu Emulator (x86_64) with 32Bit userland" + select ADK_x86 + select ADK_qemu_x86_64_32 + select ADK_CPU_I686 + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_BZIMAGE + select ADK_TARGET_KERNEL_64 + help + Support for Qemu Emulator (x86_64) with 32 Bit userland. + diff --git a/target/x86_64/sys-available/toolchain-x86_64_32 b/target/x86_64/sys-available/toolchain-x86_64_32 deleted file mode 100644 index 9e8297ea4..000000000 --- a/target/x86_64/sys-available/toolchain-x86_64_32 +++ /dev/null @@ -1,12 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_32 - bool "Toolchain only (32 ABI)" - select ADK_x86_64 - select ADK_32 - select ADK_toolchain_x86_64 - select ADK_CPU_X86_64 - select ADK_LINUX_64 - select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - Build a x86_64 toolchain. - diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 8947ee77e..0a41fc9f3 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -24,11 +24,7 @@ else CONFOPTS+= --disable-gold endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) -CONFOPTS+= --with-arch=armv6 -endif - -ifneq ($(ADK_LINUX_64),) +ifneq ($(ADK_LINUX_64)$(ADK_TARGET_KERNEL_64),) CONFOPTS+= --enable-64-bit-bfd endif diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 63d0237c3..12ad4ebca 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -35,7 +35,7 @@ GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \ --disable-nls GCC_FINAL_CONFOPTS:= -ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64),) +ifeq ($(ADK_LINUX_SH)$(ADK_LINUX_X86_64)$(ADK_LINUX_X86),) GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif @@ -48,13 +48,18 @@ endif GCC_FINAL_CONFOPTS+= --enable-multilib --with-multilib-list=m4,m4-nofpu endif +ifeq ($(ADK_LINUX_X86),y) +ifeq ($(ADK_TARGET_KERNEL_64),y) +GCC_FINAL_CONFOPTS+= --enable-biarch --enable-targets=all --disable-multilib +else +GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib +endif +endif + ifeq ($(ADK_LINUX_X86_64),y) ifeq ($(ADK_x32),y) GCC_FINAL_CONFOPTS+= --with-abi=x32 endif -ifeq ($(ADK_32),y) -GCC_FINAL_CONFOPTS+= --with-abi=32 -endif ifeq ($(ADK_64),y) GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif diff --git a/toolchain/gcc/patches/4.8.2/abi32.patch b/toolchain/gcc/patches/4.8.2/abi32.patch deleted file mode 100644 index 856d608bd..000000000 --- a/toolchain/gcc/patches/4.8.2/abi32.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Nur gcc-4.8.2.orig/gcc/config/i386/biarch32.h gcc-4.8.2/gcc/config/i386/biarch32.h ---- gcc-4.8.2.orig/gcc/config/i386/biarch32.h 1970-01-01 01:00:00.000000000 +0100 -+++ gcc-4.8.2/gcc/config/i386/biarch32.h 2014-03-23 20:33:52.000000000 +0100 -@@ -0,0 +1,27 @@ -+/* Make configure files to produce biarch compiler defaulting to 32bit mode. -+ This file must be included very first, while the OS specific file later -+ to overwrite otherwise wrong defaults. -+ Copyright (C) 2001-2014 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 3, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+Under Section 7 of GPL version 3, you are granted additional -+permissions described in the GCC Runtime Library Exception, version -+3.1, as published by the Free Software Foundation. -+ -+You should have received a copy of the GNU General Public License and -+a copy of the GCC Runtime Library Exception along with this program; -+see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -+. */ -+ -+#define TARGET_64BIT_DEFAULT 0 -diff -Nur gcc-4.8.2.orig/gcc/config.gcc gcc-4.8.2/gcc/config.gcc ---- gcc-4.8.2.orig/gcc/config.gcc 2013-10-03 02:47:24.000000000 +0200 -+++ gcc-4.8.2/gcc/config.gcc 2014-03-22 13:15:18.000000000 +0100 -@@ -522,6 +522,9 @@ - 64 | m64) - tm_file="i386/biarch64.h ${tm_file}" - ;; -+ 32 | m32) -+ tm_file="i386/biarch32.h ${tm_file}" -+ ;; - x32 | mx32) - tm_file="i386/biarchx32.h ${tm_file}" - ;; -@@ -1343,6 +1346,9 @@ - x32 | mx32) - x86_multilibs="mx32" - ;; -+ 32 | m32) -+ x86_multilibs="m32" -+ ;; - *) - x86_multilibs="m64,m32" - ;; -- cgit v1.2.3 From 7bcadb06072bccdda7eebb8f9217e63745cf30b1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Apr 2014 01:28:54 +0200 Subject: combine cubox-i kernel configs, make SMP, PREEMPT and HIGHMEM configurable --- target/arm/kernel/cubox-i | 23 +++++++++++++++++++++++ target/arm/kernel/cubox-i1 | 16 ---------------- target/arm/kernel/cubox-i2 | 17 ----------------- target/arm/kernel/cubox-i2ultra | 24 ------------------------ target/arm/kernel/cubox-i4pro | 27 --------------------------- target/config/Config.in | 10 ++-------- target/linux/Config.in | 1 + target/linux/config/Config.in.kernel | 33 ++++++++++++++++++++++++++------- 8 files changed, 52 insertions(+), 99 deletions(-) create mode 100644 target/arm/kernel/cubox-i delete mode 100644 target/arm/kernel/cubox-i1 delete mode 100644 target/arm/kernel/cubox-i2 delete mode 100644 target/arm/kernel/cubox-i2ultra delete mode 100644 target/arm/kernel/cubox-i4pro (limited to 'target') diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/cubox-i new file mode 100644 index 000000000..0b56db7d7 --- /dev/null +++ b/target/arm/kernel/cubox-i @@ -0,0 +1,23 @@ +CONFIG_ARM=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MXC=y +CONFIG_ARCH_MX6=y +CONFIG_SOC_IMX6Q=y +CONFIG_SOC_IMX6SL=y +CONFIG_LOCAL_TIMERS=y +CONFIG_MXC_DEBUG_BOARD=y +CONFIG_KUSER_HELPERS=y +CONFIG_AEABI=y +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y +CONFIG_PCI_IMX6=y +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_NET_VENDOR_FREESCALE=y +CONFIG_FEC=y +CONFIG_PHYLIB=y +CONFIG_AT803X_PHY=y +CONFIG_ATAGS=y +CONFIG_CMDLINE_FORCE=y diff --git a/target/arm/kernel/cubox-i1 b/target/arm/kernel/cubox-i1 deleted file mode 100644 index 82934afc0..000000000 --- a/target/arm/kernel/cubox-i1 +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX6=y -CONFIG_SOC_IMX6SL=y -CONFIG_KUSER_HELPERS=y -CONFIG_AEABI=y -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_NEON=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_PCI_IMX6=y -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y diff --git a/target/arm/kernel/cubox-i2 b/target/arm/kernel/cubox-i2 deleted file mode 100644 index 3a6fecdf5..000000000 --- a/target/arm/kernel/cubox-i2 +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_SMP=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX6=y -CONFIG_SOC_IMX6SL=y -CONFIG_KUSER_HELPERS=y -CONFIG_AEABI=y -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_NEON=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_PCI_IMX6=y -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y diff --git a/target/arm/kernel/cubox-i2ultra b/target/arm/kernel/cubox-i2ultra deleted file mode 100644 index 47bc235c5..000000000 --- a/target/arm/kernel/cubox-i2ultra +++ /dev/null @@ -1,24 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_SMP=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX6=y -CONFIG_SOC_IMX6Q=y -CONFIG_SOC_IMX6SL=y -CONFIG_LOCAL_TIMERS=y -CONFIG_MXC_DEBUG_BOARD=y -CONFIG_KUSER_HELPERS=y -CONFIG_AEABI=y -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_NEON=y -CONFIG_PCI_IMX6=y -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_NET_VENDOR_FREESCALE=y -CONFIG_FEC=y -CONFIG_PHYLIB=y -CONFIG_AT803X_PHY=y -CONFIG_ATAGS=y -CONFIG_CMDLINE_FORCE=y diff --git a/target/arm/kernel/cubox-i4pro b/target/arm/kernel/cubox-i4pro deleted file mode 100644 index 9d99b12a3..000000000 --- a/target/arm/kernel/cubox-i4pro +++ /dev/null @@ -1,27 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_SMP=y -CONFIG_HIGHMEM=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX6=y -CONFIG_SOC_IMX6Q=y -CONFIG_SOC_IMX6SL=y -CONFIG_LOCAL_TIMERS=y -CONFIG_MXC_DEBUG_BOARD=y -CONFIG_KUSER_HELPERS=y -CONFIG_AEABI=y -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_NEON=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_PCI_IMX6=y -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_NET_VENDOR_FREESCALE=y -CONFIG_FEC=y -CONFIG_PHYLIB=y -CONFIG_AT803X_PHY=y -CONFIG_ATAGS=y -CONFIG_CMDLINE_FORCE=y diff --git a/target/config/Config.in b/target/config/Config.in index b1725b876..b5cd6121c 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -214,10 +214,7 @@ config ADK_TARGET_KERNEL_MINICONFIG 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-i4pro" if ADK_TARGET_CUBOX_I4PRO - default "cubox-i2ultra" if ADK_TARGET_CUBOX_I2ULTRA - default "cubox-i2" if ADK_TARGET_CUBOX_I2 - default "cubox-i1" if ADK_TARGET_CUBOX_I1 + 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 @@ -483,8 +480,6 @@ config ADK_TARGET_LIBC default "glibc" if ADK_glibc default "musl" if ADK_musl -source "target/linux/config/Config.in.kernel" - choice prompt "Target C library" depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH @@ -606,8 +601,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK ADK_LINUX_PPC || \ ADK_LINUX_SPARC || \ ADK_LINUX_X86 || \ - ADK_LINUX_X86_64 || \ - ADK_LINUX_NATIVE + ADK_LINUX_X86_64 depends on !ADK_HARDWARE_VBOX select ADK_KERNEL_EXT2_FS help diff --git a/target/linux/Config.in b/target/linux/Config.in index 778f4aa7c..03c4f079e 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -1,3 +1,4 @@ +source target/linux/config/Config.in.kernel source target/linux/config/Config.in.cpu source target/linux/config/Config.in.block source target/linux/config/Config.in.flash diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index aed028f79..e6dc6d6e9 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -106,12 +106,6 @@ config ADK_KERNEL_CPU_MIPS64_R1 config ADK_KERNEL_CPU_MIPS64_R2 boolean -config ADK_KERNEL_PREEMPT - boolean - -config ADK_KERNEL_THUMB2_KERNEL - boolean - # page size config ADK_KERNEL_PAGE_SIZE_4KB boolean @@ -119,10 +113,13 @@ config ADK_KERNEL_PAGE_SIZE_4KB config ADK_KERNEL_PAGE_SIZE_16KB boolean -# ABI +# ARM specific config ADK_KERNEL_AEABI boolean +config ADK_KERNEL_THUMB2_KERNEL + boolean + # endianess config ADK_KERNEL_CPU_BIG_ENDIAN default y if ADK_big @@ -131,3 +128,25 @@ config ADK_KERNEL_CPU_BIG_ENDIAN config ADK_KERNEL_CPU_LITTLE_ENDIAN default y if ADK_little boolean + +menu "Kernel options" + +config ADK_KERNEL_SMP + prompt "Enable symmetric multi processing" + boolean + default y if ADK_TARGET_CUBOX_I4PRO + default y if ADK_TARGET_CUBOX_I2ULTRA + default n + +config ADK_KERNEL_HIGHMEM + prompt "Enable high memory" + boolean + default y if ADK_TARGET_CUBOX_I4PRO + default n + +config ADK_KERNEL_PREEMPT + prompt "Enable preemptive kernel" + boolean + default n + +endmenu -- cgit v1.2.3 From 999c0d4d60937174ad592d3992e608415ff91a20 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Apr 2014 01:37:52 +0200 Subject: rework thumb2 support do not change gcc defaults, discussed with phil, make the resulting toolchains more conform. --- target/config/Config.in | 13 ------------- toolchain/Config.in | 15 ++++----------- toolchain/gcc/Makefile | 1 - 3 files changed, 4 insertions(+), 25 deletions(-) (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index b5cd6121c..8cc77b06c 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -50,12 +50,6 @@ config ADK_fpu_neon config ADK_fpu_vfp boolean -config ADK_mode_arm - boolean - -config ADK_mode_thumb - boolean - config ADK_TARGET_FLOAT string default "hard" if ADK_hard_float @@ -66,13 +60,6 @@ config ADK_TARGET_FPU default "vfp" if ADK_fpu_vfp default "neon" if ADK_fpu_neon -config ADK_TARGET_ARM_MODE - depends on ADK_LINUX_ARM - string - default "arm" if ADK_mode_arm - default "thumb" if ADK_mode_thumb - default "arm" - config ADK_TARGET_ENDIAN string default "little" if ADK_little diff --git a/toolchain/Config.in b/toolchain/Config.in index 6a41140b8..f80c44841 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -44,18 +44,11 @@ config ADK_TOOLCHAIN_USE_GOLD depends on ADK_TOOLCHAIN_GOLD default n -choice -prompt "Use ARM thumb mode" -depends on ADK_CPU_CORTEX_A9 - -config ADK_LINUX_ARM_WITHOUT_THUMB - boolean "disabled" - select ADK_mode_arm - config ADK_LINUX_ARM_WITH_THUMB - boolean "enabled" - select ADK_mode_thumb + prompt "Use THUMB2 ARM mode" + boolean + depends on ADK_CPU_CORTEX_A9 && ADK_TARGET_LIB_GLIBC select ADK_KERNEL_THUMB2_KERNEL + default n -endchoice endmenu diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 12ad4ebca..7616f2ab3 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -89,7 +89,6 @@ endif ifeq ($(ARCH),arm) GCC_CONFOPTS+= --with-float=$(ADK_TARGET_FLOAT) -GCC_CONFOPTS+= --with-mode=$(ADK_TARGET_ARM_MODE) ifneq ($(ADK_TARGET_FPU),) GCC_CONFOPTS+= --with-fpu=$(ADK_TARGET_FPU) endif -- cgit v1.2.3 From c543dd2fde53678661dc25bfb52578cbe17168cc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Apr 2014 13:20:09 +0200 Subject: update collections --- target/packages/pkg-available/console | 2 +- target/packages/pkg-available/development | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'target') diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console index 68ff1f0b5..ff7654834 100644 --- a/target/packages/pkg-available/console +++ b/target/packages/pkg-available/console @@ -3,13 +3,13 @@ config ADK_PKG_CONSOLE default n select ADK_PACKAGE_ALSA_UTILS select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER - select ADK_PACKAGE_DROPBEAR select ADK_PACKAGE_SCREEN select ADK_PACKAGE_SUDO select ADK_PACKAGE_LINKS select ADK_PACKAGE_ELINKS select ADK_PACKAGE_LYNX select ADK_PACKAGE_KEYCHAIN + select ADK_PACKAGE_OPENSSH select ADK_PACKAGE_OPENSSH_CLIENT select ADK_PACKAGE_OPENSSH_CLIENT_UTILS select ADK_PACKAGE_OPENSSH_SERVER diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development index 6a883ebf2..9ea11f7f6 100644 --- a/target/packages/pkg-available/development +++ b/target/packages/pkg-available/development @@ -4,7 +4,6 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_BASH select ADK_PACKAGE_BINUTILS select ADK_PACKAGE_DIFFUTILS - select ADK_PACKAGE_FILE select ADK_PACKAGE_GAWK select ADK_PACKAGE_GCC select ADK_PACKAGE_GXX @@ -16,10 +15,8 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC select ADK_PACKAGE_LIBNCURSES select ADK_PACKAGE_LIBNCURSES_DEV - select ADK_PACKAGE_M4 select ADK_PACKAGE_MAKE select ADK_PACKAGE_MKFONTDIR - select ADK_PACKAGE_PATCH select ADK_PACKAGE_PERL select BUSYBOX_STAT select BUSYBOX_FEATURE_STAT_FORMAT -- cgit v1.2.3 From bf7978f2f3ac4a6ec72aacf752557db689a9b9c2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 2 May 2014 16:44:47 +0200 Subject: some bits for audio support on cubox --- mk/modules.mk | 6 ++++++ target/linux/config/Config.in.audio | 27 ++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) (limited to 'target') diff --git a/mk/modules.mk b/mk/modules.mk index 59f609cc8..cc862cc13 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1238,6 +1238,12 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\ $(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \ ,55, kmod-snd-soc)) +$(eval $(call KMOD_template,SND_IMX_SOC,snd-imx-soc,\ + $(MODULES_DIR)/kernel/sound/soc/fsl/imx-pcm-dma \ + $(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-fsl-spdif \ + $(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-spdif \ +,55, kmod-snd-soc)) + $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\ $(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \ ,55)) diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d228feb96..b618c59b7 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -10,6 +10,18 @@ config ADK_KERNEL_SND_PCI config ADK_KERNEL_SND_USB boolean +config ADK_KERNEL_SND_SOC_IMX_PCM_DMA + boolean + +config ADK_KERNEL_SND_SOC_IMX_HDMI_DMA + boolean + +config ADK_KERNEL_SND_SOC_IMX_SPDIF + boolean + +config ADK_KERNEL_SND_SOC_IMX_HDMI + boolean + config ADK_KERNEL_SND_PXA2XX_AC97 boolean @@ -124,7 +136,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM select ADK_KPACKAGE_KMOD_SND_SOC - select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_34 + select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_37 select ADK_KPACKAGE_KMOD_SND_COMPRESS depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n @@ -147,4 +159,17 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n +config ADK_KPACKAGE_KMOD_SND_IMX_SOC + prompt "Cubox-i SoC sound chip" + tristate + depends on ADK_TARGET_SYSTEM_CUBOX_I + select ADK_KPACKAGE_KMOD_SND + select ADK_KPACKAGE_KMOD_SND_SOC + select ADK_KERNEL_SND_SOC_IMX_PCM_DMA + select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA + select ADK_KERNEL_SND_SOC_IMX_HDMI + select ADK_KERNEL_SND_SOC_IMX_SPDIF + default y if ADK_TARGET_SYSTEM_CUBOX_I + default n + endmenu -- cgit v1.2.3 From b0e912f902203a6ad1fbd54587dc7841c2b1ad4f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 3 May 2014 13:20:27 +0200 Subject: reorder qemu config --- target/config/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index 8cc77b06c..47e0e5861 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -1,8 +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.hardware" -source "target/config/Config.in.qemu" config ADK_TARGET_KERNEL_VMLINUZ boolean @@ -75,6 +73,8 @@ config ADK_TOOLCHAIN 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 -- cgit v1.2.3