diff options
29 files changed, 242 insertions, 2765 deletions
@@ -152,7 +152,6 @@ config ADK_KERNEL_COMP_XZ select ADK_KERNEL_RD_XZ select ADK_KERNEL_KERNEL_XZ select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ - depends on !ADK_LINUX_MIPS config ADK_KERNEL_COMP_LZMA prompt "use LZMA compression" @@ -104,6 +104,9 @@ cleantarget targetclean: .prereq_done -@${GMAKE_INV} cleantarget @-rm -f make.log +cleantoolchain toolchainclean: .prereq_done + -@${GMAKE_INV} cleantoolchain + distclean cleandist: -@${GMAKE_INV} distclean @-rm -f make.log .prereq_done @@ -1,3 +1,4 @@ +- port uuterm - move tools to package host infrastructure, resolve dependency handling for host tools - finish miniconfig + cleanup - qemu-sh serial diff --git a/mk/build.mk b/mk/build.mk index 8000702d8..c0f05556f 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -141,7 +141,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M $(STAGING_HOST_DIR)/usr/bin/depmaker > ${TOPDIR}/package/Depends.mk .NOTPARALLEL: -.PHONY: all world clean cleantarget cleandir distclean image_clean +.PHONY: all world clean cleantarget cleandir cleantoolchain distclean image_clean world: mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \ @@ -252,10 +252,8 @@ clean: $(MAKE) -C $(CONFIG) clean for f in $$(ls ${STAGING_PKG_DIR}/ 2>/dev/null |grep -v [A-Z]|grep -v stamps 2>/dev/null); do \ while read file ; do \ - echo ${STAGING_DIR}/$$file ;\ rm ${STAGING_DIR}/$$file 2>/dev/null;\ - done < $$f ; \ - echo ${STAGING_PKG_DIR}/$$f ;\ + done < ${STAGING_PKG_DIR}/$$f ; \ rm ${STAGING_PKG_DIR}/$$f ; \ done rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR) \ @@ -275,6 +273,15 @@ cleandir: rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk +cleantoolchain: + @$(TRACE) cleantoolchain + @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) + rm -rf $(BUILD_DIR_PFX) $(TARGET_DIR_PFX) \ + ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d + rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) + rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) + rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk + cleantarget: @$(TRACE) cleantarget @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) @@ -535,7 +542,8 @@ bulktoolchain: $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ - tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \ + tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}_*; \ + $(GMAKE) cleantoolchain; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \ if [ -f .exit ];then break;fi \ diff --git a/mk/image.mk b/mk/image.mk index 571752eaf..3f199c9cc 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -51,6 +51,7 @@ image-prepare-post: -rm -f ${TARGET_DIR}/bin/sh ln -sf ${BINSH} ${TARGET_DIR}/bin/sh ifeq ($(ADK_LINUX_X86_64),y) +ifneq ($(ADK_TARGET_ABI_X32),y) # fixup lib dirs mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/lib/ @@ -60,6 +61,7 @@ ifeq ($(ADK_LINUX_X86_64),y) rm -rf ${TARGET_DIR}/usr/lib/ (cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib) endif +endif ifeq ($(ADK_LINUX_PPC64),y) # fixup lib dirs mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} @@ -175,10 +177,11 @@ createinitramfs: ${FW_DIR}/${INITRAMFS}_list ${LINUX_DIR}/.config ( \ echo "CONFIG_BLK_DEV_INITRD=y"; \ + echo "CONFIG_ACPI_INITRD_TABLE_OVERRIDE=n"; \ echo 'CONFIG_INITRAMFS_SOURCE="${FW_DIR}/${INITRAMFS}_list"'; \ - echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set' >> ${LINUX_DIR}/.config; \ - echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> ${LINUX_DIR}/.config; \ - echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> ${LINUX_DIR}/.config; \ + echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set'; \ + echo 'CONFIG_INITRAMFS_ROOT_UID=0'; \ + echo 'CONFIG_INITRAMFS_ROOT_GID=0'; \ ) >> ${LINUX_DIR}/.config ifeq ($(ADK_KERNEL_COMP_XZ),y) echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config diff --git a/mk/vars.mk b/mk/vars.mk index a0898ae2d..ef50e59d8 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -48,8 +48,13 @@ TARGET_DIR_PFX:= $(BASE_DIR)/root_* TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} HOST_PATH= ${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} AUTOTOOL_PATH= ${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} +ifeq ($(ADK_TARGET_ABI_X32),y) +REAL_GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux-$(ADK_TARGET_SUFFIX) +GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux +else REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux +endif ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),) GCC_CHECK:= GCC_HONOUR_COPTS=2 diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 503efa1e5..0e497279f 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dropbear -PKG_VERSION:= 2013.62 +PKG_VERSION:= 2014.63 PKG_RELEASE:= 2 -PKG_MD5SUM:= ca2c7932a1399cf361f795aaa3843998 +PKG_MD5SUM:= 7066bb9a2da708f3ed06314fdc9c47fd PKG_DESCR:= SSH 2 server/client designed for embedded systems PKG_SECTION:= net/security PKG_URL:= http://matt.ucc.asn.au/dropbear/ diff --git a/package/dropbear/patches/patch-Makefile_in b/package/dropbear/patches/patch-Makefile_in index 890900ee5..3a139a546 100644 --- a/package/dropbear/patches/patch-Makefile_in +++ b/package/dropbear/patches/patch-Makefile_in @@ -1,15 +1,6 @@ ---- dropbear-2013.58.orig/Makefile.in 2013-04-18 16:58:14.000000000 +0200 -+++ dropbear-2013.58/Makefile.in 2013-08-13 14:33:37.000000000 +0200 -@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac - loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ - listener.h fake-rfc2553.h - --dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ -+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) - dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) - dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) - dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) -@@ -75,10 +75,9 @@ AR=@AR@ +--- dropbear-2014.63.orig/Makefile.in 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/Makefile.in 2014-03-01 18:27:41.000000000 +0100 +@@ -81,10 +81,10 @@ AR=@AR@ RANLIB=@RANLIB@ STRIP=@STRIP@ INSTALL=@INSTALL@ @@ -20,15 +11,25 @@ +CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) +LIBS+=@LIBS@ @CRYPTLIB@ +LDFLAGS+=@LDFLAGS@ ++ EXEEXT=@EXEEXT@ -@@ -169,7 +168,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile - # multi-binary compilation. - MULTIOBJS= - ifeq ($(MULTI),1) -- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ -+ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) - CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI +@@ -163,7 +163,7 @@ dropbearkey: $(dropbearkeyobjs) + dropbearconvert: $(dropbearconvertobjs) + + dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile +- $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@ ++ $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) + + dbclient: $(HEADERS) $(LIBTOM_DEPS) Makefile + $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) +@@ -184,7 +184,7 @@ ifeq ($(MULTI),1) endif + dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile +- $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@ ++ $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS) + + multibinary: dropbearmulti$(EXEEXT) + diff --git a/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h new file mode 100644 index 000000000..ef0231e4c --- /dev/null +++ b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h @@ -0,0 +1,14 @@ +fix from +http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html + +--- dropbear-2014.63.orig/libtomcrypt/src/headers/tomcrypt_cfg.h 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/libtomcrypt/src/headers/tomcrypt_cfg.h 2014-03-01 12:35:01.000000000 +0100 +@@ -60,7 +60,7 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const + #define ENDIAN_LITTLE + #define ENDIAN_32BITWORD + #define LTC_FAST +- #define LTC_FAST_TYPE unsigned long ++ #define LTC_FAST_TYPE unsigned long long + #endif + + /* detects MIPS R5900 processors (PS2) */ diff --git a/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h new file mode 100644 index 000000000..b4db81a06 --- /dev/null +++ b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h @@ -0,0 +1,41 @@ +fix from: +http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html + +--- dropbear-2014.63.orig/libtomcrypt/src/headers/tomcrypt_macros.h 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/libtomcrypt/src/headers/tomcrypt_macros.h 2014-03-01 12:36:23.000000000 +0100 +@@ -343,7 +343,7 @@ static inline unsigned RORc(unsigned wor + /* 64-bit Rotates */ + #if !defined(__STRICT_ANSI__) && defined(__GNUC__) && defined(__x86_64__) && !defined(LTC_NO_ASM) + +-static inline unsigned long ROL64(unsigned long word, int i) ++static inline unsigned long long ROL64(unsigned long long word, int i) + { + asm("rolq %%cl,%0" + :"=r" (word) +@@ -351,7 +351,7 @@ static inline unsigned long ROL64(unsign + return word; + } + +-static inline unsigned long ROR64(unsigned long word, int i) ++static inline unsigned long long ROR64(unsigned long long word, int i) + { + asm("rorq %%cl,%0" + :"=r" (word) +@@ -361,7 +361,7 @@ static inline unsigned long ROR64(unsign + + #ifndef LTC_NO_ROLC + +-static inline unsigned long ROL64c(unsigned long word, const int i) ++static inline unsigned long long ROL64c(unsigned long long word, const int i) + { + asm("rolq %2,%0" + :"=r" (word) +@@ -369,7 +369,7 @@ static inline unsigned long ROL64c(unsig + return word; + } + +-static inline unsigned long ROR64c(unsigned long word, const int i) ++static inline unsigned long long ROR64c(unsigned long long word, const int i) + { + asm("rorq %2,%0" + :"=r" (word) diff --git a/package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c b/package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c new file mode 100644 index 000000000..a821eb2f9 --- /dev/null +++ b/package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c @@ -0,0 +1,14 @@ +fix from +http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html + +--- dropbear-2014.63.orig/libtommath/bn_mp_montgomery_setup.c 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/libtommath/bn_mp_montgomery_setup.c 2014-03-01 12:34:21.000000000 +0100 +@@ -48,7 +48,7 @@ mp_montgomery_setup (mp_int * n, mp_digi + #endif + + /* rho = -1/m mod b */ +- *rho = (unsigned long)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK; ++ *rho = (mp_digit)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK; + + return MP_OKAY; + } diff --git a/package/dropbear/patches/patch-libtommath_tommath_h b/package/dropbear/patches/patch-libtommath_tommath_h new file mode 100644 index 000000000..d4716f2dc --- /dev/null +++ b/package/dropbear/patches/patch-libtommath_tommath_h @@ -0,0 +1,14 @@ +fix from +http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html + +--- dropbear-2014.63.orig/libtommath/tommath.h 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/libtommath/tommath.h 2014-03-01 12:33:13.000000000 +0100 +@@ -73,7 +73,7 @@ extern "C" { + typedef signed long long long64; + #endif + +- typedef unsigned long mp_digit; ++ typedef unsigned long long mp_digit; + typedef unsigned long mp_word __attribute__ ((mode(TI))); + + #define DIGIT_BIT 60 diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h index 88a081624..201444e68 100644 --- a/package/dropbear/patches/patch-options_h +++ b/package/dropbear/patches/patch-options_h @@ -1,7 +1,7 @@ diff -Nur dropbear-2013.58.orig/options.h dropbear-2013.58/options.h ---- dropbear-2013.58.orig/options.h 2013-04-18 16:58:14.000000000 +0200 -+++ dropbear-2013.58/options.h 2013-08-13 14:29:15.000000000 +0200 -@@ -247,7 +247,7 @@ much traffic. */ +--- dropbear-2014.63.orig/options.h 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/options.h 2014-02-27 16:29:06.000000000 +0100 +@@ -264,7 +264,7 @@ much traffic. */ /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */ #ifndef XAUTH_COMMAND diff --git a/package/dropbear/patches/patch-svr-authpubkey_c b/package/dropbear/patches/patch-svr-authpubkey_c index 289471f38..90ec56d9e 100644 --- a/package/dropbear/patches/patch-svr-authpubkey_c +++ b/package/dropbear/patches/patch-svr-authpubkey_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dropbear-0.52.orig/svr-authpubkey.c 2008-11-11 15:09:03.000000000 +0100 -+++ dropbear-0.52/svr-authpubkey.c 2009-03-19 19:29:53.000000000 +0100 -@@ -209,6 +209,8 @@ static int checkpubkey(unsigned char* al +--- dropbear-2014.63.orig/svr-authpubkey.c 2014-02-19 15:05:24.000000000 +0100 ++++ dropbear-2014.63/svr-authpubkey.c 2014-02-27 16:29:05.000000000 +0100 +@@ -208,6 +208,8 @@ static int checkpubkey(unsigned char* al goto out; } @@ -10,7 +10,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* we don't need to check pw and pw_dir for validity, since * its been done in checkpubkeyperms. */ len = strlen(ses.authstate.pw_dir); -@@ -220,6 +222,9 @@ static int checkpubkey(unsigned char* al +@@ -219,6 +221,9 @@ static int checkpubkey(unsigned char* al /* open the file */ authfile = fopen(filename, "r"); @@ -20,7 +20,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ if (authfile == NULL) { goto out; } -@@ -372,6 +377,8 @@ static int checkpubkeyperms() { +@@ -371,6 +376,8 @@ static int checkpubkeyperms() { goto out; } @@ -29,7 +29,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* allocate max required pathname storage, * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */ filename = m_malloc(len + 22); -@@ -393,6 +400,14 @@ static int checkpubkeyperms() { +@@ -392,6 +399,14 @@ static int checkpubkeyperms() { if (checkfileperm(filename) != DROPBEAR_SUCCESS) { goto out; } diff --git a/package/musl/Makefile b/package/musl/Makefile index 1de20d37e..3341c83a8 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -49,8 +49,8 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) MARCH:= armhf endif -ifeq ($(CPU_ARCH),sh4) -MARCH:= sh +ifeq ($(ADK_TARGET_ABI_X32),y) +MARCH:= x32 endif # do nothing, musl is already build in toolchain directory diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index e676dea82..bacf25ca7 100644 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -5,6 +5,10 @@ SELF=${0##*/} +if [[ -z $debug ]];then + debug=1 +fi + if [[ -z $prefix ]]; then echo >&2 "$SELF: strip command not defined ('prefix' variable not set)" exit 1 @@ -60,9 +64,13 @@ find $TARGETS -type f -a -exec file {} \; | \ echo "$SELF: $V:$S" echo "-> $T $F" eval "chmod u+w $F" - eval "mkdir -p $D/usr/lib/debug/$Q" - eval "$O --only-keep-debug $F $D/usr/lib/debug/$P.debug" + if [[ $debug -eq 1 ]];then + eval "mkdir -p $D/usr/lib/debug/$Q" + eval "$O --only-keep-debug $F $D/usr/lib/debug/$P.debug" + fi eval "$T $F" - eval "cd $D/usr/lib/debug/$Q && $O --add-gnu-debuglink=$R.debug $F" + if [[ $debug -eq 1 ]];then + eval "cd $D/usr/lib/debug/$Q && $O --add-gnu-debuglink=$R.debug $F" + fi done exit 0 diff --git a/target/config/Config.in b/target/config/Config.in index 5868a4363..2982fd088 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -127,6 +127,7 @@ config ADK_TARGET_ABI default "eabihf" if ADK_EABIHF config ADK_TARGET_MIPS_ABI + depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS string default "32" if ADK_o32 default "n32" if ADK_n32 @@ -179,12 +180,12 @@ endchoice config ADK_TARGET_LIBC_PATH string default "lib32" if ADK_n32 + default "lib" if ADK_x32 default "lib64" if ADK_n64 \ || ADK_64 \ || ADK_LINUX_SPARC64 \ || ADK_LINUX_PPC64 \ || ADK_LINUX_X86_64 - default "libx32" if ADK_x32 default "lib" @@ -208,6 +209,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64 default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 + default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 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 @@ -651,7 +653,6 @@ config ADK_TARGET_LIB_UCLIBC select ADK_uclibc depends on \ !ADK_LINUX_MICROBLAZE && \ - !ADK_LINUX_SPARC && \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ !ADK_LINUX_NATIVE @@ -726,15 +727,22 @@ config ADK_TARGET_SUFFIX string default "gnueabihf" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABIHF default "gnueabi" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABI + default "gnuabi64" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n64 + default "gnuabin32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n32 + default "gnuabi32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_o32 default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !ADK_EABI 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 "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI - default "musl" if ADK_TARGET_LIB_MUSL && !ADK_EABI - default "n64" if ADK_n64 - default "n32" if ADK_n32 + 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 "musl" if ADK_TARGET_LIB_MUSL default "32" if ADK_32 default "x32" if ADK_x32 default "gnu" diff --git a/target/sparc/kernel/qemu-sparc b/target/sparc/kernel/qemu-sparc index e88151194..26bd9a29e 100644 --- a/target/sparc/kernel/qemu-sparc +++ b/target/sparc/kernel/qemu-sparc @@ -1,6 +1,5 @@ CONFIG_SPARC=y CONFIG_SPARC32=y -CONFIG_SERIAL_CONSOLE=y CONFIG_SBUS=y CONFIG_SBUSCHAR=y CONFIG_PCI=y @@ -17,6 +16,7 @@ CONFIG_NET_CORE=y CONFIG_ETHERNET=y CONFIG_NET_VENDOR_AMD=y CONFIG_SUNLANCE=y +CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_SUNCORE=y CONFIG_SERIAL_SUNZILOG=y CONFIG_SERIAL_SUNZILOG_CONSOLE=y diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-i686 index 8becb88b7..802de7cca 100644 --- a/target/x86/kernel/qemu-i686 +++ b/target/x86/kernel/qemu-i686 @@ -1,6 +1,5 @@ -CONFIG_X86_32=y CONFIG_X86=y -CONFIG_BLOCK=y +CONFIG_X86_32=y CONFIG_PCI=y CONFIG_PCI_GOANY=y CONFIG_PCI_BIOS=y diff --git a/target/x86_64/kernel.config b/target/x86_64/kernel.config deleted file mode 100644 index 2fc483406..000000000 --- a/target/x86_64/kernel.config +++ /dev/null @@ -1,1385 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/x86 3.5.4 Kernel Configuration -# -# CONFIG_64BIT is not set -CONFIG_X86_32=y -# CONFIG_X86_64 is not set -CONFIG_X86=y -CONFIG_INSTRUCTION_DECODER=y -CONFIG_OUTPUT_FORMAT="elf32-i386" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_MMU=y -# CONFIG_NEED_DMA_MAP_STATE is not set -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_CPU_AUTOPROBE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -# CONFIG_ZONE_DMA32 is not set -# CONFIG_AUDIT_ARCH is not set -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_X86_32_LAZY_GS=y -CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y -CONFIG_IRQ_WORK=y - -# -# General setup -# -CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -# CONFIG_KERNEL_GZIP is not set -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y -# CONFIG_KERNEL_LZO is not set -CONFIG_DEFAULT_HOSTNAME="openadk" -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set -CONFIG_HAVE_GENERIC_HARDIRQS=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_KTIME_SCALAR=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y -CONFIG_GENERIC_CMOS_UPDATE=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# -# RCU Subsystem -# -CONFIG_TINY_RCU=y -# CONFIG_PREEMPT_RCU is not set -# CONFIG_TREE_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=15 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_CGROUPS is not set -# CONFIG_CHECKPOINT_RESTORE is not set -# CONFIG_NAMESPACES is not set -# CONFIG_SCHED_AUTOGROUP is not set -# CONFIG_SYSFS_DEPRECATED is not set -# CONFIG_RELAY is not set -# CONFIG_BLK_DEV_INITRD is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_EXPERT=y -CONFIG_UID16=y -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_HAVE_PCSPKR_PLATFORM=y -# CONFIG_BASE_FULL is not set -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -# CONFIG_AIO is not set -CONFIG_EMBEDDED=y -CONFIG_HAVE_PERF_EVENTS=y - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -# CONFIG_VM_EVENT_COUNTERS is not set -CONFIG_PCI_QUIRKS=y -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -# CONFIG_PROFILING is not set -CONFIG_HAVE_OPROFILE=y -CONFIG_OPROFILE_NMI_TIMER=y -# CONFIG_KPROBES is not set -# CONFIG_JUMP_LABEL is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y -CONFIG_HAVE_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_PERF_EVENTS_NMI=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y -CONFIG_HAVE_CMPXCHG_LOCAL=y -CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y - -# -# GCOV-based kernel profiling -# -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=1 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_BLOCK is not set -# CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_NOOP is not set -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -CONFIG_INLINE_READ_UNLOCK=y -# CONFIG_INLINE_READ_UNLOCK_BH is not set -CONFIG_INLINE_READ_UNLOCK_IRQ=y -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -CONFIG_INLINE_WRITE_UNLOCK=y -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set -# CONFIG_FREEZER is not set - -# -# Processor type and features -# -CONFIG_ZONE_DMA=y -# CONFIG_SMP is not set -# CONFIG_X86_EXTENDED_PLATFORM is not set -# CONFIG_X86_32_IRIS is not set -CONFIG_SCHED_OMIT_FRAME_POINTER=y -# CONFIG_PARAVIRT_GUEST is not set -CONFIG_NO_BOOTMEM=y -# CONFIG_MEMTEST is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -CONFIG_M586=y -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set |