WIP

diff --git a/target/linux/ramips/dts/mt7621_zrouter_zr-2662-v1.dts b/target/linux/ramips/dts/mt7621_zrouter_zr-2662-v1.dts
index 20f5e59804af6792d546fd318c661d871502de22..397aa5ea899a66c46fe78bbf63a72624cbe8a992 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zrouter_zr-2662-v1.dts
+++ b/target/linux/ramips/dts/mt7621_zrouter_zr-2662-v1.dts
@@ -19,8 +19,8 @@
 &nand {
        status = "okay";
 
-       mediatek,bbt;
-       mediatek,bmt-remap-range = <0x180000 0x5800000>;
+       //mediatek,bbt;
+       //mediatek,bmt-remap-range = <0x180000 0x5800000>;
 
        partitions {
                #address-cells = <0x01>;

diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index f481e6e447599b630dddd0c2ae0b837e3e0d36dd..2fadfb925044d85bff303f1e029a8759f65ea80a 100644 (file)
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -24,6 +24,7 @@ ldrflashstart-$(CONFIG_TARGET_ramips_mt7621) := 0x1fc00000
 
 LOADER_PLATFORM := $(ldrplatform-y)
 LOADER_FLASH_START := $(ldrflashstart-y)
+LOADER_LZMA_TEXT_START := 0x81800000
 
 KERNEL_DTB = kernel-bin | append-dtb | lzma
 
@@ -45,7 +46,7 @@ define Build/loader-common
                PKG_BUILD_DIR="$@.src" \
                TARGET_DIR="$(dir $@)" LOADER_NAME="$(notdir $@)" \
                BOARD="$(BOARDNAME)" PLATFORM="$(LOADER_PLATFORM)" \
-               LZMA_TEXT_START=0x81800000 LOADADDR=$(KERNEL_LOADADDR) \
+               LZMA_TEXT_START=$(LOADER_LZMA_TEXT_START) LOADADDR=0x80001000 \
                $(1) compile loader.$(LOADER_TYPE)
        mv "$@.$(LOADER_TYPE)" "$@"
        rm -rf $@.src

diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index e2a50c2aa27d31c3dea525a9c597bd8a7854a658..3dfdb3b0ada3d4c8c27ddedf4d8eacc1ee561ed0 100644 (file)
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -2040,8 +2040,10 @@ define Device/zrouter_zr-2662-v1
   IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size | append-metadata
   IMAGE_SIZE := 88576k
   KERNEL := kernel-bin | lzma | loader-kernel | fit none $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
-  KERNEL_INITRAMFS := kernel-bin | lzma | loader-kernel | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd
-  #KERNEL_LOADADDR := 0x81001000
+  KERNEL_INITRAMFS := kernel-bin | lzma | loader-kernel | fit none $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd
+  KERNEL_LOADADDR := 0x81001000
+  #KERNEL_SIZE := 4096k
+  LOADER_LZMA_TEXT_START := 0x82800000
 endef
 TARGET_DEVICES += zrouter_zr-2662-v1