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 2e0b9111f2894185a18cd506fbbe4049a02b65e1..9b81e87306f235d1e7284401828240b9b9787011 100644 (file)
--- 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 d5d891bd7d7f468b2b9f52c3d8adef91a0a891de..a0c4bf61d286252d6a876147d3cc62b6b77927ce 100644 (file)
--- 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 2b8956a34f1f15d02981485474a175c42d925fda..dad023bacf85f858f92e04bd7c3bb5417c5cedf4 100644 (file)
--- 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,
 };