Add mips kernel entry patch Fix image creation
SVN-Revision: 3723
This commit is contained in:
parent
500e0c2495
commit
bd14e7766b
3 changed files with 24 additions and 21 deletions
|
@ -17,10 +17,10 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
|
||||||
@$(CP) config $(LINUX_DIR)/.config
|
@$(CP) config $(LINUX_DIR)/.config
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
$(LINUX_BUILD_DIR)/zImage: $(LINUX_DIR)/vmlinux
|
$(LINUX_BUILD_DIR)/zImage.flash.srec: $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.flash.srec $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.srec
|
||||||
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) zImage.flash $(MAKE_TRACE)
|
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) zImage.flash $(MAKE_TRACE)
|
||||||
$(CP) $(LINUX_DIR)/vmlinux $@
|
$(CP) $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.flash.srec $(LINUX_DIR)/zImage.flash.srec
|
||||||
echo "toto"
|
$(CP) $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.srec $(LINUX_DIR)/zImage.srec
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
compile: $(LINUX_DIR)/vmlinux
|
compile: $(LINUX_DIR)/vmlinux
|
||||||
|
|
15
openwrt/target/linux/au1000-2.6/patches/009-boot.patch
Normal file
15
openwrt/target/linux/au1000-2.6/patches/009-boot.patch
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
diff -Nur linux-cvs/arch/mips/kernel/head.S linux-aruba/arch/mips/kernel/head.S
|
||||||
|
--- linux-cvs/arch/mips/kernel/head.S 2004-12-23 00:21:39.000000000 -0800
|
||||||
|
+++ linux-aruba/arch/mips/kernel/head.S 2005-10-20 09:16:08.000000000 -0700
|
||||||
|
@@ -122,6 +122,10 @@
|
||||||
|
#endif
|
||||||
|
.endm
|
||||||
|
|
||||||
|
+
|
||||||
|
+ j kernel_entry
|
||||||
|
+ nop
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Reserved space for exception handlers.
|
||||||
|
* Necessary for machines which link their kernels at KSEG0.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
LOADADDR = 0x8008c8f4 # RAM start + 16M
|
LOADADDR = 0x8108c8f4 # RAM start + 16M
|
||||||
KERNEL_ENTRY = 0x80100000
|
KERNEL_ENTRY = 0x80100000
|
||||||
RAMSIZE = 0x04000000 # 1MB
|
RAMSIZE = 0x04000000 # 1MB
|
||||||
|
|
||||||
|
@ -31,25 +31,12 @@ endif
|
||||||
ifeq ($(KERNEL),2.6)
|
ifeq ($(KERNEL),2.6)
|
||||||
FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
|
FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
|
||||||
|
|
||||||
$(KDIR)/vmlinux.srec: $(KDIR)/vmlinux
|
|
||||||
$(TARGET_CROSS)objcopy -O srec $(LINUX_DIR)/vmlinux $(KDIR)/vmlinux.srec
|
|
||||||
|
|
||||||
ifeq ($(FS),jffs2-4MB)
|
|
||||||
|
|
||||||
$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(KDIR)/root.$(FS) $(KDIR)/vmlinux.srec
|
|
||||||
$(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(KDIR)/root.$(FS) $(KDIR)/root.srec
|
|
||||||
grep -v S7 $(KDIR)/root.srec > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
|
|
||||||
grep -v S0 $(KDIR)/vmlinux.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
|
|
||||||
|
|
||||||
install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(FS),jffs2-8MB)
|
ifeq ($(FS),jffs2-8MB)
|
||||||
|
|
||||||
$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(KDIR)/root.$(FS) $(KDIR)/vmlinux.srec
|
$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(KDIR)/root.$(FS)
|
||||||
$(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(KDIR)/root.$(FS) $(KDIR)/root.srec
|
$(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(KDIR)/root.$(FS) $(KDIR)/root.srec
|
||||||
grep -v S7 $(KDIR)/root.srec > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
|
grep -v S7 $(KDIR)/root.srec > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
|
||||||
grep -v S0 $(KDIR)/vmlinux.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
|
grep -v S0 $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.flash.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
|
||||||
|
|
||||||
install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
|
install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
|
||||||
endif
|
endif
|
||||||
|
@ -64,16 +51,17 @@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(FS),squashfs)
|
ifeq ($(FS),squashfs)
|
||||||
$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(KDIR)/root.$(FS) $(KDIR)/vmlinux.srec
|
$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(KDIR)/root.$(FS)
|
||||||
$(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(KDIR)/root.$(FS) $(KDIR)/root.srec
|
$(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(KDIR)/root.$(FS) $(KDIR)/root.srec
|
||||||
grep -v S7 $(KDIR)/root.srec > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
|
grep -v S7 $(KDIR)/root.srec > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
|
||||||
|
grep -v S0 $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.flash.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
|
install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/vmlinux
|
$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/zImage.flash
|
||||||
$(CP) $^ $@
|
$(CP) $^ $@
|
||||||
|
|
||||||
ifeq ($(IB),)
|
ifeq ($(IB),)
|
||||||
|
|
Loading…
Reference in a new issue