Add bcm63xx_wdt but do not enable it yet

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

diff --git a/target/linux/avr32/image/Makefile b/target/linux/avr32/image/Makefile
index 2cef265..692c325 100644 (file)
--- a/target/linux/avr32/image/Makefile
+++ b/target/linux/avr32/image/Makefile
@@ -8,13 +8,15 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 

-define Build/Clean
+ifneq ($(CONFIG_AVR32_UBOOT),)
+  define Build/Clean

        $(MAKE) -C u-boot clean
        $(MAKE) -C u-boot clean

-endef
+  endef

 
 

-define Build/Compile
+  define Build/Compile

        $(MAKE) -C u-boot compile
        $(MAKE) -C u-boot compile

-endef
+  endef
+endif

 
 define Image/Prepare
        cp $(LINUX_DIR)/arch/avr32/boot/images/uImage $(KDIR)/uImage
 
 define Image/Prepare
        cp $(LINUX_DIR)/arch/avr32/boot/images/uImage $(KDIR)/uImage


@@ -23,7 +25,7 @@ endef
 define Image/BuildKernel
        cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage
 
 define Image/BuildKernel
        cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage
 

-       $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.lzma
+       $(STAGING_DIR_HOST)/bin/lzma e $(LINUX_DIR)/arch/avr32/boot/images/vmlinux.bin $(KDIR)/vmlinux.lzma

        mkimage -A avr32 -O linux -T kernel -a 0x10000000 -C lzma \
                -e 0x90000000 \
                -n 'OpenWrt Linux-$(LINUX_VERSION)' \
        mkimage -A avr32 -O linux -T kernel -a 0x10000000 -C lzma \
                -e 0x90000000 \
                -n 'OpenWrt Linux-$(LINUX_VERSION)' \