From 97f06c7f9d934a86f84f6608bcf3c6a1a1132eee Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Apr 2014 11:27:38 +0200 Subject: add qemu host dependency --- target/config/Config.in | 1 + target/config/Config.in.tools | 8 ++++++++ target/microblaze/Makefile | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index 1255ceae3..501039ed1 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -771,6 +771,7 @@ config ADK_TARGET_ROOTFS_SQUASHFS bool "Compressed read-only root filesystem (squashfs)" select ADK_KERNEL_SQUASHFS select ADK_HOST_NEED_SQUASHFS + select ADK_HOST_NEED_QEMU if ADK_HARDWARE_QEMU select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU depends on ADK_TARGET_WITH_MTD help diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 95e4f6d63..f95a4508b 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -97,6 +97,14 @@ config ADK_HOST_BUILD_MKSH boolean default n +config ADK_HOST_NEED_QEMU + boolean + default n + +config ADK_HOST_BUILD_QEMU + boolean + default n + config ADK_HOST_NEED_SYSLINUX boolean default n diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 58d02c5be..4a39e1c3b 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -18,7 +18,7 @@ endif ifeq ($(ADK_TARGET_FS),squashfs) imageinstall: $(BUILD_DIR)/root.squashfs - qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) + env PATH=$(HOST_PATH) qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) -- cgit v1.2.3 From c79407bcee5a5a9a1a718efb54e851e939e6f8d1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Apr 2014 15:18:33 +0200 Subject: eanble option to debug optimized code --- target/config/Config.in.adk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'target') diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 0c598e50c..7487ac056 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -33,6 +33,13 @@ config ADK_DEBUG All packages and libc will be compiled and packaged with debug information. Mostly useful for NFS root or big USB/CF or hard disk setups. +config ADK_DEBUG_OPTS + bool "use optimization cflags" + depends on ADK_DEBUG + default n + help + All packages and libc will be compiled with debug information and optimization flags on. + config ADK_DEBUG_STRIP bool "strip target binaries/libraries for gdbserver usage" depends on ADK_DEBUG -- cgit v1.2.3 From 9c1b4313b2e69611f9f81cea332e9348d5ddeab0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Apr 2014 18:42:10 +0200 Subject: disable for 3.10 --- target/linux/config/Config.in.audio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target') diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index a1a5077e6..f87a7e751 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -124,7 +124,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S select ADK_KPACKAGE_KMOD_SND select ADK_KERNEL_SND_ARM select ADK_KPACKAGE_KMOD_SND_SOC - select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE + select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_34 select ADK_KPACKAGE_KMOD_SND_COMPRESS depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default n -- cgit v1.2.3 From 075dcf5fa7482e33358d5603f39d68088741e3c4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 4 Apr 2014 10:14:50 +0200 Subject: update e2fsprogs, enable for mpdbox --- target/packages/pkg-available/mpdbox | 1 + 1 file changed, 1 insertion(+) (limited to 'target') diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index eab49bc8a..b67197c11 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -49,6 +49,7 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_PHP_FASTCGI select ADK_PACKAGE_SCREEN select ADK_PACKAGE_VIM + select ADK_PACKAGE_E2FSCK select ADK_PACKAGE_ALSA_UTILS select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER select ADK_KPACKAGE_KMOD_SND_INTEL8X0 if ADK_TARGET_SYSTEM_QEMU_I686 -- cgit v1.2.3 From 76563c556bd14319938eae3f9ee376b5c50c21cd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 4 Apr 2014 20:55:22 +0200 Subject: sync time before test --- target/packages/pkg-available/test | 1 + 1 file changed, 1 insertion(+) (limited to 'target') diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index 5ffe80949..e9db8161b 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -5,6 +5,7 @@ config ADK_PKG_TEST select ADK_PACKAGE_SOCAT select ADK_PACKAGE_MAKE select ADK_PACKAGE_FILE + select ADK_PACKAGE_RDATE select ADK_KERNEL_BLK_DEV_INITRD select ADK_KERNEL_COMP_XZ select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ -- cgit v1.2.3 From 7bd985bf406b637ffd422e0d7d85cd0a72021b02 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Apr 2014 04:11:17 +0200 Subject: add generic pc --- target/config/Config.in | 1 + target/x86/kernel/generic-pc | 19 +++++++++++++++++++ target/x86/sys-available/generic-pc | 9 +++++++++ 3 files changed, 29 insertions(+) create mode 100644 target/x86/kernel/generic-pc create mode 100644 target/x86/sys-available/generic-pc (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index 501039ed1..25e34c9cd 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -210,6 +210,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC config ADK_QEMU_ARGS string diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-pc new file mode 100644 index 000000000..f665a27c6 --- /dev/null +++ b/target/x86/kernel/generic-pc @@ -0,0 +1,19 @@ +CONFIG_X86=y +CONFIG_X86_32=y +CONFIG_PCI=y +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_DOMAINS=y +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NET_VENDOR_8390=y +CONFIG_NE2K_PCI=y +CONFIG_PCNET32=y +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_RTL8139CP=y +CONFIG_8139TOO=y +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=y +CONFIG_E1000=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/x86/sys-available/generic-pc b/target/x86/sys-available/generic-pc new file mode 100644 index 000000000..76d228936 --- /dev/null +++ b/target/x86/sys-available/generic-pc @@ -0,0 +1,9 @@ +config ADK_TARGET_SYSTEM_GENERIC_PC + bool "Generic PC (486)" + select ADK_x86 + select ADK_generic_pc + select ADK_CPU_I486 + select ADK_TARGET_KERNEL_BZIMAGE + help + Support for generic PC (i486). + -- cgit v1.2.3 From 8316d0355b3f3d3c2bcad9d3900feb2bec40da46 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Apr 2014 06:07:19 +0200 Subject: fix iso building --- target/config/Config.in.tools | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'target') diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index f95a4508b..b3e900bb3 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -105,15 +105,16 @@ config ADK_HOST_BUILD_QEMU boolean default n -config ADK_HOST_NEED_SYSLINUX +# optional, must be used from OpenADK +config ADK_HOST_NEED_MKIMAGE boolean default n -config ADK_HOST_BUILD_SYSLINUX +config ADK_HOST_BUILD_MKIMAGE boolean + default y if ADK_HOST_NEED_MKIMAGE default n -# optional, must be used from OpenADK config ADK_HOST_NEED_MTD_UTILS boolean default n @@ -132,13 +133,13 @@ config ADK_HOST_BUILD_SQUASHFS default y if ADK_HOST_NEED_SQUASHFS default n -config ADK_HOST_NEED_MKIMAGE +config ADK_HOST_NEED_SYSLINUX boolean default n -config ADK_HOST_BUILD_MKIMAGE +config ADK_HOST_BUILD_SYSLINUX boolean - default y if ADK_HOST_NEED_MKIMAGE + default y if ADK_HOST_NEED_SYSLINUX default n config ADK_HOST_BUILD_PCRE -- cgit v1.2.3