Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 18 insertions, 12 deletions

diff --git a/target/cris/Makefile b/target/cris/Makefile
index 6b744a806..21cf33c85 100644
--- a/target/cris/Makefile
+++ b/target/cris/Makefile
@@ -7,7 +7,8 @@ include $(TOPDIR)/mk/modules.mk
 include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
-KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
+ZKERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
+KERNEL:=$(LINUX_DIR)/vmlinux
 
 tools-compile:
 	$(MAKE) -C ../tools/mkfimage all
@@ -18,7 +19,7 @@ endif
 	$(INSTALL_BIN) ../tools/boot_linux $(BIN_DIR)/
 
 kernel-install: tools-compile
-	PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
+	PATH='${TARGET_PATH}' mkfimage $(ZKERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
 
 ${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs
 	cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \
@@ -47,6 +48,12 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),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 command line:"
+	@echo 'qemu-system-cris -M axis-dev88 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
@@ -55,7 +62,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-cris -M axis-dev88 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -64,6 +71,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
 	@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-cris -M axis-dev88 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
 endif
 endif
diff --git a/target/cris/sys-available/qemu-cris b/target/cris/sys-available/qemu-crisv32
index 050fa1ce0..37ecbf9e8 100644
--- a/target/cris/sys-available/qemu-cris
+++ b/target/cris/sys-available/qemu-crisv32
@@ -5,11 +5,11 @@ config ADK_TARGET_SYSTEM_QEMU_CRIS
 	select ADK_CPU_CRIS_V32
 	select ADK_KERNEL_ETRAXFS
 	select ADK_KERNEL_MTD_MTDRAM
-	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_MTD
+	select ADK_HARDWARE_QEMU
 	help
 	 Support for Qemu Emulator (CRIS).
 
diff --git a/target/cris/uclibc.config.v32 b/target/cris/uclibc.config.v32
index e2c710242..8fab98eef 100644
--- a/target/cris/uclibc.config.v32
+++ b/target/cris/uclibc.config.v32
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Version: 0.9.32
-# Wed Aug 24 20:05:46 2011
+# Fri Sep  2 09:36:34 2011
 #
 # TARGET_alpha is not set
 # TARGET_arm is not set
@@ -229,12 +229,11 @@ UCLIBC_BUILD_NOEXECSTACK=y
 #
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
+DODEBUG=y
+DODEBUG_PT=y
+DOASSERTS=y
+SUPPORT_LD_DEBUG=y
+SUPPORT_LD_DEBUG_EARLY=y
 # UCLIBC_MALLOC_DEBUGGING is not set
 # UCLIBC_HAS_BACKTRACE is not set
 WARNINGS="-Wall"