lua: Fixed some cross-platform issues for PPC (and probably other architectures)

[openwrt.git] / target / linux / generic-2.6 / image / lzma-loader / src / Makefile

diff --git a/target/linux/generic-2.6/image/lzma-loader/src/Makefile b/target/linux/generic-2.6/image/lzma-loader/src/Makefile
index dbe9019..910172c 100644 (file)
--- a/target/linux/generic-2.6/image/lzma-loader/src/Makefile
+++ b/target/linux/generic-2.6/image/lzma-loader/src/Makefile
@@ -4,15 +4,16 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

+RAMSTART = 0x80000000
+RAMSIZE = 0x00100000           # 1MB

 LOADADDR = 0x80400000          # RAM start + 4M
 KERNEL_ENTRY = 0x80001000
 LOADADDR = 0x80400000          # RAM start + 4M
 KERNEL_ENTRY = 0x80001000

-RAMSIZE = 0x00100000           # 1MB

 IMAGE_COPY:=0
 
 CROSS_COMPILE = mips-linux-
 
 OBJCOPY:= $(CROSS_COMPILE)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S
 IMAGE_COPY:=0
 
 CROSS_COMPILE = mips-linux-
 
 OBJCOPY:= $(CROSS_COMPILE)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S

-CFLAGS := -fno-builtin -Os -G 0 -ffunction-sections -mno-abicalls -fno-pic -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -Wall -DRAMSIZE=${RAMSIZE} -DKERNEL_ENTRY=${KERNEL_ENTRY} -D_LZMA_IN_CB
+CFLAGS := -fno-builtin -Os -G 0 -ffunction-sections -mno-abicalls -fno-pic -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -Wall -DRAMSTART=${RAMSTART} -DRAMSIZE=${RAMSIZE} -DKERNEL_ENTRY=${KERNEL_ENTRY} -D_LZMA_IN_CB

 ifeq ($(IMAGE_COPY),1)
 CFLAGS += -DLOADADDR=${LOADADDR} -DIMAGE_COPY=1
 endif
 ifeq ($(IMAGE_COPY),1)
 CFLAGS += -DLOADADDR=${LOADADDR} -DIMAGE_COPY=1
 endif


@@ -35,7 +36,7 @@ O_FORMAT = $(shell $(OBJDUMP) -i | head -2 | grep elf32)
 drop-sections   = .reginfo .mdebug .comment
 strip-flags     = $(addprefix --remove-section=,$(drop-sections))
 
 drop-sections   = .reginfo .mdebug .comment
 strip-flags     = $(addprefix --remove-section=,$(drop-sections))
 

-all : lzma.elf
+all : lzma.elf lzma.bin

 
 lzma.lds: lzma.lds.in
        sed -e 's,@LOADADDR@,$(LOADADDR),g' -e 's,@ENTRY@,_start,g' $< >$@
 
 lzma.lds: lzma.lds.in
        sed -e 's,@LOADADDR@,$(LOADADDR),g' -e 's,@ENTRY@,_start,g' $< >$@


@@ -43,6 +44,9 @@ lzma.lds: lzma.lds.in
 kernel.o: vmlinux.lzma lzma.lds
        $(LD) -r -b binary --oformat $(O_FORMAT) -o $@ $<
 
 kernel.o: vmlinux.lzma lzma.lds
        $(LD) -r -b binary --oformat $(O_FORMAT) -o $@ $<
 

+lzma.bin: lzma.elf
+       $(OBJCOPY) $< $@
+

 ifeq ($(IMAGE_COPY),1)
 LOADER_ENTRY ?= $(KERNEL_ENTRY)
 lzma.o: decompress.o LzmaDecode.o kernel.o
 ifeq ($(IMAGE_COPY),1)
 LOADER_ENTRY ?= $(KERNEL_ENTRY)
 lzma.o: decompress.o LzmaDecode.o kernel.o


@@ -61,4 +65,4 @@ lzma.elf: start.o decompress.o LzmaDecode.o kernel.o
 endif
 
 clean:
 endif
 
 clean:

-       rm -f *.o lzma.elf *.tmp *.lds
+       rm -f *.o lzma.elf lzma.bin *.tmp *.lds