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-arm | |
| parent | 702e216210d58f1301c80d4e55af5d29f813eb19 (diff) | |
| parent | 2e2eee9052d2c487d7114818ca446c370dba7f49 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/qemu-arm')
| -rw-r--r-- | target/qemu-arm/Makefile | 14 | ||||
| -rw-r--r-- | target/qemu-arm/target.mk | 4 |
2 files changed, 3 insertions, 15 deletions
diff --git a/target/qemu-arm/Makefile b/target/qemu-arm/Makefile index 4a423a6ef..150d25f9c 100644 --- a/target/qemu-arm/Makefile +++ b/target/qemu-arm/Makefile @@ -11,18 +11,6 @@ kernel-install: @cp $(LINUX_DIR)/arch/arm/boot/zImage \ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -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 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config - echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(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/arm/boot/zImage \ - $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @@ -43,7 +31,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 options:" @echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' diff --git a/target/qemu-arm/target.mk b/target/qemu-arm/target.mk index 610123e84..affae5afa 100644 --- a/target/qemu-arm/target.mk +++ b/target/qemu-arm/target.mk @@ -1,7 +1,7 @@ ARCH:= arm CPU_ARCH:= arm -KERNEL_VERSION:= 2.6.33 +KERNEL_VERSION:= 2.6.34 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 +KERNEL_MD5SUM:= 10eebcb0178fb4540e2165bfd7efc7ad TARGET_OPTIMIZATION:= -Os -pipe TARGET_CFLAGS_ARCH:= -march=armv5te -msoft-float |