summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-18 01:35:52 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-18 01:35:52 +0100
commit9736226cccdeb8d62e30b51664f763b723acacfd (patch)
tree43009f9df0a7e67b9218bb7ee95f479bb11cf1fa
parentd714919ee99c1ef6a2b7cc369b1c78624ad956fe (diff)
parent9e858224a5674820840eceb7aaabbba35b16c0cc (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--Config.in11
-rw-r--r--package/cryptodev-linux/Makefile4
-rw-r--r--package/mksh/Makefile1
-rw-r--r--package/pcrepp/Makefile2
-rw-r--r--package/pcrepp/patches/patch-configure20
-rw-r--r--target/arm/kernel/qemu-arm-versatilepb1
-rw-r--r--target/config/Config.in64
-rw-r--r--target/linux/config/Config.in.kernel5
-rw-r--r--target/mips/kernel/qemu-mips641
-rw-r--r--target/mips/kernel/qemu-mips64el1
-rw-r--r--target/ppc64/kernel/qemu-ppc641
-rw-r--r--target/sparc64/kernel/qemu-sparc641
-rw-r--r--target/x86_64/kernel/qemu-x86_641
13 files changed, 43 insertions, 70 deletions
diff --git a/Config.in b/Config.in
index 646423e49..acea6b6b2 100644
--- a/Config.in
+++ b/Config.in
@@ -33,17 +33,17 @@ config ADK_CHOOSE_TARGET_SYSTEM
source "target/config/Config.in"
menu "Runtime configuration"
-depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_KERNEL && !ADK_CHOOSE_TARGET_SYSTEM
+depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
source "target/config/Config.in.runtime"
endmenu
menu "Package collection"
-depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_KERNEL && !ADK_CHOOSE_TARGET_SYSTEM
+depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
source "target/packages/Config.in"
endmenu
menu "Package selection"
-depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_KERNEL && !ADK_CHOOSE_TARGET_SYSTEM
+depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
config ADK_LEAVE_ETC_ALONE
boolean "do not install anything into /etc"
@@ -89,9 +89,6 @@ source "package/Config.in.auto.global"
source "package/Config.in.auto"
endmenu
-config ADK_USE_KERNEL_MINICONFIG
- boolean
-
choice
prompt "Kernel Version"
depends on ADK_TOOLCHAIN_ONLY
@@ -104,7 +101,7 @@ config ADK_KERNEL_VERSION_TOOLCHAIN
endchoice
menu "Kernel configuration"
-depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_KERNEL && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING
+depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING
choice
prompt "Kernel Version"
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile
index ecb827b09..64b27a8da 100644
--- a/package/cryptodev-linux/Makefile
+++ b/package/cryptodev-linux/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= cryptodev-linux
PKG_VERSION:= 1.6
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea
PKG_DESCR:= cryptodev-linux kernel module
PKG_SECTION:= crypto
@@ -26,7 +26,7 @@ INSTALL_STYLE:= manual
do-build:
${MAKE} -C "${WRKBUILD}"/tests check
${MAKE} -C "${WRKBUILD}" version.h
- GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} ${KERNEL_MAKE_OPTS} \
+ GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} -C ${LINUX_DIR} ${KERNEL_MAKE_OPTS} \
M="${WRKBUILD}" modules
${INSTALL_DIR} ${WRKINST}/usr/include/crypto
${INSTALL_DATA} ${WRKBUILD}/crypto/cryptodev.h \
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index a38b97733..63d391e18 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -27,6 +27,7 @@ TARGET_LDFLAGS+= -static
endif
TARGET_CPPFLAGS+= -DMKSH_SMALL=1
+TARGET_LDFLAGS+= -static-libgcc
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile
index e96d04e38..5d662f20f 100644
--- a/package/pcrepp/Makefile
+++ b/package/pcrepp/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= pcrepp
PKG_VERSION:= 0.9.5
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1fe6ea8e23ece01fde2ce5fb4746acc2
PKG_DESCR:= Cpp Wrapper classes for PCRE
PKG_SECTION:= libs
diff --git a/package/pcrepp/patches/patch-configure b/package/pcrepp/patches/patch-configure
index 0ee82218e..da7ab7b3e 100644
--- a/package/pcrepp/patches/patch-configure
+++ b/package/pcrepp/patches/patch-configure
@@ -1,5 +1,23 @@
--- pcre++-0.9.5.orig/configure 2004-08-25 01:38:03.000000000 +0200
-+++ pcre++-0.9.5/configure 2011-08-05 07:30:53.000000000 +0200
++++ pcre++-0.9.5/configure 2014-03-17 20:07:03.000000000 +0100
+@@ -3844,7 +3844,7 @@ irix5* | irix6* | nonstopux*)
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+ case $host_cpu in
+ alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
+ lt_cv_deplibs_check_method=pass_all ;;
+@@ -6598,7 +6598,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
@@ -8612,7 +8612,7 @@ if test "x$with_pcre_include" = "x"; the
CPPFLAGS="$CPPFLAGS -I/include"
;;
diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb
index f208772d0..29a82ccf6 100644
--- a/target/arm/kernel/qemu-arm-versatilepb
+++ b/target/arm/kernel/qemu-arm-versatilepb
@@ -1,3 +1,4 @@
+CONFIG_ARM=y
CONFIG_ARM_PATCH_PHYS_VIRT=y
CONFIG_ARCH_VERSATILE=y
CONFIG_ARCH_VERSATILE_PB=y
diff --git a/target/config/Config.in b/target/config/Config.in
index 3e8176148..38004d7e3 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -73,7 +73,7 @@ source "target/config/Config.in.system"
config ADK_LINUX_MIPS64
boolean
- default y if ADK_LINUX_MIPS && ADK_TARGET_KERNEL64
+ default y if ADK_LINUX_MIPS && ADK_LINUX_64
choice
prompt "Toolchain options"
@@ -86,21 +86,6 @@ config ADK_TOOLCHAIN_ARCHIVE
endchoice
-choice
-prompt "Target Kernel"
-depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG \
- || ADK_TARGET_SYSTEM_QEMU_MIPS64 \
- || ADK_TARGET_SYSTEM_QEMU_MIPS64EL \
- || ADK_LINUX_X86_64
-
-config ADK_TARGET_KERNEL64
- boolean "64 Bit Kernel"
-
-config ADK_TARGET_KERNEL32
- boolean "32 Bit Kernel"
-
-endchoice
-
config ADK_32
boolean
@@ -143,7 +128,7 @@ config ADK_TARGET_MIPS_ABI
choice
prompt "Target ABI"
-depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN
+depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN
config ADK_TARGET_ABI_N32
boolean "N32 ABI (new)"
@@ -161,7 +146,7 @@ endchoice
choice
prompt "Target ABI"
-depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN
+depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN
config ADK_TARGET_ABI_64
boolean "64 Bit ABI"
@@ -224,7 +209,6 @@ depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZ
config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
boolean "Xilinx ml605"
- select ADK_TARGET_WITH_MTD
config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
boolean "Xilinx Spartan S3ADSP1800"
@@ -267,7 +251,7 @@ config ADK_TARGET_QEMU_WITH_BLOCK
boolean "enabled"
select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
- select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686
+ select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64
select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC
select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
@@ -338,23 +322,7 @@ config ADK_LINUX_ARM_WITH_THUMB
endchoice
-
-choice
-prompt "Broadcom BCM47xx Model"
-depends on ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
-
-config ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G
- boolean "Linksys WRT54g"
-
-config ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54GS
- boolean "Linksys WRT54gs"
-
-config ADK_TARGET_BROADCOM_MODEL_ASUS_WL500GP
- boolean "Asus WL500gP"
-
-endchoice
-
-# hardware features
+# hardware features, do not use for qemu
config ADK_TARGET_WITH_USB
boolean
@@ -658,15 +626,11 @@ config ADK_glibc
config ADK_musl
boolean
-config ADK_libc
- boolean
-
config ADK_TARGET_LIBC
string
default "uclibc" if ADK_uclibc
default "glibc" if ADK_glibc
default "musl" if ADK_musl
- default "libc" if ADK_libc
source "target/linux/config/Config.in.kernel"
@@ -722,12 +686,6 @@ config ADK_TARGET_LIB_MUSL
help
http://musl-libc.org
-config ADK_TARGET_LIB_LIBC
- prompt "Native C library"
- boolean
- select ADK_libc
- depends on ADK_LINUX_NATIVE
-
endchoice
config ADK_TARGET_SUFFIX
@@ -737,24 +695,24 @@ config ADK_TARGET_SUFFIX
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_TARGET_KERNEL64
- default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64
+ 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_TARGET_KERNEL64
- default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64
+ 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_TARGET_KERNEL64
- default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_TARGET_KERNEL64
+ 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
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 221a373df..650bc8729 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -98,7 +98,7 @@ config ADK_KERNEL_PCI
config ADK_KERNEL_64BIT
boolean
- default y if ADK_TARGET_KERNEL64
+ default y if ADK_LINUX_64
config ADK_KERNEL_CPU_MIPS64
boolean
@@ -106,6 +106,9 @@ config ADK_KERNEL_CPU_MIPS64
config ADK_KERNEL_CPU_MIPS64_R1
boolean
+config ADK_KERNEL_CPU_MIPS64_R2
+ boolean
+
config ADK_KERNEL_PREEMPT
boolean
diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64
index d4ef42c15..5ceba460c 100644
--- a/target/mips/kernel/qemu-mips64
+++ b/target/mips/kernel/qemu-mips64
@@ -2,7 +2,6 @@ CONFIG_MIPS=y
CONFIG_MIPS_MALTA=y
CONFIG_CPU_BIG_ENDIAN=y
CONFIG_CPU_MIPS64_R1=y
-CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el
index 684b187be..383b7f160 100644
--- a/target/mips/kernel/qemu-mips64el
+++ b/target/mips/kernel/qemu-mips64el
@@ -2,7 +2,6 @@ CONFIG_MIPS=y
CONFIG_MIPS_MALTA=y
CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPU_MIPS64_R1=y
-CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
diff --git a/target/ppc64/kernel/qemu-ppc64 b/target/ppc64/kernel/qemu-ppc64
index 0eb40bd77..ebf952146 100644
--- a/target/ppc64/kernel/qemu-ppc64
+++ b/target/ppc64/kernel/qemu-ppc64
@@ -8,7 +8,6 @@ CONFIG_PPC_FPU=y
CONFIG_PPC_STD_MMU=y
CONFIG_PPC_STD_MMU_64=y
CONFIG_PPC_DOORBELL=y
-CONFIG_64BIT=y
CONFIG_PPC_OF=y
CONFIG_PPC_UDBG_16550=y
CONFIG_PPC_PSERIES=y
diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64
index a2b048860..e3cd03068 100644
--- a/target/sparc64/kernel/qemu-sparc64
+++ b/target/sparc64/kernel/qemu-sparc64
@@ -1,6 +1,5 @@
CONFIG_SPARC=y
CONFIG_SPARC64=y
-CONFIG_64BIT=y
CONFIG_PCI=y
CONFIG_PCI_SYSCALL=y
CONFIG_PCI_DOMAINS=y
diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64
index e0183cc39..baad58c81 100644
--- a/target/x86_64/kernel/qemu-x86_64
+++ b/target/x86_64/kernel/qemu-x86_64
@@ -1,5 +1,4 @@
CONFIG_X86=y
-CONFIG_64BIT=y
CONFIG_X86_64=y
CONFIG_GENERIC_CPU=y
CONFIG_PROCESSOR_SELECT=y