[package] 6in4, 6to4: prevent starting the tunnel if kmod-sit is not yet loaded ...

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

diff --git a/target/linux/mpc83xx/image/Makefile b/target/linux/mpc83xx/image/Makefile
index 8004f74..aabfbad 100644 (file)
--- a/target/linux/mpc83xx/image/Makefile
+++ b/target/linux/mpc83xx/image/Makefile
@@ -9,11 +9,13 @@ include $(INCLUDE_DIR)/image.mk
 
 
 define Image/Prepare
-       $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/mpc8377_wlan.dts > $(KDIR)/openwrt-mpc8377_wlan.dtb
+       $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/mpc8377_wlan.dts > $(BIN_DIR)/openwrt-mpc83xx-mpc8377_wlan.dtb
 endef
 
 define Image/BuildKernel
        cp $(LINUX_DIR)/arch/powerpc/boot/dtbImage.rb600.elf $(BIN_DIR)/openwrt-$(BOARD)-rb600.elf
+       cp $(LINUX_DIR)/arch/powerpc/boot/dtbImage.rb333.elf $(BIN_DIR)/openwrt-$(BOARD)-rb333.elf
+       cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage
 endef
 
 define Image/Build
@@ -22,12 +24,10 @@ endef
 
 define Image/Build/squashfs
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-# We'll do FIT here
-#      ( \
-#              dd if=$(LINUX_DIR)/arch/powerpc/boot/uImage bs=1920k conv=sync; \
-#              dd if=$(KDIR)/openwrt-mpc8377_wlan.dtb bs=128k conv=sync; \
-#              dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
-#      ) > $(BIN_DIR)/openwrt-$(BOARD)-mpc8377_wlan-$(1).img
+       ( \
+               dd if=$(LINUX_DIR)/arch/powerpc/boot/uImage bs=3072k conv=sync; \
+               dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-mpc8377_wlan-$(1).img
 endef
 
 $(eval $(call BuildImage))