From bc561e500e22bc9d953fd9a80144f80295a4cbbd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 09:28:19 +0100 Subject: convert to miniconfig only miniconfig is used for all targets. aranym support is still broken/experimental. 32 bit kernel support for 64 targets need to be fixed. tested on usb boot on ibm-x40 --- mk/build.mk | 13 ++++--------- mk/modules.mk | 8 +++++++- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index c4371f477..0da34de85 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -215,16 +215,11 @@ switch: fi \ fi -ifeq (${ADK_TARGET_KERNEL64},y) -KERNEL_CFG:=kernel64.config -else -KERNEL_CFG:=kernel.config -endif - kernelconfig: - cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/${KERNEL_CFG} $(BUILD_DIR)/linux/.config - ${KERNEL_MAKE_ENV} ${MAKE} ARCH=$(ARCH) ${KERNEL_MAKE_OPTS} -C $(BUILD_DIR)/linux menuconfig - cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET_ARCH)/${KERNEL_CFG} + ${KERNEL_MAKE_ENV} ${MAKE} \ + ARCH=$(ARCH) \ + ${KERNEL_MAKE_OPTS} \ + -C $(BUILD_DIR)/linux menuconfig # create a new package from package/.template newpackage: diff --git a/mk/modules.mk b/mk/modules.mk index 5fd2f6419..a9f61e659 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1175,9 +1175,15 @@ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd \ $(MODULES_DIR)/kernel/sound/core/snd-timer \ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ +,40)) + +$(eval $(call KMOD_template,SND_PCM_DMAENGINE,snd-pcm-dmaengine,\ $(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \ +,41)) + +$(eval $(call KMOD_template,SND_COMPRESS,snd-compress,\ $(MODULES_DIR)/kernel/sound/core/snd-compress \ -,40)) +,41)) $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ -- cgit v1.2.3 From ec47c602c27ceef10f38afdf8e2e2adb953b9ed8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 19:46:58 +0100 Subject: a bunch of adk-test-framework fixes. --- mk/build.mk | 13 ++++++------- mk/rootfs.mk | 3 --- package/adk-test-tools/Makefile | 2 +- package/adk-test-tools/files/test.init | 5 +++-- package/base-files/src/etc/init.d/rcK | 11 +---------- package/base-files/src/etc/init.d/rcS | 3 +-- package/cfgfs/Makefile | 2 +- target/Makefile | 2 ++ target/arm/kernel/qemu-arm-versatilepb | 1 - target/arm/sys-available/qemu-armhf | 9 +++++++++ target/config/Config.in | 24 ++++++++++++++++++------ target/linux/kernel.config | 1 + target/packages/pkg-available/test | 3 +++ 13 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 target/arm/sys-available/qemu-armhf (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 0da34de85..66472657a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -507,15 +507,15 @@ bulktoolchain: done test-framework: - if [ -z "$(LIBC)" ];then \ + @if [ -z "$(LIBC)" ];then \ libc="glibc uclibc musl"; \ else \ libc="$(LIBC)"; \ fi; \ for libc in $$libc;do \ ( \ - for arch in arm microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \ - tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#"); \ + for arch in arm armhf microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;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##"); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \ @@ -523,12 +523,11 @@ test-framework: tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ if [ -d root ];then rm -rf root;fi; \ - echo cp -a root_qemu_$${arch}_$${libc}$${abi} root; \ cp -a root_qemu_$${arch}_$${libc}$${abi} root; \ - mkdir -p $(TOPDIR)/firmware/qemu/$$tarch; \ - tar cJvf $(TOPDIR)/firmware/qemu/$$tarch/root.tar.xz root; \ + mkdir -p $(TOPDIR)/firmware/qemu/$$arch; \ + tar cJvf $(TOPDIR)/firmware/qemu/$$arch/root.tar.xz root; \ cp $(TOPDIR)/firmware/qemu_$${arch}_$${libc}$${abi}/qemu-$${arch}-archive-kernel \ - $(TOPDIR)/firmware/qemu/$$tarch/kernel; \ + $(TOPDIR)/firmware/qemu/$$arch/kernel; \ rm .config; \ done; \ ) 2>&1 | tee $(TOPDIR)/firmware/test-framework-build.log; \ diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 55830b23c..812c90680 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -10,9 +10,6 @@ endef ifeq ($(ADK_HARDWARE_QEMU),y) MTDDEV:= root=/dev/mtdblock0 -ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y) -ROOTFS:= root=/dev/sda1 -endif ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) ROOTFS:= root=/dev/vda1 endif diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile index bc2624fe9..0a60c5056 100644 --- a/package/adk-test-tools/Makefile +++ b/package/adk-test-tools/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= adk-test-tools PKG_VERSION:= 0.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_DESCR:= helper tools and scripts for adk-test-framework PKG_SECTION:= misc PKG_URL:= http://openadk.org/ diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init index 81095fa39..bb8fca527 100755 --- a/package/adk-test-tools/files/test.init +++ b/package/adk-test-tools/files/test.init @@ -4,8 +4,9 @@ [[ $1 = autostart ]] || exit 0 echo "Starting test script ..." if [ -x /run.sh ];then - exec /run.sh + /run.sh + quit else echo "no run.sh found" + quit fi -quit diff --git a/package/base-files/src/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK index 9d0e06440..938882ae5 100755 --- a/package/base-files/src/etc/init.d/rcK +++ b/package/base-files/src/etc/init.d/rcK @@ -4,15 +4,6 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin grep '^#INIT ' /etc/init.d/* | \ sort -rnk2 | \ while read line; do - shebang=$(sed -n '1s/^#![ ]*//p' ${line%%:*}) - case $shebang in - *[\ \ ]*) shebang=\'$(echo X"$shebang" | sed \ - -e 's/^X//' -e "s/'/'\\\\''/g" \ - -e 's/^\([^ ][^ ]*\)[ ]*$/\1/' \ - -e 's/^\([^ ][^ ]*\)[ ][ ]*\(..*\)$/\1 \2/' \ - -e 's/^\([^ ][^ ]*\) /\1'\'' '\''/')\' ;; - esac - ${shebang:-/bin/sh} ${line%%:*} autostop 2>&1 + sh ${line%%:*} autostop done - test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1 } | logger -s -p 6 -t '' diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS index 9daa8f5cd..ef3a52a31 100755 --- a/package/base-files/src/etc/init.d/rcS +++ b/package/base-files/src/etc/init.d/rcS @@ -5,11 +5,10 @@ if [ -f /proc/sys/kernel/printk ];then fi echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin -ln -s /proc/self/fd/2 /dev/stderr { grep '^#INIT ' /etc/init.d/* | \ sort -nk2 | \ while read line; do sh ${line%%:*} autostart done -} | tee /dev/stderr |logger -p 6 -t '' +} | logger -s -p 6 -t '' diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index a79bd73ca..70b323a76 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -16,7 +16,7 @@ PKG_CFLINE_CFGFS+= select BUSYBOX_MD5SUM@ PKG_CFLINE_CFGFS+= select BUSYBOX_XARGS@ PKG_CFLINE_CFGFS+= select BUSYBOX_FEATURE_SORT_BIG@ PKG_CFLINE_CFGFS+= depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS && !ADK_TARGET_ROOTFS_JFFS2 && !ADK_TARGET_ROOTFS_SQUASHFS -PKG_DFLT_CFGFS:= y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE) +PKG_DFLT_CFGFS:= y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE || ADK_PKG_TEST) WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/target/Makefile b/target/Makefile index f2ae18b60..1e091d3dc 100644 --- a/target/Makefile +++ b/target/Makefile @@ -53,6 +53,8 @@ config-prepare: $(TOPDIR)/.config while IFS='=' read symbol value; do \ sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \ done;) + @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 init=/sbin/init"#' \ + ${BUILD_DIR}/.kernelconfig.board @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${FS_CMDLINE}"#' \ ${BUILD_DIR}/.kernelconfig.board ifneq ($(ADK_TARGET_CMDLINE),) diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index ead723621..ce52647be 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -18,7 +18,6 @@ CONFIG_DTC=y CONFIG_OF=y CONFIG_SCSI=y CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCSI_LOWLEVEL=y diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf new file mode 100644 index 000000000..07059a8f3 --- /dev/null +++ b/target/arm/sys-available/qemu-armhf @@ -0,0 +1,9 @@ +config ADK_TARGET_SYSTEM_QEMU_ARMHF + bool "Qemu Emulator (hard-float)" + select ADK_arm + select ADK_qemu_arm + select ADK_little + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_ZIMAGE + help + Support for Qemu Emulator (armhf). diff --git a/target/config/Config.in b/target/config/Config.in index 88059fb60..dfe87bae6 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -278,22 +278,34 @@ config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 endchoice +choice +prompt "Qemu ARM Emulation (hard-float)" +depends on ADK_TARGET_SYSTEM_QEMU_ARMHF + +config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 + boolean "ARM Ltd. Versatile Express for Cortex-A9" + select ADK_hard_float + select ADK_eabihf + select ADK_CPU_CORTEX_A9 + +endchoice + choice prompt "Qemu ARM Emulation" depends on ADK_TARGET_SYSTEM_QEMU_ARM +config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 + boolean "ARM Ltd. Versatile Express for Cortex-A9" + select ADK_soft_float + select ADK_eabi + select ADK_CPU_CORTEX_A9 + config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB boolean "ARM Ltd. Versatile/PB" select ADK_soft_float select ADK_eabi select ADK_CPU_ARM926EJ_S -config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 - boolean "ARM Ltd. Versatile Express for Cortex-A9" - select ADK_hard_float - select ADK_eabihf - select ADK_CPU_CORTEX_A9 - config ADK_TARGET_QEMU_ARM_MODEL_SPITZ boolean "Xscale PXA270 Spitz PDA" select ADK_soft_float diff --git a/target/linux/kernel.config b/target/linux/kernel.config index d69b28908..3afd5bdf5 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -15,6 +15,7 @@ CONFIG_INET=y CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y CONFIG_BLOCK=y +CONFIG_BLK_DEV=y CONFIG_FILE_LOCKING=y CONFIG_SYSFS=y CONFIG_TMPFS=y diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index 6560dc8a1..074ce8246 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -5,6 +5,9 @@ config ADK_PKG_TEST select ADK_PACKAGE_STRACE select ADK_PACKAGE_SOCAT select ADK_PACKAGE_MAKE + select ADK_KERNEL_BLK_DEV_INITRD + select ADK_KERNEL_COMP_XZ + select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ help Package collection used to build adk-test-framework root filesystem. -- cgit v1.2.3 From eadad3e1d3a9163b2c9255db528c2fd0eab73d32 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 19:48:58 +0100 Subject: enable some packages for m68k, use initrd stuff for aranym --- mk/image.mk | 2 +- package/gdb/Makefile | 2 -- package/libthread_db/Makefile | 2 -- package/mpd/Makefile | 2 -- target/config/Config.in | 4 ++-- target/linux/config/Config.in.kernel | 3 +++ 6 files changed, 6 insertions(+), 9 deletions(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 6721549b5..b538e02a8 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -171,7 +171,7 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR} --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE) createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list - ${SED} 's/.*CONFIG_\(RD_\|XZ_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \ + ${SED} 's/.*CONFIG_\(RD_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \ ${LINUX_DIR}/.config ( \ echo "CONFIG_BLK_DEV_INITRD=y"; \ diff --git a/package/gdb/Makefile b/package/gdb/Makefile index d8b9a26bd..9fc0b48fa 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -11,8 +11,6 @@ PKG_DEPENDS:= libthread-db libncurses libexpat libgcc zlib PKG_BUILDDEP:= ncurses readline libiconv-tiny expat zlib PKG_NOPARALLEL:= 1 -PKG_ARCH_DEPENDS:= !m68k - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index a2e14cd10..773c4c8f2 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -19,8 +19,6 @@ PKG_SECTION:= libs PKG_CFLINE_LIBTHREAD_DB:=depends on ADK_PACKAGE_GDB || ADK_PACKAGE_GDBSERVER -PKG_ARCH_DEPENDS:= !m68k - NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/mpd/Makefile b/package/mpd/Makefile index c1ad710dc..4c8ab359a 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -16,8 +16,6 @@ PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/ PKG_NEED_CXX:= 1 -PKG_ARCH_DEPENDS:= !m68k - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR diff --git a/target/config/Config.in b/target/config/Config.in index 88059fb60..817b77a2c 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -770,8 +770,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS ADK_LINUX_NATIVE depends on !ADK_HARDWARE_VBOX depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI - select ADK_KERNEL_BLK_DEV_INITRD - select ADK_KERNEL_RD_XZ + select ADK_KERNEL_BLK_DEV_RAM if ADK_TARGET_SYSTEM_ARANYM_M68K help create an read-only initramfs system. @@ -781,6 +780,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK depends on \ ADK_HARDWARE_QEMU || \ ADK_LINUX_ARM || \ + ADK_LINUX_M68K || \ ADK_LINUX_MICROBLAZE || \ ADK_LINUX_MIPS || \ ADK_LINUX_PPC || \ diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index d928cea09..221a373df 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -7,6 +7,9 @@ config ADK_KERNEL_EXPERIMENTAL config ADK_KERNEL_BLK_DEV_INITRD boolean +config ADK_KERNEL_BLK_DEV_RAM + boolean + config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE boolean -- cgit v1.2.3 From e12db6ec06b5368efe5ae558d1e917b49be2394f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 21:22:12 +0100 Subject: remove PKG, not sure for what it was used --- mk/build.mk | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 66472657a..0c2360bc4 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -365,12 +365,6 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi - @if [ ! -z "$(PKG)" ];then \ - grep "^config" target/config/Config.in \ - |grep -i "$(PKG)" \ - |sed -e "s#^config \(.*\)#\1=y#" \ - >> $(TOPDIR)/.defconfig; \ - fi @if [ ! -z "$(LIBC)" ];then \ grep "^config" target/config/Config.in \ |grep -i "$(LIBC)" \ @@ -429,12 +423,6 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/all.config; \ fi - @if [ ! -z "$(PKG)" ];then \ - grep "^config" target/config/Config.in \ - |grep -i "$(PKG)" \ - |sed -e "s#^config \(.*\)#\1=y#" \ - >> $(TOPDIR)/all.config; \ - fi @if [ ! -z "$(LIBC)" ];then \ grep "^config" target/config/Config.in \ |grep -i "$(LIBC)" \ -- cgit v1.2.3 From dd26294176a557e1deaca4666efa99ff4468be34 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Mar 2014 21:24:05 +0100 Subject: remove oss emul support, no software in ADK needs oss. --- mk/modules.mk | 5 ----- target/linux/config/Config.in.audio | 26 +------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index a9f61e659..52678042c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1190,11 +1190,6 @@ $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ ,42)) -$(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\ - $(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \ - $(MODULES_DIR)/kernel/sound/core/oss/snd-pcm-oss \ -,45)) - $(eval $(call KMOD_template,SND_AC97_CODEC,snd-ac97-codec,\ $(MODULES_DIR)/kernel/sound/ac97_bus \ $(MODULES_DIR)/kernel/sound/pci/ac97/snd-ac97-codec \ diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d282ca91e..d3a15d602 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -22,15 +22,6 @@ config ADK_KERNEL_SND_PCM config ADK_KERNEL_SND_HWDEP boolean -config ADK_KERNEL_SND_OSSEMUL - boolean - -config ADK_KERNEL_SND_MIXER_OSS - boolean - -config ADK_KERNEL_SND_PCM_OSS - boolean - config ADK_KPACKAGE_KMOD_SOUND tristate @@ -47,27 +38,12 @@ config ADK_KPACKAGE_KMOD_SND_COMPRESS tristate config ADK_KPACKAGE_KMOD_SND - prompt "kmod-snd...................... ALSA sound support" tristate select ADK_KPACKAGE_KMOD_SOUND - select ADK_KERNEL_SND_OSSEMUL select ADK_KERNEL_SND_TIMER select ADK_KERNEL_SND_PCM select ADK_KERNEL_SND_HWDEP default n - help - Basic ALSA sound support. - -config ADK_KPACKAGE_KMOD_SND_OSSEMUL - prompt "kmod-snd-ossemul.............. ALSA OSS Emulation" - tristate - select ADK_KERNEL_SND_MIXER_OSS - select ADK_KERNEL_SND_PCM_OSS - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_IBM_X40 - default n - help - ALSA OSS Emulation config ADK_KPACKAGE_KMOD_SND_INTEL8X0 prompt "kmod-snd-intel8x0............. Intel AC97 driver" @@ -142,7 +118,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835 default n config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S - prompt "kmod-snd-bcm2708-soc-i2s........ ALSA SOC I2S Raspberry PI" + prompt "kmod-snd-bcm2708-soc-i2s...... ALSA SOC I2S Raspberry PI" select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM select ADK_KPACKAGE_KMOD_SND_SOC -- cgit v1.2.3 From e7540c9fa814f9b41f80e72bc160ce504e26cda6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 15 Mar 2014 19:26:42 +0100 Subject: startup fixes - always use /sbin/init, even for initramfs - mount devtmpfs for initramfs automatically in kernel space - fix armhf for adk-test-framework - remove mdev -s on boot, I think it is unneeded, takes very long on Qemu systems - add alias for ro/rw remounts of / - remove old /init and rc.shutdown, both unused --- mk/build.mk | 5 +++-- package/base-files/Makefile | 2 +- package/base-files/src/etc/init.d/boot | 5 ++++- package/base-files/src/etc/init.d/rcS | 3 ++- package/base-files/src/etc/profile | 2 ++ package/base-files/src/etc/rc.shutdown | 2 -- package/base-files/src/init | 7 ------- target/Makefile | 6 +++++- target/arm/Makefile | 6 +++--- target/arm/sys-available/qemu-armhf | 2 +- target/config/Config.in | 33 +++++++++++++++--------------- target/config/Config.in.arch.default | 4 ---- target/linux/patches/3.10.33/startup.patch | 32 ++++++++++++++++++++++++----- target/linux/patches/3.11.10/startup.patch | 32 ++++++++++++++++++++++++----- target/linux/patches/3.12.13/startup.patch | 32 ++++++++++++++++++++++++----- target/linux/patches/3.13.6/startup.patch | 25 ++++++++++++++++++++++ target/linux/patches/3.4.82/startup.patch | 30 +++++++++++++++++++++++---- 17 files changed, 169 insertions(+), 59 deletions(-) delete mode 100644 package/base-files/src/etc/rc.shutdown delete mode 100755 package/base-files/src/init (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 0c2360bc4..e35f29d22 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -510,11 +510,12 @@ test-framework: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ + if [ $$arch = "armhf" ];then qarch=arm; else qarch=$$arch;fi; \ if [ -d root ];then rm -rf root;fi; \ - cp -a root_qemu_$${arch}_$${libc}$${abi} root; \ + cp -a root_qemu_$${qarch}_$${libc}$${abi} root; \ mkdir -p $(TOPDIR)/firmware/qemu/$$arch; \ tar cJvf $(TOPDIR)/firmware/qemu/$$arch/root.tar.xz root; \ - cp $(TOPDIR)/firmware/qemu_$${arch}_$${libc}$${abi}/qemu-$${arch}-archive-kernel \ + cp $(TOPDIR)/firmware/qemu_$${qarch}_$${libc}$${abi}/qemu-$${qarch}-archive-kernel \ $(TOPDIR)/firmware/qemu/$$arch/kernel; \ rm .config; \ done; \ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 89b9414d9..11fb4f507 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 71 +PKG_RELEASE:= 72 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index fc2f79ac2..f52e8dc78 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -4,6 +4,10 @@ . /etc/functions.sh +if [ -f /proc/sys/kernel/printk ];then + echo 0 > /proc/sys/kernel/printk +fi + # remount /dev with smaller size mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev @@ -15,7 +19,6 @@ mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp # start mdev dynamic device node management echo >/dev/mdev.seq echo "/sbin/mdev" >/proc/sys/kernel/hotplug -mdev -s # seed some random cat /etc/.rnd >/dev/urandom 2>&1 diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS index ef3a52a31..e27bc9eb5 100755 --- a/package/base-files/src/etc/init.d/rcS +++ b/package/base-files/src/etc/init.d/rcS @@ -3,6 +3,7 @@ if [ -f /proc/sys/kernel/printk ];then echo 0 > /proc/sys/kernel/printk fi +ln -s /proc/self/fd/2 /dev/stderr echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin { @@ -11,4 +12,4 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin while read line; do sh ${line%%:*} autostart done -} | logger -s -p 6 -t '' +} |tee /dev/stderr |logger -p 6 -t '' diff --git a/package/base-files/src/etc/profile b/package/base-files/src/etc/profile index ce425b54c..eb3015d46 100644 --- a/package/base-files/src/etc/profile +++ b/package/base-files/src/etc/profile @@ -12,3 +12,5 @@ cat /etc/banner 2>&- alias l='ls -lF' alias la='ls -A' alias ll='ls -alF' +alias ro='mount -o remount,ro /' +alias rw='mount -o remount,rw /' diff --git a/package/base-files/src/etc/rc.shutdown b/package/base-files/src/etc/rc.shutdown deleted file mode 100644 index 5a1a0aa78..000000000 --- a/package/base-files/src/etc/rc.shutdown +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -# add code for shutdown routine diff --git a/package/base-files/src/init b/package/base-files/src/init deleted file mode 100755 index a27548217..000000000 --- a/package/base-files/src/init +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# devtmpfs does not get automounted for initramfs -/bin/mount -t devtmpfs devtmpfs /dev -exec 0/dev/console -exec 2>/dev/console -exec /sbin/init $* diff --git a/target/Makefile b/target/Makefile index 1e091d3dc..313a616a1 100644 --- a/target/Makefile +++ b/target/Makefile @@ -53,7 +53,7 @@ config-prepare: $(TOPDIR)/.config while IFS='=' read symbol value; do \ sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \ done;) - @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 init=/sbin/init"#' \ + @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ro"#' \ ${BUILD_DIR}/.kernelconfig.board @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${FS_CMDLINE}"#' \ ${BUILD_DIR}/.kernelconfig.board @@ -61,6 +61,10 @@ ifneq ($(ADK_TARGET_CMDLINE),) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_TARGET_CMDLINE}"#' \ ${BUILD_DIR}/.kernelconfig.board endif +ifeq ($(ADK_TARGET_QEMU_WITH_GRAPHIC),y) + @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 console=tty0"#' \ + ${BUILD_DIR}/.kernelconfig.board +endif ifneq ($(ADK_PACKAGE_CRYPTINIT_ROOT),) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_PACKAGE_CMDLINE}"#' \ ${BUILD_DIR}/.kernelconfig.board diff --git a/target/arm/Makefile b/target/arm/Makefile index e2194f1d3..77148e261 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -61,7 +61,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) @echo "Use following command to install it on SD card:" @echo "sudo ./scripts/install-rpi.sh /dev/sdb $(FW_DIR)/$(ROOTFSTARBALL)" endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @@ -75,7 +75,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) @echo 'qemu-system-arm -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user' else @@ -88,7 +88,7 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: createinitramfs @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) @echo "Start qemu with following command line:" @echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf index 798391b8c..85cc9c00f 100644 --- a/target/arm/sys-available/qemu-armhf +++ b/target/arm/sys-available/qemu-armhf @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARMHF bool "Qemu Emulator (hard-float)" select ADK_arm - select ADK_qemu_arm + select ADK_qemu_armhf select ADK_little select ADK_hard_float select ADK_eabihf diff --git a/target/config/Config.in b/target/config/Config.in index a917f6a3c..d2d5b6671 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -561,7 +561,6 @@ config ADK_TARGET_CPU_ARCH default "mips" if ADK_LINUX_MIPS && ADK_big default "mipsel" if ADK_LINUX_MIPS && ADK_little default "arm" if ADK_LINUX_ARM && ADK_little - default "armeb" if ADK_LINUX_ARM && ADK_big default "sparc" if ADK_LINUX_SPARC default "sparc64" if ADK_LINUX_SPARC64 default "sh4" if ADK_LINUX_SH && ADK_little @@ -615,28 +614,27 @@ config ADK_TARGET_CFLAGS config ADK_TARGET_CMDLINE string default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI - default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default "console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I + default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 + default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100 default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - 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_I686 - default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_X86_64 - default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SPARC64 - default "console=ttyS0,9600 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC - default "console=hvc0 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC64 - default "console=ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - default "console=ttyS0,115200" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686 - default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ - default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB - default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 - default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH4 - default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH4EB default "console=tty0" if ADK_TARGET_SYSTEM_ARANYM_M68K + default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_I686 + default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_X86_64 + default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_QEMU_SPARC64 + default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_QEMU_PPC + default "console=hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64 + default "console=ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 + default "console=ttyS0,115200" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 + default "console=ttyS0,115200" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ + default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB + default "console=ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 + default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4 + default "console=ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH4EB default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default "" @@ -770,6 +768,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS ADK_LINUX_NATIVE depends on !ADK_HARDWARE_VBOX depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI + select ADK_KERNEL_BLK_DEV_INITRD select ADK_KERNEL_BLK_DEV_RAM if ADK_TARGET_SYSTEM_ARANYM_M68K help create an read-only initramfs system. diff --git a/target/config/Config.in.arch.default b/target/config/Config.in.arch.default index 43d1e5399..90401de3d 100644 --- a/target/config/Config.in.arch.default +++ b/target/config/Config.in.arch.default @@ -1,7 +1,4 @@ # target architectures -config ADK_native - bool - config ADK_arm bool @@ -48,5 +45,4 @@ config ADK_TARGET_ARCH default "sh" if ADK_sh default "x86" if ADK_x86 default "x86_64" if ADK_x86_64 - default "native" if ADK_native diff --git a/target/linux/patches/3.10.33/startup.patch b/target/linux/patches/3.10.33/startup.patch index 4dccae8c1..3ebc5db1e 100644 --- a/target/linux/patches/3.10.33/startup.patch +++ b/target/linux/patches/3.10.33/startup.patch @@ -1,12 +1,34 @@ -diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c ---- linux-3.7.3.orig/init/main.c 2013-01-17 17:47:40.000000000 +0100 -+++ linux-3.7.3/init/main.c 2013-01-19 15:08:13.000000000 +0100 -@@ -879,6 +880,8 @@ +diff -Nur linux-3.10.33.orig/init/initramfs.c linux-3.10.33/init/initramfs.c +--- linux-3.10.33.orig/init/initramfs.c 2014-03-07 06:58:45.000000000 +0100 ++++ linux-3.10.33/init/initramfs.c 2014-03-15 18:32:07.240436750 +0100 +@@ -622,6 +622,9 @@ + */ + load_default_modules(); + } ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + return 0; + } + rootfs_initcall(populate_rootfs); +diff -Nur linux-3.10.33.orig/init/main.c linux-3.10.33/init/main.c +--- linux-3.10.33.orig/init/main.c 2014-03-07 06:58:45.000000000 +0100 ++++ linux-3.10.33/init/main.c 2014-03-15 18:32:07.240436750 +0100 +@@ -885,6 +885,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - printk(KERN_WARNING "Warning: unable to open an initial console.\n"); + pr_err("Warning: unable to open an initial console.\n"); + printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); + (void) sys_dup(0); (void) sys_dup(0); /* +@@ -893,7 +895,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { + ramdisk_execute_command = NULL; diff --git a/target/linux/patches/3.11.10/startup.patch b/target/linux/patches/3.11.10/startup.patch index 4dccae8c1..e7285873d 100644 --- a/target/linux/patches/3.11.10/startup.patch +++ b/target/linux/patches/3.11.10/startup.patch @@ -1,12 +1,34 @@ -diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c ---- linux-3.7.3.orig/init/main.c 2013-01-17 17:47:40.000000000 +0100 -+++ linux-3.7.3/init/main.c 2013-01-19 15:08:13.000000000 +0100 -@@ -879,6 +880,8 @@ +diff -Nur linux-3.11.10.orig/init/initramfs.c linux-3.11.10/init/initramfs.c +--- linux-3.11.10.orig/init/initramfs.c 2013-11-29 19:42:37.000000000 +0100 ++++ linux-3.11.10/init/initramfs.c 2014-03-15 18:42:01.586249887 +0100 +@@ -622,6 +622,9 @@ + */ + load_default_modules(); + } ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + return 0; + } + rootfs_initcall(populate_rootfs); +diff -Nur linux-3.11.10.orig/init/main.c linux-3.11.10/init/main.c +--- linux-3.11.10.orig/init/main.c 2013-11-29 19:42:37.000000000 +0100 ++++ linux-3.11.10/init/main.c 2014-03-15 18:42:01.590249897 +0100 +@@ -886,6 +886,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - printk(KERN_WARNING "Warning: unable to open an initial console.\n"); + pr_err("Warning: unable to open an initial console.\n"); + printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); + (void) sys_dup(0); (void) sys_dup(0); /* +@@ -894,7 +896,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { + ramdisk_execute_command = NULL; diff --git a/target/linux/patches/3.12.13/startup.patch b/target/linux/patches/3.12.13/startup.patch index 4dccae8c1..4cd477da1 100644 --- a/target/linux/patches/3.12.13/startup.patch +++ b/target/linux/patches/3.12.13/startup.patch @@ -1,12 +1,34 @@ -diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c ---- linux-3.7.3.orig/init/main.c 2013-01-17 17:47:40.000000000 +0100 -+++ linux-3.7.3/init/main.c 2013-01-19 15:08:13.000000000 +0100 -@@ -879,6 +880,8 @@ +diff -Nur linux-3.12.13.orig/init/initramfs.c linux-3.12.13/init/initramfs.c +--- linux-3.12.13.orig/init/initramfs.c 2014-02-22 22:32:50.000000000 +0100 ++++ linux-3.12.13/init/initramfs.c 2014-03-15 18:09:39.040618589 +0100 +@@ -622,6 +622,9 @@ + */ + load_default_modules(); + } ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + return 0; + } + rootfs_initcall(populate_rootfs); +diff -Nur linux-3.12.13.orig/init/main.c linux-3.12.13/init/main.c +--- linux-3.12.13.orig/init/main.c 2014-02-22 22:32:50.000000000 +0100 ++++ linux-3.12.13/init/main.c 2014-03-15 18:09:39.044618600 +0100 +@@ -888,6 +888,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - printk(KERN_WARNING "Warning: unable to open an initial console.\n"); + pr_err("Warning: unable to open an initial console.\n"); + printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); + (void) sys_dup(0); (void) sys_dup(0); /* +@@ -896,7 +898,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { + ramdisk_execute_command = NULL; diff --git a/target/linux/patches/3.13.6/startup.patch b/target/linux/patches/3.13.6/startup.patch index be4ea469d..d396b75e4 100644 --- a/target/linux/patches/3.13.6/startup.patch +++ b/target/linux/patches/3.13.6/startup.patch @@ -10,3 +10,28 @@ diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c (void) sys_dup(0); (void) sys_dup(0); /* +diff -Nur linux-3.13.6.orig/init/initramfs.c linux-3.13.6/init/initramfs.c +--- linux-3.13.6.orig/init/initramfs.c 2014-03-07 07:07:02.000000000 +0100 ++++ linux-3.13.6/init/initramfs.c 2014-03-15 12:11:31.882731916 +0100 +@@ -622,6 +622,9 @@ + */ + load_default_modules(); + } ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + return 0; + } + rootfs_initcall(populate_rootfs); +diff -Nur linux-3.13.6.orig/init/main.c linux-3.13.6/init/main.c +--- linux-3.13.6.orig/init/main.c 2014-03-07 07:07:02.000000000 +0100 ++++ linux-3.13.6/init/main.c 2014-03-15 12:13:16.459024452 +0100 +@@ -924,7 +924,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { + ramdisk_execute_command = NULL; diff --git a/target/linux/patches/3.4.82/startup.patch b/target/linux/patches/3.4.82/startup.patch index 4f47eddcb..c26430bcb 100644 --- a/target/linux/patches/3.4.82/startup.patch +++ b/target/linux/patches/3.4.82/startup.patch @@ -1,7 +1,20 @@ -diff -Nur linux-2.6.34.orig/init/main.c linux-2.6.34/init/main.c ---- linux-2.6.34.orig/init/main.c 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34/init/main.c 2010-05-20 20:13:26.321613615 +0200 -@@ -889,6 +890,8 @@ +diff -Nur linux-3.4.82.orig/init/initramfs.c linux-3.4.82/init/initramfs.c +--- linux-3.4.82.orig/init/initramfs.c 2014-02-22 19:33:35.000000000 +0100 ++++ linux-3.4.82/init/initramfs.c 2014-03-15 18:46:22.674928245 +0100 +@@ -606,6 +606,9 @@ + free_initrd(); + #endif + } ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + return 0; + } + rootfs_initcall(populate_rootfs); +diff -Nur linux-3.4.82.orig/init/main.c linux-3.4.82/init/main.c +--- linux-3.4.82.orig/init/main.c 2014-02-22 19:33:35.000000000 +0100 ++++ linux-3.4.82/init/main.c 2014-03-15 18:46:22.674928245 +0100 +@@ -873,6 +873,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) printk(KERN_WARNING "Warning: unable to open an initial console.\n"); @@ -10,3 +23,12 @@ diff -Nur linux-2.6.34.orig/init/main.c linux-2.6.34/init/main.c (void) sys_dup(0); (void) sys_dup(0); /* +@@ -881,7 +883,7 @@ + */ + + if (!ramdisk_execute_command) +- ramdisk_execute_command = "/init"; ++ ramdisk_execute_command = "/sbin/init"; + + if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { + ramdisk_execute_command = NULL; -- cgit v1.2.3 From a1cb74821a3d4ccb708280ad1ed8297c67c4a54b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 15 Mar 2014 22:16:11 +0100 Subject: fix kernel build on Darwin for x86 targets relocs tool uses some kind of regular expression, which does not work with the provided one. Use pcre in this case. Rework KERNEL_MAKE_OPTS while here. Use it in kernel-header, too. --- mk/kernel-build.mk | 11 +++----- mk/kernel-vars.mk | 31 ++++++++-------------- target/config/Config.in.tools | 5 ++++ target/linux/config/Config.in.audio | 15 ++++++----- toolchain/kernel-headers/Makefile | 6 ++--- .../kernel-headers/patches/3.13.6/relocs.patch | 30 ++++++++++++++++----- tools/Makefile | 3 +++ tools/pcre/Makefile | 30 +++++++++++++++++++++ 8 files changed, 86 insertions(+), 45 deletions(-) create mode 100644 tools/pcre/Makefile (limited to 'mk') diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index f95796950..ffb612334 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -37,24 +37,19 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure -for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done -ifeq ($(ADK_USE_KERNEL_MINICONFIG),y) $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config - ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE) -else - $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config - echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE) -endif + ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE) touch -c $(LINUX_DIR)/.config $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile - ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE) + ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE) touch -c $(LINUX_DIR)/$(KERNEL_FILE) $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE) $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install rm -rf $(LINUX_BUILD_DIR)/modules - ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \ + ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} DEPMOD=true \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ LOCALVERSION="" \ modules_install $(MAKE_TRACE) diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 3285e891d..7d8de54e3 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -1,27 +1,18 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -KERNEL_MAKE_OPTS:= -C "${LINUX_DIR}" V=1 \ - CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \ - HOSTCFLAGS='${CFLAGS_FOR_BUILD}' \ +KERNEL_MAKE_OPTS:= V=1 \ + ARCH=$(ARCH) \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + CC="$(TARGET_CC)" \ + HOSTCC="${CC_FOR_BUILD}" \ CONFIG_SHELL='${SHELL}' -ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y) -ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \ - -DBCM47XX_OVERRIDE_NVRAMSIZE=0x10000 \ - -DBCM47XX_OVERRIDE_CFESIZE=0x40000 -endif -ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54GS},y) -ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \ - -DBCM47XX_OVERRIDE_NVRAMSIZE=0x20000 \ - -DBCM47XX_OVERRIDE_CFESIZE=0x40000 -endif -ifeq (${ADK_TARGET_BROADCOM_MODEL_ASUS_WL500GP},y) -ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \ - -DBCM47XX_OVERRIDE_NVRAMSIZE=0x20000 \ - -DBCM47XX_OVERRIDE_CFESIZE=0x40000 +# regex for relocs needs pcre on Darwin +ifeq ($(ADK_HOST_DARWIN),y) +KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(CPPFLAGS_FOR_BUILD) ${CFLAGS_FOR_BUILD}' HOSTLDFLAGS='-lpcreposix' +else +KERNEL_MAKE_OPTS+= HOSTCFLAGS='${CFLAGS_FOR_BUILD}' endif -KERNEL_MAKE_ENV+= KCPPFLAGS='${ADK_KCPPFLAGS}' \ - PATH="${STAGING_HOST_DIR}/usr/bin:$$PATH" +KERNEL_MAKE_ENV+= PATH="${STAGING_HOST_DIR}/usr/bin:$$PATH" diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index c4dcdace4..c2dee7e19 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -38,6 +38,11 @@ config ADK_HOST_NEED_CCACHE boolean default n +config ADK_HOST_NEED_PCRE + boolean + default y if ADK_HOST_DARWIN + default n + config ADK_TOOLS_ADDPATTERN_ARGS string default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index d3a15d602..cc84914d2 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -13,14 +13,14 @@ config ADK_KERNEL_SND_USB config ADK_KERNEL_SND_PXA2XX_AC97 boolean -config ADK_KERNEL_SND_TIMER +config ADK_KPACKAGE_KMOD_SND_TIMER boolean -config ADK_KERNEL_SND_PCM +config ADK_KPACKAGE_KMOD_SND_PCM boolean -config ADK_KERNEL_SND_HWDEP - boolean +config ADK_KPACKAGE_KMOD_SND_HWDEP + tristate config ADK_KPACKAGE_KMOD_SOUND tristate @@ -40,14 +40,15 @@ config ADK_KPACKAGE_KMOD_SND_COMPRESS config ADK_KPACKAGE_KMOD_SND tristate select ADK_KPACKAGE_KMOD_SOUND - select ADK_KERNEL_SND_TIMER - select ADK_KERNEL_SND_PCM - select ADK_KERNEL_SND_HWDEP + select ADK_KPACKAGE_KMOD_SND_PCM + select ADK_KPACKAGE_KMOD_SND_TIMER + select ADK_KPACKAGE_KMOD_SND_HWDEP default n config ADK_KPACKAGE_KMOD_SND_INTEL8X0 prompt "kmod-snd-intel8x0............. Intel AC97 driver" tristate + select ADK_KERNEL_SND_PCI select ADK_KPACKAGE_KMOD_SND_AC97_CODEC select ADK_KPACKAGE_KMOD_SND default y if ADK_TARGET_SYSTEM_IBM_X40 diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 4303accdc..89ebf340f 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk include ../rules.mk include $(TOPDIR)/mk/linux.mk +include ${TOPDIR}/mk/kernel-vars.mk include ${TOPDIR}/mk/buildhlp.mk $(WRKBUILD)/.headers: - $(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \ - headers_check - $(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \ + $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} headers_check + $(MAKE) -C $(WRKBUILD) ${KERNEL_MAKE_OPTS} \ INSTALL_HDR_PATH=$(STAGING_TARGET_DIR)/usr \ headers_install @-find $(STAGING_TARGET_DIR)/usr/include -name .install -delete diff --git a/toolchain/kernel-headers/patches/3.13.6/relocs.patch b/toolchain/kernel-headers/patches/3.13.6/relocs.patch index 649b9e73e..69a7c88a9 100644 --- a/toolchain/kernel-headers/patches/3.13.6/relocs.patch +++ b/toolchain/kernel-headers/patches/3.13.6/relocs.patch @@ -1,7 +1,18 @@ -diff -Nur linux-3.11.5.orig/arch/x86/tools/relocs.h linux-3.11.5/arch/x86/tools/relocs.h ---- linux-3.11.5.orig/arch/x86/tools/relocs.h 2013-10-14 03:14:45.000000000 +0200 -+++ linux-3.11.5/arch/x86/tools/relocs.h 2013-10-20 17:41:16.000000000 +0200 -@@ -9,10 +9,14 @@ +diff -Nur linux-3.13.6.orig/arch/x86/tools/relocs.c linux-3.13.6/arch/x86/tools/relocs.c +--- linux-3.13.6.orig/arch/x86/tools/relocs.c 2014-03-07 07:07:02.000000000 +0100 ++++ linux-3.13.6/arch/x86/tools/relocs.c 2014-03-15 19:39:45.000000000 +0100 +@@ -126,6 +126,7 @@ + + if (err) { + regerror(err, &sym_regex_c[i], errbuf, sizeof errbuf); ++ printf("foo: %s\n", sym_regex[i]); + die("%s", errbuf); + } + } +diff -Nur linux-3.13.6.orig/arch/x86/tools/relocs.h linux-3.13.6/arch/x86/tools/relocs.h +--- linux-3.13.6.orig/arch/x86/tools/relocs.h 2014-03-07 07:07:02.000000000 +0100 ++++ linux-3.13.6/arch/x86/tools/relocs.h 2014-03-15 18:48:40.000000000 +0100 +@@ -9,11 +9,19 @@ #include #include #include @@ -13,12 +24,17 @@ diff -Nur linux-3.11.5.orig/arch/x86/tools/relocs.h linux-3.11.5/arch/x86/tools/ +#else +#include "elf.h" +#endif ++#ifdef __APPLE__ ++#include ++#else #include ++#endif #include -diff -Nur linux-3.11.5.orig/tools/include/elf.h linux-3.11.5/tools/include/elf.h ---- linux-3.11.5.orig/tools/include/elf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.11.5/tools/include/elf.h 2013-10-20 17:42:10.000000000 +0200 + void die(char *fmt, ...); +diff -Nur linux-3.13.6.orig/tools/include/elf.h linux-3.13.6/tools/include/elf.h +--- linux-3.13.6.orig/tools/include/elf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.13.6/tools/include/elf.h 2014-03-15 18:47:36.000000000 +0100 @@ -0,0 +1,2671 @@ +#ifndef _ELF_H +#define _ELF_H diff --git a/tools/Makefile b/tools/Makefile index cdbf2b4f1..bfed325e0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -32,6 +32,9 @@ endif ifeq ($(ADK_HOST_NEED_CCACHE),y) TARGETS+=ccache endif +ifeq ($(ADK_HOST_NEED_PCRE),y) +TARGETS+=pcre +endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) diff --git a/tools/pcre/Makefile b/tools/pcre/Makefile new file mode 100644 index 000000000..f88fe230a --- /dev/null +++ b/tools/pcre/Makefile @@ -0,0 +1,30 @@ +# 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:= pcre +PKG_VERSION:= 8.34 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 006c5e27fb78cdd14a628fdfa5aa1905 +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} + +include ../rules.mk + +install: $(WRKBUILD)/.installed + +$(WRKBUILD)/.configured: ${WRKDIST}/.prepared + (cd ${WRKBUILD}; CPPFLAGS='$(CPPFLAGS_FOR_BUILD)' \ + LDFLAGS='$(LDFLAGS_FOR_BUILD)' \ + ./configure --prefix=$(STAGING_HOST_DIR)/usr) + @touch $@ + +$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured + ${MAKE} -C ${WRKBUILD} + @touch $@ + +$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled + ${MAKE} -C ${WRKBUILD} install + @touch $@ + +include $(TOPDIR)/mk/tools.mk -- cgit v1.2.3 From 2ecd16cdc29599a1b4d62ee0b0aa4c88aa146de4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 Mar 2014 08:35:43 +0100 Subject: remove ADK_TARGET_WITH from qemu configs, is more dynamic. remove device node creation for initramfs. --- mk/image.mk | 10 ---------- target/mips/sys-available/qemu-mips | 4 ---- target/mips/sys-available/qemu-mipsel | 4 ---- target/ppc/sys-available/qemu-ppc | 2 -- target/ppc64/sys-available/qemu-ppc64 | 2 -- target/sh/sys-available/qemu-sh4 | 1 - target/sh/sys-available/qemu-sh4eb | 1 - target/sparc/sys-available/qemu-sparc | 2 -- target/sparc64/sys-available/qemu-sparc64 | 2 -- target/x86_64/sys-available/qemu-x86_64 | 1 - 10 files changed, 29 deletions(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index b538e02a8..bbe9d47ac 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -146,16 +146,6 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR} ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR} $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \ ${TARGET_DIR}/ >$@ - ( \ - echo "nod /dev/console 0644 0 0 c 5 1"; \ - echo "nod /dev/tty 0644 0 0 c 5 0"; \ - for i in 0 1 2 3 4; do \ - echo "nod /dev/tty$$i 0644 0 0 c 4 $$$$i"; \ - done; \ - echo "nod /dev/systty 0644 0 0 c 4 0"; \ - echo "nod /dev/null 0644 0 0 c 1 3"; \ - echo "nod /dev/ram 0655 0 0 b 1 1"; \ - ) >>$@ ${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list ${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \ diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips index 21d1fb461..98aaf8a02 100644 --- a/target/mips/sys-available/qemu-mips +++ b/target/mips/sys-available/qemu-mips @@ -4,10 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS select ADK_big select ADK_qemu_mips select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT - select ADK_TARGET_WITH_PCI - select ADK_TARGET_WITH_HDD select ADK_TARGET_KERNEL_VMLINUZ help Qemu support for mips big endian architecture. diff --git a/target/mips/sys-available/qemu-mipsel b/target/mips/sys-available/qemu-mipsel index f77d84201..7163ae120 100644 --- a/target/mips/sys-available/qemu-mipsel +++ b/target/mips/sys-available/qemu-mipsel @@ -4,10 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL select ADK_qemu_mipsel select ADK_little select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT - select ADK_TARGET_WITH_PCI - select ADK_TARGET_WITH_HDD select ADK_TARGET_KERNEL_VMLINUZ help Qemu support for mips little endian architecture. diff --git a/target/ppc/sys-available/qemu-ppc b/target/ppc/sys-available/qemu-ppc index d50d83b91..223e0213b 100644 --- a/target/ppc/sys-available/qemu-ppc +++ b/target/ppc/sys-available/qemu-ppc @@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_PPC select ADK_qemu_ppc select ADK_CPU_PPC select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT help Support for Qemu Emulator (PPC). diff --git a/target/ppc64/sys-available/qemu-ppc64 b/target/ppc64/sys-available/qemu-ppc64 index a74d9537d..8f7715cf8 100644 --- a/target/ppc64/sys-available/qemu-ppc64 +++ b/target/ppc64/sys-available/qemu-ppc64 @@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_PPC64 select ADK_qemu_ppc64 select ADK_CPU_PPC64 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT help Support for Qemu Emulator (PPC64). diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4 index 03880e66d..5ebd224be 100644 --- a/target/sh/sys-available/qemu-sh4 +++ b/target/sh/sys-available/qemu-sh4 @@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_SH4 select ADK_qemu_sh4 select ADK_CPU_SH4 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_USB select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (superh). diff --git a/target/sh/sys-available/qemu-sh4eb b/target/sh/sys-available/qemu-sh4eb index a4af4ede2..f50f96b3e 100644 --- a/target/sh/sys-available/qemu-sh4eb +++ b/target/sh/sys-available/qemu-sh4eb @@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_SH4EB select ADK_qemu_sh4 select ADK_CPU_SH4 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_USB select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (superh). diff --git a/target/sparc/sys-available/qemu-sparc b/target/sparc/sys-available/qemu-sparc index 8b30faa64..26866628f 100644 --- a/target/sparc/sys-available/qemu-sparc +++ b/target/sparc/sys-available/qemu-sparc @@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC select ADK_qemu_sparc select ADK_CPU_SPARC_V8 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (SPARC). diff --git a/target/sparc64/sys-available/qemu-sparc64 b/target/sparc64/sys-available/qemu-sparc64 index b3e7466ee..062ad83e9 100644 --- a/target/sparc64/sys-available/qemu-sparc64 +++ b/target/sparc64/sys-available/qemu-sparc64 @@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC64 select ADK_qemu_sparc64 select ADK_CPU_SPARC_V9 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (SPARC64). diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64 index 2ec93e739..48b6fceab 100644 --- a/target/x86_64/sys-available/qemu-x86_64 +++ b/target/x86_64/sys-available/qemu-x86_64 @@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_MAY_64BIT select ADK_TARGET_KERNEL_BZIMAGE help Support for Qemu Emulator. -- cgit v1.2.3 From b1e843d40eea9bc684436f4635018b7c19eb93ea Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 Mar 2014 17:13:10 +0100 Subject: fix armhf toolchain build --- mk/build.mk | 11 +++++++---- target/tarch.lst | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index e35f29d22..90168586a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -470,7 +470,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all target architecture and libc combinations (toolchain only) bulktoolchain: - if [ -z "$(LIBC)" ];then \ + @if [ -z "$(LIBC)" ];then \ libc="glibc uclibc musl"; \ else \ libc="$(LIBC)"; \ @@ -480,15 +480,18 @@ bulktoolchain: mkdir -p ${TOPDIR}/firmware; \ ( \ echo === building $$arch $$libc toolchain-$$arch on $$(date); \ - tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##"); \ if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz ];then exit;fi; \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; break;fi; \ - tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}*; \ + if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \ + tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ + if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ + tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz host_* target_$${arch}_$${libc}$${abi}; \ $(GMAKE) cleantoolchain; \ rm .config; \ - ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}_build.log; \ + ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_build.log; \ if [ -f .exit ];then break;fi \ done <${TOPDIR}/target/tarch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ diff --git a/target/tarch.lst b/target/tarch.lst index e7251f8d2..09eed2265 100644 --- a/target/tarch.lst +++ b/target/tarch.lst @@ -1,10 +1,13 @@ arm +armhf m68k microblaze microblazeel mips mipsel mips64 +mips64n32 +mips64n64 mips64el ppc ppc64 -- cgit v1.2.3