diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-26 18:07:04 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-26 18:07:04 +0100 |
commit | bd3bb05b0be7f0ef4d8ec06b9cc5fa4c2f99b540 (patch) | |
tree | 2144be3038a025cc2cbae4798a5b93d3bb178a8c | |
parent | d913811021f72e34fdd7886a627f711c0f0f51e0 (diff) | |
parent | 071d460a06da4189383e79049ffa03323571a201 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r-- | mk/build.mk | 3 | ||||
-rw-r--r-- | mk/kernel-build.mk | 1 | ||||
-rw-r--r-- | package/exmap/Makefile | 31 | ||||
-rw-r--r-- | package/libffi/Makefile | 1 | ||||
-rw-r--r-- | target/arm/kernel/qemu-arm-versatilepb | 1 | ||||
-rw-r--r-- | target/arm/kernel/qemu-arm-vexpress-a9 | 1 | ||||
-rw-r--r-- | target/arm/sys-available/qemu-arm | 1 | ||||
-rw-r--r-- | target/config/Config.in | 10 | ||||
-rw-r--r-- | target/mips/sys-available/qemu-mips | 4 | ||||
-rw-r--r-- | target/mips/sys-available/qemu-mips64 | 5 | ||||
-rw-r--r-- | target/mips/sys-available/qemu-mips64el | 5 | ||||
-rw-r--r-- | target/mips/sys-available/qemu-mipsel | 4 | ||||
-rw-r--r-- | target/mips/sys-available/toolchain-mips | 4 | ||||
-rw-r--r-- | target/mips/sys-available/toolchain-mipsel | 4 | ||||
-rw-r--r-- | target/x86_64/sys-available/qemu-x86_64 | 1 |
15 files changed, 35 insertions, 41 deletions
diff --git a/mk/build.mk b/mk/build.mk index 12c7bf2d3..375ccfb0b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -503,8 +503,9 @@ test-framework: for libc in $$libc;do \ ( \ mkdir -p $(TOPDIR)/firmware/; \ - for arch in arm armhf microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \ + for arch in $$(grep -v m68k target/tarch.lst|xargs);do \ tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##"); \ + arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=initramfsarchive COLLECTION=test defconfig; \ diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index ffb612334..448c133c3 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -54,6 +54,7 @@ $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE) LOCALVERSION="" \ modules_install $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET_ARCH)-create-packages + @mkdir -p ${PACKAGE_DIR} ifneq ($(strip $(TARGETS)),) $(MAKE) $(TARGETS) endif diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 9ea289eaf..6755f89df 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -5,32 +5,23 @@ include ${TOPDIR}/rules.mk PKG_NAME:= exmap PKG_VERSION:= 0.4.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 55aec784e214037e61400287a55b5426 -PKG_DESCR:= memory analysing client tool +PKG_DESCR:= memory analysing tools PKG_SECTION:= debug -PKG_DEPENDS:= exmap-kmod libreadline glib +PKG_DEPENDS:= libreadline glib PKG_BUILDDEP:= glib readline autotool PKG_SITES:= http://labs.o-hand.com/sources/exmap-console/ PKG_ARCH_DEPENDS:= !m68k PKG_CFLINE_EXMAP:= depends on !ADK_TOOLCHAIN_ONLY -PKG_SUBPKGS:= EXMAP EXMAPD EXMAPSERVER EXMAP_KMOD -PKGSD_EXMAPD:= memory analysing daemon -PKGSD_EXMAPSERVER:= memory analysing server -PKGSD_EXMAP_KMOD:= memory analysing kernel module -PKGSC_EXMAP_KMOD:= kernel - DISTFILES:= ${PKG_NAME}-console-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_EXMAPD},${PKG_SECTION})) -$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_EXMAPSERVER},${PKG_SECTION})) -$(eval $(call PKG_template,EXMAP_KMOD,exmap-kmod,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_EXMAP_KMOD},${PKGSC_EXMAP_KMOD})) AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-doc @@ -39,17 +30,13 @@ CONFIGURE_ENV+= LIBS="-lncurses" pre-build: $(MAKE) -C ${WRKBUILD}/kernel $(KERNEL_MODULE_FLAGS) -post-install: - ${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/etc/modules.d/ - echo "exmap" > ${IDIR_EXMAP_KMOD}/etc/modules.d/90-exmap - ${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/lib/modules/${KERNEL_VERSION}/ +exmap-install: + ${INSTALL_DIR} ${IDIR_EXMAP}/etc/modules.d/ + echo "exmap" > ${IDIR_EXMAP}/etc/modules.d/90-exmap + ${INSTALL_DIR} ${IDIR_EXMAP}/lib/modules/${KERNEL_VERSION}/ ${INSTALL_DATA} ${WRKBUILD}/kernel/exmap.ko \ - ${IDIR_EXMAP_KMOD}/lib/modules/${KERNEL_VERSION} + ${IDIR_EXMAP}/lib/modules/${KERNEL_VERSION} ${INSTALL_DIR} ${IDIR_EXMAP}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/src/exmap ${IDIR_EXMAP}/usr/sbin - ${INSTALL_DIR} ${IDIR_EXMAPD}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/src/exmapd ${IDIR_EXMAPD}/usr/sbin - ${INSTALL_DIR} ${IDIR_EXMAPSERVER}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/src/exmapserver ${IDIR_EXMAPSERVER}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/src/exmap* ${IDIR_EXMAP}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libffi/Makefile b/package/libffi/Makefile index 0b316720d..a7e957582 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -10,6 +10,7 @@ PKG_MD5SUM:= 45f3b6dbc9ee7c7dfbbbc5feba571529 PKG_DESCR:= Foreign Function Interface library PKG_SECTION:= libs PKG_BUILDDEP:= autotool libffi-host +HOST_BUILDDEP:= autotool PKG_URL:= http://sourceware.org/libffi/ PKG_SITES:= ftp://sourceware.org/pub/libffi/ PKG_OPTS:= dev diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index 29a82ccf6..ec76019d4 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -7,6 +7,7 @@ CONFIG_PLAT_VERSATILE_CLCD=y CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y CONFIG_PLAT_VERSATILE=y CONFIG_ARM_TIMER_SP804=y +CONFIG_KUSER_HELPERS=y CONFIG_CPU_ARM926T=y CONFIG_CPU_32v5=y CONFIG_ARM_AMBA=y diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9 index 7415e31b4..b89b87337 100644 --- a/target/arm/kernel/qemu-arm-vexpress-a9 +++ b/target/arm/kernel/qemu-arm-vexpress-a9 @@ -6,6 +6,7 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VEXPRESS_DCSCB=y CONFIG_ARCH_VEXPRESS_TC2_PM=y +CONFIG_KUSER_HELPERS=y CONFIG_ARM_AMBA=y CONFIG_AEABI=y CONFIG_ATAGS=y diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm index aeaa41d44..1fa057c4b 100644 --- a/target/arm/sys-available/qemu-arm +++ b/target/arm/sys-available/qemu-arm @@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM select ADK_qemu_arm select ADK_little select ADK_soft_float - select ADK_fpu_vfp select ADK_eabi select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/config/Config.in b/target/config/Config.in index 4586de17b..794cc934f 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -139,7 +139,7 @@ config ADK_TARGET_MIPS_ABI choice prompt "Target ABI" -depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN +depends on ADK_LINUX_64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU config ADK_TARGET_ABI_N32 boolean "N32 ABI (new)" @@ -157,7 +157,7 @@ endchoice choice prompt "Target ABI" -depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN +depends on ADK_LINUX_64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN && !ADK_HARDWARE_QEMU config ADK_TARGET_ABI_64 boolean "64 Bit ABI" @@ -194,8 +194,8 @@ config ADK_TARGET_KERNEL_MINICONFIG 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 - default "qemu-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL + 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 @@ -203,7 +203,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 "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 diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips index 98aaf8a02..d3ea99011 100644 --- a/target/mips/sys-available/qemu-mips +++ b/target/mips/sys-available/qemu-mips @@ -1,10 +1,10 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS - bool "Qemu Emulator (big endian)" + bool "Qemu Emulator (mips32 big endian)" select ADK_mips select ADK_big select ADK_qemu_mips select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_VMLINUZ help - Qemu support for mips big endian architecture. + Qemu support for mips32 big endian architecture. diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64 index 10da0835c..ce9c5b0fa 100644 --- a/target/mips/sys-available/qemu-mips64 +++ b/target/mips/sys-available/qemu-mips64 @@ -1,12 +1,13 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64 - bool "Qemu Emulator (mips64 big endian)" + bool "Qemu Emulator (mips64 big endian o32 abi)" select ADK_mips select ADK_big + select ADK_o32 select ADK_qemu_mips64 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_VMLINUZ help - Qemu support for mips64 big endian architecture. + Qemu support for mips64 big endian architecture with o32 abi. diff --git a/target/mips/sys-available/qemu-mips64el b/target/mips/sys-available/qemu-mips64el index 82bb7fbf2..067d0d6ed 100644 --- a/target/mips/sys-available/qemu-mips64el +++ b/target/mips/sys-available/qemu-mips64el @@ -1,11 +1,12 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL - bool "Qemu Emulator (mips64 little endian)" + bool "Qemu Emulator (mips64 little endian o32 abi)" select ADK_mips select ADK_little + select ADK_o32 select ADK_qemu_mips64el select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_VMLINUZ help - Qemu support for mips64 little endian architecture. + Qemu support for mips64 little endian architecture with o32 abi. diff --git a/target/mips/sys-available/qemu-mipsel b/target/mips/sys-available/qemu-mipsel index 7163ae120..688471d6d 100644 --- a/target/mips/sys-available/qemu-mipsel +++ b/target/mips/sys-available/qemu-mipsel @@ -1,10 +1,10 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL - bool "Qemu Emulator (little endian)" + bool "Qemu Emulator (mips32 little endian)" select ADK_mips select ADK_qemu_mipsel select ADK_little select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_VMLINUZ help - Qemu support for mips little endian architecture. + Qemu support for mips32 little endian architecture. diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips index 9e93cfdcd..55a2e9e7d 100644 --- a/target/mips/sys-available/toolchain-mips +++ b/target/mips/sys-available/toolchain-mips @@ -1,10 +1,10 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS - bool "Toolchain only (big endian)" + bool "Toolchain only (mips32 big endian)" select ADK_mips select ADK_big select ADK_toolchain_mips select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TGZ help - MIPS toolchain. + MIPS32 big endian toolchain. diff --git a/target/mips/sys-available/toolchain-mipsel b/target/mips/sys-available/toolchain-mipsel index 4c197b808..e850d7116 100644 --- a/target/mips/sys-available/toolchain-mipsel +++ b/target/mips/sys-available/toolchain-mipsel @@ -1,10 +1,10 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL - bool "Toolchain only (little endian)" + bool "Toolchain only (mips32 little endian)" select ADK_mips select ADK_little select ADK_toolchain_mipsel select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TGZ help - MIPS toolchain. + MIPS32 little endian toolchain. diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index 48b6fceab..5067a8ecf 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 bool "Qemu Emulator" select ADK_x86_64 select ADK_qemu_x86_64 + select ADK_64 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_HARDWARE_QEMU |