ath79: correct Siemens WS-AP3610 blocksize

[oweals/openwrt.git] / target / linux / ath79 / image / Makefile

diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile
index 734f27e689c9d76abedad8c89f22a24006ba86ae..a28658ec0bb8bd017d4b280132f119dfee82e3a2 100644 (file)
--- a/target/linux/ath79/image/Makefile
+++ b/target/linux/ath79/image/Makefile
@@ -3,14 +3,13 @@ include $(INCLUDE_DIR)/image.mk
 
 KERNEL_LOADADDR = 0x80060000
 
-DEVICE_VARS += IMAGE_SIZE LOADER_FLASH_OFFS LOADER_TYPE ATH_SOC
+DEVICE_VARS += IMAGE_SIZE LOADER_FLASH_OFFS LOADER_TYPE
 
 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
@@ -36,6 +35,10 @@ define Build/loader-okli
        mv "$@.new" "$@"
 endef
 
+define Build/append-loader-okli
+       cat "$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE)" >> "$@"
+endef
+
 define Build/relocate-kernel
        rm -rf $@.relocate
        $(CP) ../../generic/image/relocate $@.relocate
@@ -51,9 +54,8 @@ endef
 
 
 define Device/Default
-  ATH_SOC :=
   DEVICE_DTS_DIR := ../dts
-  DEVICE_DTS = $$(ATH_SOC)_$(1)
+  DEVICE_DTS = $$(SOC)_$(1)
   PROFILES = Default
   MTDPARTS :=
   BLOCKSIZE := 64k