diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 17:14:24 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 17:14:24 +0100 |
| commit | f3263184cac3be831d7d92d295acfca97fae3df6 (patch) | |
| tree | 4397bb68e025ac48a131c13d96f1acc19b27ae2f /target | |
| parent | 5e9198fbda131c3c3a1dde9091dfe9d935d28c5a (diff) | |
| parent | d65d767c45ebce8001ec1e028fba9d7881b5f847 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/config/Config.in.debug | 1 | ||||
| -rw-r--r-- | target/packages/pkg-available/test | 1 | ||||
| -rw-r--r-- | target/sparc/Makefile | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index 46942160f..80387c627 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -34,6 +34,7 @@ config ADK_KERNEL_PRINTK boolean select ADK_KERNEL_EARLY_PRINTK default y + depends on !ADK_PKG_TEST help Disable printk to save space and quieten bootup. diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index fe9204f9c..6560dc8a1 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -1,6 +1,7 @@ config ADK_PKG_TEST bool "Compile a ADK test framework system" default n + select ADK_PACKAGE_ADK_TEST_TOOLS select ADK_PACKAGE_STRACE select ADK_PACKAGE_SOCAT select ADK_PACKAGE_MAKE diff --git a/target/sparc/Makefile b/target/sparc/Makefile index 6789ad7fe..6960aed4c 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -18,7 +18,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC),y) @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" - @echo 'qemu-system-sparc -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img -append "root=/dev/sda1"' + @echo 'qemu-system-sparc -M SS-5 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img -append "root=/dev/sda1"' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -28,7 +28,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-sparc -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-sparc -M SS-5 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -37,6 +37,6 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-sparc -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-sparc -M SS-5 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif |