From: RISCi_ATOM <bob@bobcall.me>
Date: Mon, 23 May 2016 16:40:57 +0000 (+0000)
Subject: Update ar71xx lzma-loader
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=37997c78c40d204b6d8088a6b6e6053fdf24d406;p=librecmc%2Flibrecmc-fossil.git

Update ar71xx lzma-loader
---

diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/Makefile b/trunk/target/linux/ar71xx/image/lzma-loader/Makefile
index 2e0b9111..9b81e873 100644
--- a/trunk/target/linux/ar71xx/image/lzma-loader/Makefile
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/Makefile
@@ -9,6 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 LZMA_TEXT_START	:= 0x80a00000
+LOADADDR	:= 0x80060000
 LOADER		:= loader.bin
 LOADER_NAME	:= $(basename $(notdir $(LOADER)))
 LOADER_DATA 	:=
@@ -38,6 +39,7 @@ $(PKG_BUILD_DIR)/.prepared:
 loader-compile: $(PKG_BUILD_DIR)/.prepared
 	$(MAKE) -C $(PKG_BUILD_DIR) CROSS_COMPILE="$(TARGET_CROSS)" \
 		LZMA_TEXT_START=$(LZMA_TEXT_START) \
+		LOADADDR=$(LOADADDR) \
 		LOADER_DATA=$(LOADER_DATA) \
 		FLASH_OFFS=$(FLASH_OFFS) \
 		FLASH_MAX=$(FLASH_MAX) \
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/Makefile b/trunk/target/linux/ar71xx/image/lzma-loader/src/Makefile
index d5d891bd..a0c4bf61 100644
--- a/trunk/target/linux/ar71xx/image/lzma-loader/src/Makefile
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/Makefile
@@ -27,7 +27,8 @@ LD		:= $(CROSS_COMPILE)ld
 OBJCOPY		:= $(CROSS_COMPILE)objcopy
 OBJDUMP		:= $(CROSS_COMPILE)objdump
 
-BIN_FLAGS	:= -O binary -R .reginfo -R .note -R .comment -R .mdebug -S
+BIN_FLAGS	:= -O binary -R .reginfo -R .note -R .comment -R .mdebug \
+		   -R .MIPS.abiflags -S
 
 CFLAGS		= -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
 		  -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \
diff --git a/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.c b/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.c
index 2b8956a3..dad023ba 100644
--- a/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.c
+++ b/trunk/target/linux/ar71xx/image/lzma-loader/src/loader.c
@@ -73,9 +73,10 @@ static unsigned long lzma_outsize;
 static unsigned long kernel_la;
 
 #ifdef CONFIG_KERNEL_CMDLINE
-#define kernel_argc	1
+#define kernel_argc	2
 static const char kernel_cmdline[] = CONFIG_KERNEL_CMDLINE;
 static const char *kernel_argv[] = {
+	NULL,
 	kernel_cmdline,
 	NULL,
 };