aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-01-22 18:06:07 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-01-23 15:28:03 +0100
commit071a6372762d289b2fa5a8d1a138eff944c93c9e (patch)
tree4e63b6a19433ac8c0a1b4cafccd39841365b6bb6
parent6aaa5ce2c5138877e0f0504c3bd536b40e9af928 (diff)
downloadupstream-071a6372762d289b2fa5a8d1a138eff944c93c9e.tar.gz
upstream-071a6372762d289b2fa5a8d1a138eff944c93c9e.tar.bz2
upstream-071a6372762d289b2fa5a8d1a138eff944c93c9e.zip
ath79: move lzma-loader to the end of available RAM
In certain cases, the uncompressed initramfs image will overwrite the lzma-loader, which is currently only 10 MB away from kernel image start. To prevent this, change LZMA_TEXT_START to 24 MB, so loader and compressed image have 8 MB at the end of RAM and uncompressed image has 24 MB available. This is only enabled for ath79 at the moment, as there we can be sure that all devices have 32+ MB RAM and TARGET_INITRAMFS_COMPRESSION_LZMA is not enabled there. Despite, since lzma-loader is currently build specifically for ath79 anyway, there is no need to re-specify LOADADDR and LZMA_TEXT_START in image/Makefile, so the values are set directly in image/lzma-loader/Makefile and the overwrite in image/Makefile is removed. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-rw-r--r--target/linux/ath79/image/Makefile1
-rw-r--r--target/linux/ath79/image/lzma-loader/Makefile4
2 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile
index 34bd0a2490..a28658ec0b 100644
--- a/target/linux/ath79/image/Makefile
+++ b/target/linux/ath79/image/Makefile
@@ -10,7 +10,6 @@ define Build/loader-common
$(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
diff --git a/target/linux/ath79/image/lzma-loader/Makefile b/target/linux/ath79/image/lzma-loader/Makefile
index 738093a958..0ff59bc56a 100644
--- a/target/linux/ath79/image/lzma-loader/Makefile
+++ b/target/linux/ath79/image/lzma-loader/Makefile
@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
-LZMA_TEXT_START := 0x80a00000
+LZMA_TEXT_START := 0x81800000
LOADADDR := 0x80060000
LOADER := loader.bin
LOADER_NAME := $(basename $(notdir $(LOADER)))
-LOADER_DATA :=
+LOADER_DATA :=
TARGET_DIR :=
FLASH_OFFS :=
FLASH_MAX :=