More au1000 fixes. Clean up patch Add mount_root specific (different partition naming...

[openwrt/openwrt.git] / openwrt / target / linux / image / au1000 / Makefile

diff --git a/openwrt/target/linux/image/au1000/Makefile b/openwrt/target/linux/image/au1000/Makefile
index 414873189fc44236cc9c13bd7fd04356e7d39cd5..c7158ca76116f110da8c632e540b799d11817310 100644 (file)
--- a/openwrt/target/linux/image/au1000/Makefile
+++ b/openwrt/target/linux/image/au1000/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 LOADADDR = 0x8108c8f4          # RAM start + 16M 
-KERNEL_ENTRY = 0x80100000
-RAMSIZE = 0x04000000           # 1MB
+KERNEL_ENTRY = 0x80100000      # Default kernel entry in arch/mips/Makefile
+RAMSIZE = 0x04000000           # 64MB
 
 LOADER_MAKEOPTS= \
                KDIR=$(KDIR) \
@@ -28,9 +28,6 @@ $(KDIR)/vmlinux.lzma: $(KDIR)/vmlinux
 install: $(KDIR)/vmlinux.lzma
 endif
 
-ifeq ($(KERNEL),2.6)
-FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
-
 ifeq ($(FS),jffs2-8MB)
 
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(KDIR)/root.$(FS)
@@ -58,9 +55,6 @@ $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(KDIR)/root.$(FS)
 
 endif
 
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
-endif
-
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/zImage.flash
        $(CP) $^ $@
 
@@ -78,5 +72,5 @@ install-ib:
        mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
        $(CP) $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/
        $(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
-       $(TARGET_CROSS)objcopy -O srec $(KDIR)/loader.elf $(KDIR)/loader.srec
+       $(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(KDIR)/loader.elf $(KDIR)/loader.srec
        grep -v S0 $(KDIR)/loader.srec > $(KDIR)/kernel.srec