ath79: switch some RedBoot based devices to OKLI loader

[openwrt/staging/dedeckeh.git] / target / linux / ath79 / image / Makefile

diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile
index 792548657ed71bf53053aa6e08fe35927bffe087..712ab941e18a5c336a494fa80c9c5ab87dadde31 100644 (file)
--- a/target/linux/ath79/image/Makefile
+++ b/target/linux/ath79/image/Makefile
@@ -3,38 +3,50 @@ include $(INCLUDE_DIR)/image.mk
 
 KERNEL_LOADADDR = 0x80060000
 
-DEVICE_VARS += IMAGE_SIZE LOADER_FLASH_OFFS LOADER_TYPE ATH_SOC
+DEVICE_VARS += LOADER_FLASH_OFFS LOADER_TYPE
+DEVICE_VARS += LOADER_FLASH_MAX LOADER_KERNEL_MAGIC
+DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
+DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION
 
 define Build/loader-common
        rm -rf $@.src
        $(MAKE) -C lzma-loader \
                PKG_BUILD_DIR="$@.src" \
                TARGET_DIR="$(dir $@)" LOADER_NAME="$(notdir $@)" \
-               LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \
                $(1) compile loader.$(LOADER_TYPE)
        mv "$@.$(LOADER_TYPE)" "$@"
        rm -rf $@.src
 endef
 
 define Build/loader-kernel
-       $(call Build/loader-common,LOADER_DATA="$@")
+       $(call Build/loader-common, \
+               LOADER_DATA="$@" \
+               BOARD="$(DEVICE_NAME)" )
 endef
 
-define Build/loader-kernel-cmdline
-       $(call Build/loader-common,LOADER_DATA="$@")
-endef
-
-
 define Build/loader-okli-compile
-       $(call Build/loader-common,FLASH_OFFS=$(LOADER_FLASH_OFFS) FLASH_MAX=0)
+       $(call Build/loader-common, \
+               FLASH_OFFS=$(LOADER_FLASH_OFFS) \
+               FLASH_MAX=$(LOADER_FLASH_MAX) \
+               KERNEL_MAGIC=$(LOADER_KERNEL_MAGIC) \
+               BOARD="$(DEVICE_NAME)" )
 endef
 
+# Arguments: <output name> <kernel offset>
 define Build/loader-okli
-       dd if=$(KDIR)/loader-$(1).gz bs=7680 conv=sync of="$@.new"
+       dd if=$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE) bs=$(word 2,$(1)) conv=sync of="$@.new"
        cat "$@" >> "$@.new"
        mv "$@.new" "$@"
 endef
 
+define Build/append-loader-okli
+       cat "$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE)" >> "$@"
+endef
+
+define Build/append-loader-okli-uimage
+       cat "$(KDIR)/loader-$(word 1,$(1)).uImage" >> "$@"
+endef
+
 define Build/relocate-kernel
        rm -rf $@.relocate
        $(CP) ../../generic/image/relocate $@.relocate
@@ -50,24 +62,42 @@ endef
 
 
 define Device/Default
-  ATH_SOC :=
   DEVICE_DTS_DIR := ../dts
-  DEVICE_DTS = $$(ATH_SOC)_$(1)
+  DEVICE_DTS = $$(SOC)_$(1)
   PROFILES = Default
   MTDPARTS :=
   BLOCKSIZE := 64k
   KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma
+  LOADER_KERNEL_MAGIC :=
+  LOADER_FLASH_MAX :=
+  LOADER_FLASH_OFFS :=
+  LOADER_TYPE :=
   COMPILE :=
-  SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | \
-       append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
+       append-rootfs | pad-rootfs | check-size | append-metadata
 endef
 
+define Device/loader-okli-uimage
+  LOADER_TYPE := bin
+  COMPILE := loader-$(1).bin loader-$(1).uImage
+  COMPILE/loader-$(1).bin := loader-okli-compile
+  COMPILE/loader-$(1).uImage := append-loader-okli $(1) | pad-to 64k | \
+       lzma | uImage lzma
+endef
+
+include $(SUBTARGET).mk
+
 ifeq ($(SUBTARGET),generic)
-include ./generic.mk
-include ./generic-tp-link.mk
-include ./generic-ubnt.mk
+include generic-tp-link.mk
+include generic-ubnt.mk
 endif
+
+ifeq ($(SUBTARGET),tiny)
+include tiny-netgear.mk
+include tiny-tp-link.mk
+include tiny-ubnt.mk
+endif
+
 $(eval $(call BuildImage))