[kernel] sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)

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

diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 361588e..b1e856d 100644 (file)
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -18,13 +18,13 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
        UIMAGE:=$(IMG_PREFIX)-uImage-initramfs
 endif
 
-ifeq ($(CONFIG_RALINK_RT305X),y)
+ifeq ($(CONFIG_RALINK_RT288X),y)
 define kernel_entry
--a 0x80000000 -e 0x80000000
+-a 0x88000000 -e 0x88000000
 endef
 else
 define kernel_entry
--a 0x88000000 -e 0x88000000
+-a 0x80000000 -e 0x80000000
 endef
 endif
 
@@ -54,15 +54,12 @@ endef
 
 define BuildFirmware/Generic
        $(call PatchKernelLzma,$(2),$(3) $($(4)))
-       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt $(5) ]; then \
-               echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
+       $(call MkImage,lzma,"$(KDIR)/vmlinux-$(2).bin.lzma","$(KDIR)/vmlinux-$(2).uImage")
+       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).uImage"` -gt $(5) ]; then \
+               echo "Warning: $(KDIR)/vmlinux-$(2).uImage is too big"; \
        else if [ `stat -c%s $(KDIR)/root.$(1)` -gt $(6) ]; then \
                echo "Warning: $(KDIR)/root.$(1) is too big"; \
        else \
-               mkimage -A mips -O linux -T kernel -C lzma \
-                       $(call kernel_entry) \
-                       -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-                       -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
                ( \
                        dd if=$(KDIR)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
@@ -80,8 +77,18 @@ define Image/Build/Template/GENERIC_8M
        $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_8M,851968,7208960)
 endef
 
+mtdlayout_dir300b1=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(devdata)ro,64k(devconf)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
+mtd_dir300b1_kernel_part_size=851968
+mtd_dir300b1_rootfs_part_size=3014656
+define Image/Build/Template/DIR300B1
+       $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_dir300b1,$(mtd_dir300b1_kernel_part_size),$(mtd_dir300b1_rootfs_part_size))
+       mkwrgimg -s wrgn23_dlwbr_dir300b -d /dev/mtdblock/2 \
+               -i $(call imgname,$(1),$(2))-sysupgrade.bin \
+               -o $(call imgname,$(1),$(2))-factory.bin
+endef
+
 define Image/Build/Profile/DIR300B1
-       $(call Image/Build/Template/GENERIC_4M,$(1),dir-300-b1,DIR-300-revB)
+       $(call Image/Build/Template/DIR300B1,$(1),dir-300-b1,DIR-300-revB)
 endef
 
 define Image/Build/Profile/FONERA20N
@@ -104,8 +111,11 @@ define Image/Build/Profile/HW5503G
        $(call Image/Build/Template/GENERIC_8M,$(1),hw550-3g,HW550-3G)
 endef
 
+define Image/Build/Profile/MOFI35003GN
+       $(call Image/Build/Template/GENERIC_8M,$(1),mofi3500-3gn,MOFI3500-3GN)
+endef
 
-mtdlayout_wcr150gn=mtdparts=physmap-flash.0:192k(Bootloader)ro,64k(Config),64k(Factory),832k(Kernel),2944k(rootfs),3776k@0x50000(firmware)
+mtdlayout_wcr150gn=mtdparts=physmap-flash.0:192k(bootloader)ro,64k(config),64k(factory),832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
 mtd_wcr150gn_kernel_part_size=851968
 mtd_wcr150gn_rootfs_part_size=3014656
 define Image/Build/Template/WCR150GN
@@ -139,6 +149,7 @@ define Image/Build/Profile/Default
        $(call Image/Build/Profile/WCR150GN,$(1))
        $(call Image/Build/Profile/F5D8235V2,$(1))
        $(call Image/Build/Profile/HW5503G,$(1))
+       $(call Image/Build/Profile/MOFI35003GN,$(1))
 endef
 endif