mcs814x: use firmware partition splitter on dLAN USB Extender
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 15 Oct 2015 14:38:36 +0000 (14:38 +0000)
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 15 Oct 2015 14:38:36 +0000 (14:38 +0000)
to avoid editing the dts every time the kernel size changes.
uImage is now bigger than 1MB. Pad uImage to 64k erase block size.

Signed-off-by: G√ľnther Kelleter <guenther.kelleter@devolo.de>
Backport of r46648

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47194 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/mcs814x/config-3.18
target/linux/mcs814x/files-3.18/arch/arm/boot/dts/dlan-usb-extender.dts
target/linux/mcs814x/image/Makefile

index e57f5ff..427a7c9 100644 (file)
@@ -159,6 +159,10 @@ CONFIG_MODULES_USE_ELF_REL=y
 # CONFIG_MTD_IMPA7 is not set
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_IMPA7 is not set
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_ROOTFS_SPLIT is not set
+CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_FIRMWARE_NAME="linux"
+CONFIG_MTD_SPLIT_UIMAGE_FW=y
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_KUSER_HELPERS=y
 CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_KUSER_HELPERS=y
index 0c85b94..59830e8 100644 (file)
                                                reg = <0x40000 0x10000>;
                                        };
                                        partition@50000 {
                                                reg = <0x40000 0x10000>;
                                        };
                                        partition@50000 {
-                                               label = "kernel";
-                                               reg = <0x50000 0x100000>;
-                                       };
-                                       partition@150000 {
-                                               label = "rootfs";
-                                               reg = <0x150000 0x3C0000>;
-                                       };
-                                       partition@50001 {
                                                label = "linux";
                                                reg = <0x50000 0x4C0000>;
                                        };
                                                label = "linux";
                                                reg = <0x50000 0x4C0000>;
                                        };
index 4c8af97..74f8ad4 100644 (file)
@@ -30,7 +30,7 @@ define Image/Build/DTB
 endef
 
 define Image/Build/Profile/dLAN_USB_Extender
 endef
 
 define Image/Build/Profile/dLAN_USB_Extender
-       dd if=$(KDIR)/uImage-dlan-usb-extender bs=1M conv=sync of=$(KDIR)/$(IMG_PREFIX)-dlan-usb-extender-upgrade-$(1).bin
+       dd if=$(KDIR)/uImage-dlan-usb-extender bs=64k conv=sync of=$(KDIR)/$(IMG_PREFIX)-dlan-usb-extender-upgrade-$(1).bin
        cat $(KDIR)/root.$(1) >> $(KDIR)/$(IMG_PREFIX)-dlan-usb-extender-upgrade-$(1).bin
        cp $(KDIR)/$(IMG_PREFIX)-dlan-usb-extender-upgrade-$(1).bin $(BIN_DIR)/
 endef
        cat $(KDIR)/root.$(1) >> $(KDIR)/$(IMG_PREFIX)-dlan-usb-extender-upgrade-$(1).bin
        cp $(KDIR)/$(IMG_PREFIX)-dlan-usb-extender-upgrade-$(1).bin $(BIN_DIR)/
 endef