From 06ce168a42a0834f2ab1b17a493c6e339906404a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 2 Sep 2011 16:07:27 +0200 Subject: add basic support for qemu-system-sh4 --- package/libgcc/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package') diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 55f9e5b90..353c5cc32 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -11,6 +11,8 @@ PKG_DFLT_LIBGCC:= y if !ADK_TOOLCHAIN_ONLY NO_DISTFILES:= 1 +PKG_ARCH_DEPENDS:= !sh + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGCC,libgcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -- cgit v1.2.3 From f3431e3a6f89b384517885e7805c8706b2c6ae5d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 4 Sep 2011 17:32:47 +0200 Subject: add support for Qemu Versatile with network emulation --- package/base-files/Makefile | 3 +++ target/arm/Makefile | 13 ++++++++++--- target/arm/sys-available/qemu-arm | 5 ----- target/config/Config.in | 21 ++++++++++++++++++++- target/linux/config/Config.in.netdevice | 10 ++++++++++ target/linux/config/Config.in.serial | 11 +++++++++-- target/linux/config/Config.in.systems | 3 +++ 7 files changed, 55 insertions(+), 11 deletions(-) (limited to 'package') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 28fb34348..4cc7e970a 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -64,6 +64,9 @@ endif cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \ cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab +ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y) + $(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab +endif $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ diff --git a/target/arm/Makefile b/target/arm/Makefile index 8e6ab0df7..c62a6fb6f 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -11,6 +11,13 @@ ZKERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage KERNEL:=$(LINUX_DIR)/vmlinux LOADADDR:=0x20008000 +ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y) +MACH:=spitz +endif +ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y) +MACH:=versatilepb +endif + tools-compile: $(MAKE) -C ../tools/uboot-mkimage @@ -50,7 +57,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-arm -M spitz -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' + @echo 'qemu-system-arm -M $(MACH) -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -64,7 +71,7 @@ endif @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-arm -M spitz -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-arm -M $(MACH) -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -77,6 +84,6 @@ endif @echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-arm -M spitz -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-arm -M $(MACH) -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm index beb1e2ee4..1e62f2abb 100644 --- a/target/arm/sys-available/qemu-arm +++ b/target/arm/sys-available/qemu-arm @@ -4,12 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM select ADK_qemu_arm select ADK_little select ADK_EABI - select ADK_KERNEL_ARCH_PXA - select ADK_KERNEL_PXA_SHARPSL - select ADK_KERNEL_MACH_SPITZ - select ADK_KERNEL_SPI_PXA2XX select ADK_TARGET_NO_FPU select ADK_HARDWARE_QEMU help Support for Qemu Emulator (arm). - Optimized for PXA270 Spitz. diff --git a/target/config/Config.in b/target/config/Config.in index 58a27cbbd..e97ce5443 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -74,6 +74,24 @@ config ADK_TARGET_ABI_N64 endchoice # submodel support +# +choice +prompt "Qemu ARM Emulation" +depends on ADK_TARGET_SYSTEM_QEMU_ARM + +config ADK_TARGET_QEMU_ARM_MODEL_SPITZ + boolean "Xscale PXA270 Spitz PDA" + select ADK_KERNEL_ARCH_PXA + select ADK_KERNEL_PXA_SHARPSL + select ADK_KERNEL_MACH_SPITZ + select ADK_KERNEL_SPI_PXA2XX + +config ADK_TARGET_QEMU_ARM_MODEL_VERSATILE + boolean "ARM Ltd. Versatile" + select ADK_KERNEL_ARCH_VERSATILE + +endchoice + choice prompt "Foxboard LX Model" depends on ADK_TARGET_SYSTEM_FOXBOARD_LX @@ -348,7 +366,8 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_X86 - default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_ARM + default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ + default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE default "console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 2f9b87200..b615156f9 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -22,6 +22,16 @@ config ADK_KERNEL_NETDEV_1000 config ADK_KERNEL_VIA_RHINE_MMIO boolean +config ADK_KERNEL_SMC91X + boolean + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_MII + default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE + default n + help + config ADK_KERNEL_CPMAC boolean select ADK_KERNEL_NETDEVICES diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 3451046de..adc25312d 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -1,8 +1,15 @@ config ADK_KERNEL_SERIAL_PXA boolean - default y if ADK_TARGET_SYSTEM_QEMU_ARM + default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ config ADK_KERNEL_SERIAL_PXA_CONSOLE boolean - default y if ADK_TARGET_SYSTEM_QEMU_ARM + default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ +config ADK_KERNEL_SERIAL_AMBA_PL011 + boolean + default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE + +config ADK_KERNEL_SERIAL_AMBA_PL011_CONSOLE + boolean + default y if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index 24baa864e..3e64caddc 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -35,6 +35,9 @@ config ADK_KERNEL_LEMOTE_MACH2F boolean # arm systems +config ADK_KERNEL_ARCH_VERSATILE + boolean + config ADK_KERNEL_ARCH_PXA boolean -- cgit v1.2.3 From b5b6c80366e4d2604278f7359cde759059fe2a8f Mon Sep 17 00:00:00 2001 From: Tobias Breckle Date: Mon, 5 Sep 2011 00:21:37 +0200 Subject: added boost c++ library package --- package/boost/Makefile | 163 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 package/boost/Makefile (limited to 'package') diff --git a/package/boost/Makefile b/package/boost/Makefile new file mode 100644 index 000000000..c5e15cb31 --- /dev/null +++ b/package/boost/Makefile @@ -0,0 +1,163 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= boost +PKG_VERSION:= 1_47_0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ff180a5276bec773a7625cac7e2288e8 +PKG_DESCR:= boost C++ library +PKG_SECTION:= libs +PKG_URL:= http://www.boost.org/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/} +DISTFILES:= boost_1_47_0.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION} + +PKG_SUBPKGS:= BOOST BOOST_DEV +PKG_CHOICES_BOOST:= STATIC SHARED BOTH +PKGCD_STATIC:= install static libs +PKGCD_SHARED:= install shared libs +PKGCD_BOTH:= install static and shared libs +PKGSD_BOOST_DEV:= boost header files +PKGSC_BOOST_DEV:= devel + +PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave + +PKGFD_date_time:= with date-time +PKGFD_python:= with Python +PKGFB_python:= python +PKGFS_python:= python +PKGFD_iostreams:= with iostreams +PKGFD_graph:= with graph +PKGFD_graph_parallel:= with graph_parallel +PKGFD_math:= with math +PKGFD_program_options:= with program_options +PKGFD_regex:= with regex +PKGFD_serialization:= with serialization +PKGFD_signals:= with signals +PKGFD_system:= with system +PKGFD_test:= with test +PKGFD_thread:= with thread +PKGFD_wave:= with wave + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,BOOST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +CONFIGURE_ARGS += \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=${WRKINST}/usr \ + +ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},) + CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_DIR}/usr/lib +else + CONFIGURE_ARGS += --without-iostreams +endif +ifeq (${ADK_PACKAGE_BOOST_DATE_TIME},) + CONFIGURE_ARGS+=--without-date_time +endif +ifeq (${ADK_PACKAGE_BOOST_PYTHON},) + CONFIGURE_ARGS+=--without-python +endif +ifeq (${ADK_PACKAGE_BOOST_GRAPH},) + CONFIGURE_ARGS+=--without-graph +endif +ifeq (${ADK_PACKAGE_BOOST_math},) + CONFIGURE_ARGS+=--without-math +endif +ifeq (${ADK_PACKAGE_BOOST_PROGRAM_OPTIONS},) + CONFIGURE_ARGS+=--without-program_options +endif +ifeq (${ADK_PACKAGE_BOOST_REGEX},) + CONFIGURE_ARGS+=--without-regex +endif +ifeq (${ADK_PACKAGE_BOOST_SERIALIZATION},) + CONFIGURE_ARGS+=--without-serialization +endif +ifeq (${ADK_PACKAGE_BOOST_SIGNALS},) + CONFIGURE_ARGS+=--without-signals +endif +ifeq (${ADK_PACKAGE_BOOST_SYSTEM},) + CONFIGURE_ARGS+=--without-system +endif +ifeq (${ADK_PACKAGE_BOOST_TEST},) + CONFIGURE_ARGS+=--without-test +endif +ifeq (${ADK_PACKAGE_BOOST_THREAD},) + CONFIGURE_ARGS+=--without-thread +endif +ifeq (${ADK_PACKAGE_BOOST_WAVE},) + CONFIGURE_ARGS+=--without-wave +endif + +# some variables for build +GPP_PATH:= ${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++ +GPP_VERSION:= "`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`" +BJAM_PATH:= "`find ${WRKBUILD} -type f -name "bjam"`" +PYTHON_PATH:= ${STAGING_TARGET_DIR}/usr/bin/python +PYTHON_INCLUDE:= "`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`" +PYTHON_LIB:= "`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`" +USER_JAM:= ${WRKBUILD}/tools/build/v2/user-config.jam + +pre-build: + @echo "build bjam..." + cd $(WRKBUILD)/tools/build/v2/engine; ./build.sh gcc + +do-build: + @echo "build boost library..." +# remove exisiting using gcc line from user.jam +ifeq (`grep "^using gcc" ${USER_JAM} | wc -l`, 0) + ${SED} "/^using gcc/d" ${USER_JAM} +endif +# add using gcc line with determined options to user.jam + echo "using gcc : ${GPP_VERSION} : ${GPP_PATH} ;" >> ${USER_JAM}; + +# remove exisiting using python line from user.jam +ifeq (`grep "^using python" ${USER_JAM} | wc -l`, 0) + ${SED} "/^using python/d" ${USER_JAM} +endif +ifneq (${ADK_PACKAGE_BOOST_PYTHON},) +# add using python line with determined options to user.jam + echo "using python : ${PYTHON_VERSION} : ${PYTHON_PATH} : ${PYTHON_INCLUDE} : ${PYTHON_LIB} ;" >> ${USER_JAM}; +endif + +# run bjam to build boost + ( cd ${WRKBUILD}; \ + ${BJAM_PATH} \ + -sBUILD=release \ + --toolset=gcc-${GPP_VERSION} \ + --build-type=minimal \ + --layout=versioned \ + --disable-long-double \ + --without-mpi \ + ${CONFIGURE_ARGS} \ + install \ + ) + +do-install: +ifneq (${ADK_PACKAGE_BOOST_SHARED},) + ${INSTALL_DIR} ${IDIR_BOOST}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_BOOST}/usr/include +endif +ifneq (${ADK_PACKAGE_BOOST_SHARED},) + ${INSTALL_DIR} ${IDIR_BOOST}/usr/lib + ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib +endif +ifneq (${ADK_PACKAGE_BOOST_STATIC},) + ${INSTALL_DIR} ${IDIR_BOOST}/usr/lib + ${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib +endif +ifneq (${ADK_PACKAGE_BOOST_BOTH},) + ${INSTALL_DIR} ${IDIR_BOOST}/usr/lib + ${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib + ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib +endif + +include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 92f89eb60d3a448a1a71243b7f0c8f5b8b2322cd Mon Sep 17 00:00:00 2001 From: Tobias Breckle Date: Mon, 5 Sep 2011 00:22:16 +0200 Subject: polished boost --- package/boost/Makefile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'package') diff --git a/package/boost/Makefile b/package/boost/Makefile index c5e15cb31..65868dd9f 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -15,12 +15,13 @@ DISTFILES:= boost_1_47_0.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION} PKG_SUBPKGS:= BOOST BOOST_DEV +PKGSD_BOOST_DEV:= boost header files +PKGSC_BOOST_DEV:= devel + PKG_CHOICES_BOOST:= STATIC SHARED BOTH PKGCD_STATIC:= install static libs PKGCD_SHARED:= install shared libs PKGCD_BOTH:= install static and shared libs -PKGSD_BOOST_DEV:= boost header files -PKGSC_BOOST_DEV:= devel PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave @@ -44,6 +45,7 @@ PKGFD_wave:= with wave include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BOOST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,BOOST_DEV,boost-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BOOST_DEV},${PKGSC_BOOST_DEV})) CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -141,23 +143,24 @@ endif install \ ) -do-install: -ifneq (${ADK_PACKAGE_BOOST_SHARED},) - ${INSTALL_DIR} ${IDIR_BOOST}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_BOOST}/usr/include -endif -ifneq (${ADK_PACKAGE_BOOST_SHARED},) + +boost-install: ${INSTALL_DIR} ${IDIR_BOOST}/usr/lib +ifneq (${ADK_PACKAGE_BOOST_SHARED},) ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib endif ifneq (${ADK_PACKAGE_BOOST_STATIC},) - ${INSTALL_DIR} ${IDIR_BOOST}/usr/lib ${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib endif ifneq (${ADK_PACKAGE_BOOST_BOTH},) - ${INSTALL_DIR} ${IDIR_BOOST}/usr/lib ${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib endif + +boost-dev-install: + ${INSTALL_DIR} ${IDIR_BOOST_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_BOOST_DEV}/usr/include + + include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 40c2b2f6a83e9cca14567e855fc75a8d1ef78f28 Mon Sep 17 00:00:00 2001 From: Tobias Breckle Date: Mon, 5 Sep 2011 00:22:34 +0200 Subject: changed behavior of user.jam line removing --- package/boost/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'package') diff --git a/package/boost/Makefile b/package/boost/Makefile index 65868dd9f..45c18e08e 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -115,16 +115,12 @@ pre-build: do-build: @echo "build boost library..." # remove exisiting using gcc line from user.jam -ifeq (`grep "^using gcc" ${USER_JAM} | wc -l`, 0) ${SED} "/^using gcc/d" ${USER_JAM} -endif # add using gcc line with determined options to user.jam echo "using gcc : ${GPP_VERSION} : ${GPP_PATH} ;" >> ${USER_JAM}; # remove exisiting using python line from user.jam -ifeq (`grep "^using python" ${USER_JAM} | wc -l`, 0) ${SED} "/^using python/d" ${USER_JAM} -endif ifneq (${ADK_PACKAGE_BOOST_PYTHON},) # add using python line with determined options to user.jam echo "using python : ${PYTHON_VERSION} : ${PYTHON_PATH} : ${PYTHON_INCLUDE} : ${PYTHON_LIB} ;" >> ${USER_JAM}; -- cgit v1.2.3