diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-07 12:34:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-07 12:34:57 +0200 |
| commit | d22b78be7b2b95ba028c6584e9ee5abb69a375cb (patch) | |
| tree | 039da0ef61265cda4512279d36aea46c4670a715 /target/qemu-cris | |
| parent | 702e216210d58f1301c80d4e55af5d29f813eb19 (diff) | |
| parent | 2e2eee9052d2c487d7114818ca446c370dba7f49 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/qemu-cris')
| -rw-r--r-- | target/qemu-cris/Makefile | 12 | ||||
| -rw-r--r-- | target/qemu-cris/target.mk | 4 |
2 files changed, 3 insertions, 13 deletions
diff --git a/target/qemu-cris/Makefile b/target/qemu-cris/Makefile index 4384edf0e..b83ff2ac4 100644 --- a/target/qemu-cris/Makefile +++ b/target/qemu-cris/Makefile @@ -11,16 +11,6 @@ kernel-install: @cp $(LINUX_DIR)/arch/cris/boot/zImage \ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE) -createinit: - @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* $(MAKE_TRACE) - $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' $(LINUX_DIR)/.config - echo N |$(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) - $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" $(MAKE_TRACE) - $(CP) $(LINUX_DIR)/arch/cris/boot/zImage \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) @echo @@ -42,7 +32,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) endif ifeq ($(FS),initramfs-piggyback) -imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit +imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "Start qemu with following command line:" @echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' diff --git a/target/qemu-cris/target.mk b/target/qemu-cris/target.mk index aa7f0a22a..a60214bf3 100644 --- a/target/qemu-cris/target.mk +++ b/target/qemu-cris/target.mk @@ -1,7 +1,7 @@ ARCH:= cris CPU_ARCH:= crisv32 -KERNEL_VERSION:= 2.6.32 +KERNEL_VERSION:= 2.6.34 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 260551284ac224c3a43c4adac7df4879 +KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=v32 |