summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120-2.6/image/Makefile
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-25 08:47:10 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-25 08:47:10 +0000
commite54536938f891e79daada146d2e081251d1be122 (patch)
tree8213501ff18c8c91280504cd5fd29232b60150eb /target/linux/adm5120-2.6/image/Makefile
parent1d5d64e647517cdd5bc8d0bb8c408babfec51d79 (diff)
[adm5120] from now on, the lzma loader is able to pass parameters to the kernel
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7723 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120-2.6/image/Makefile')
-rw-r--r--target/linux/adm5120-2.6/image/Makefile116
1 files changed, 77 insertions, 39 deletions
diff --git a/target/linux/adm5120-2.6/image/Makefile b/target/linux/adm5120-2.6/image/Makefile
index 02b57be99..360a87f65 100644
--- a/target/linux/adm5120-2.6/image/Makefile
+++ b/target/linux/adm5120-2.6/image/Makefile
@@ -7,18 +7,14 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
+IMGNAME = $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)
LOADER_MAKE = $(MAKE) -C lzma-loader KDIR=$(KDIR)
-define PrepareLoader
- $(LOADER_MAKE) LOADER=$(1) LOADER_DATA="" \
- LZMA_TEXT_START=$(2) LZMA_STARTUP_ORG=$(3) \
- compile
-
-endef
-define PrepareLZMAKernel
- $(LOADER_MAKE) LOADER=vmlinux-lzma-$(1) LOADER_DATA=$(KDIR)/vmlinux.lzma \
- LZMA_TEXT_START=$(2) LZMA_STARTUP_ORG=$(3) \
- compile
+define Image/Build/Loader
+ $(LOADER_MAKE) LOADER=loader-$(1).$(2) LOADER_DATA="" \
+ LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
+ CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \
+ compile loader.$(2)
endef
define Build/Clean
@@ -27,13 +23,6 @@ endef
define Image/Prepare
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
- $(call PrepareLoader,generic,0x80500000,0)
- $(call PrepareLoader,admboot,0x80500000,0x6D8)
-else
- $(call PrepareLZMAKernel,generic,0x80500000,0)
- $(call PrepareLZMAKernel,admboot,0x80500000,0x6D8)
-endif
endef
define trxalign/jffs2-128k
@@ -46,36 +35,57 @@ define trxalign/squashfs
-a 1024
endef
+define Image/Build/TRX
+ $(STAGING_DIR)/bin/trx -o $(1) -f $(3) -f $(KDIR)/vmlinux.lzma \
+ $(call trxalign/$(2)) -f $(KDIR)/root.$(2)
+endef
+
+define Image/Build/TRXNoloader
+ $(STAGING_DIR)/bin/trx -o $(1) -f $(KDIR)/vmlinux.lzma \
+ $(call trxalign/$(2)) -f $(KDIR)/root.$(2)
+endef
+
define Image/Build/Compex
- $(CP) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).trx $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(3)-$(2).trx
+ $(call Image/Build/Loader,$(2),gz,0x80500000,0,y,$(2))
+ $(call Image/Build/TRX,$(IMGNAME)-$(3)-$(2).trx,$(1),$(KDIR)/loader-$(2).gz)
endef
define Image/Build/Edimax
+ $(call Image/Build/Loader,$(2),gz,0x80500000,0x6D8,y,$(2))
+ $(call Image/Build/TRXNoloader,$(IMGNAME)-$(3)-$(2).trx,$(1))
$(STAGING_DIR)/bin/mkcsysimg -B $(4) -d -w \
- -r $(KDIR)/loader-admboot.gz \
- -x $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-noloader.trx \
- $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(3)-$(2).bin
+ -r $(KDIR)/loader-$(2).gz \
+ -x $(IMGNAME)-$(3)-$(2).trx \
+ $(IMGNAME)-$(3)-$(2).bin
+endef
+
+define Image/Build/Infineon
+ $(call Image/Build/Loader,$(2),gz,0x80500000,0x6D8,y,$(2))
+ $(call Image/Build/TRXNoloader,$(IMGNAME)-$(3)-$(2).trx,$(1))
+ dd if=$(KDIR)/loader-$(2).gz of=$(IMGNAME)-$(3)-$(2).img bs=64k conv=sync
+ cat $(IMGNAME)-$(3)-$(2).trx >>$(IMGNAME)-$(3)-$(2).img
endef
define Image/Build/MyLoader
- $(CP) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-noloader.trx $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(3)-$(2).trx
+ $(call Image/Build/Loader,$(2),gz,0x80500000,0)
+ $(call Image/Build/TRXNoloader,$(IMGNAME)-$(3)-$(2).trx,$(1))
$(STAGING_DIR)/bin/mkmylofw -B $(4) \
-p0x20000:0x10000:ahp:0x80001000 \
-p0x30000:0 \
- -b0x20000:0x10000:h:$(KDIR)/loader-generic.gz \
- -b0x30000:0::$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(3)-$(2).trx \
- $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(3)-$(2).bin
+ -b0x20000:0x10000:h:$(KDIR)/loader-$(2).gz \
+ -b0x30000:0::$(IMGNAME)-$(3)-$(2).trx \
+ $(IMGNAME)-$(3)-$(2).bin
endef
define Image/Build/RouterBoard
- $(CP) $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux
+ $(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-vmlinux
endef
define Image/Build
- $(STAGING_DIR)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).trx -f $(KDIR)/loader-generic.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1)) -f $(KDIR)/root.$(1)
- $(STAGING_DIR)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-noloader.trx -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1)) -f $(KDIR)/root.$(1)
-ifneq ($(1),jffs2-128K)
- $(call Image/Build/Compex,$(1),wp54g-wrt,$(patsubst jffs2-%,jffs2,$(1)))
+# this line is here intentionally
+ifneq ($(1),jffs2-256k)
+ifneq ($(1),jffs2-128k)
+ $(call Image/Build/Compex,$(1),wp54g-wrt,$(patsubst jffs2-%,jffs2,$(1)),WP54G-WRT)
$(call Image/Build/Edimax,$(1),br-6104k,$(patsubst jffs2-%,jffs2,$(1)),BR-6104K)
$(call Image/Build/Edimax,$(1),br-6104kp,$(patsubst jffs2-%,jffs2,$(1)),BR-6104KP)
$(call Image/Build/Edimax,$(1),br-6114wg,$(patsubst jffs2-%,jffs2,$(1)),BR-6114WG)
@@ -89,6 +99,10 @@ ifneq ($(1),jffs2-128K)
$(call Image/Build/Edimax,$(1),ps-3205uwg,$(patsubst jffs2-%,jffs2,$(1)),PS-3205UWg)
$(call Image/Build/Edimax,$(1),br-6524wg,$(patsubst jffs2-%,jffs2,$(1)),BR-6524WG)
$(call Image/Build/Edimax,$(1),br-6524wp,$(patsubst jffs2-%,jffs2,$(1)),BR-6524WP)
+ $(call Image/Build/Infineon,$(1),easy-5120,$(patsubst jffs2-%,jffs2,$(1)))
+ $(call Image/Build/Infineon,$(1),easy-5120-rt,$(patsubst jffs2-%,jffs2,$(1)))
+ $(call Image/Build/Infineon,$(1),easy-5120p-ata,$(patsubst jffs2-%,jffs2,$(1)))
+ $(call Image/Build/Infineon,$(1),easy-83000,$(patsubst jffs2-%,jffs2,$(1)))
$(call Image/Build/MyLoader,$(1),np27g,$(patsubst jffs2-%,jffs2,$(1)),NP27G)
$(call Image/Build/MyLoader,$(1),np28g,$(patsubst jffs2-%,jffs2,$(1)),NP28G)
$(call Image/Build/MyLoader,$(1),np28ghs,$(patsubst jffs2-%,jffs2,$(1)),NP28GHS)
@@ -97,24 +111,48 @@ ifneq ($(1),jffs2-128K)
$(call Image/Build/MyLoader,$(1),wpp54g,$(patsubst jffs2-%,jffs2,$(1)),WPP54G)
$(call Image/Build/MyLoader,$(1),wpp54ag,$(patsubst jffs2-%,jffs2,$(1)),WPP54AG)
endif
+endif
ifeq ($(1),tgz)
$(call Image/Build/RouterBoard)
endif
endef
define Image/Build/LZMAKernel
- $(CP) $(KDIR)/loader-vmlinux-lzma-$(2).$(3) \
- $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux-lzma-$(1).$(3)
+ $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
+ LOADER=openwrt-$(BOARD)-$(KERNEL)-ramfs-lzma-$(1).$(2) \
+ LOADER_DATA=$(KDIR)/vmlinux.lzma \
+ LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
+ CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \
+ compile loader.$(2)
+endef
+
+define Image/Build/LZMAKernel/Compex
+ $(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0,y,$(1))
+endef
+
+define Image/Build/LZMAKernel/Generic
+ $(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0)
+endef
+
+define Image/Build/LZMAKernel/Admboot
+ $(call Image/Build/LZMAKernel,$(1),$(2),0x80500000,0x6D8,y,$(1))
endef
define Image/Build/Initramfs
- $(call Image/Build/LZMAKernel,generic,generic,elf)
- $(call Image/Build/LZMAKernel,rb-100,generic,elf)
- $(call Image/Build/LZMAKernel,np27g,generic,bin)
- $(call Image/Build/LZMAKernel,wp54g,generic,bin)
- $(call Image/Build/LZMAKernel,br-6104k,admboot,gz)
- $(call Image/Build/LZMAKernel,cas-771,admboot,gz)
+ $(call Image/Build/LZMAKernel/Generic,generic,bin)
+ $(call Image/Build/LZMAKernel/Generic,rb-100,elf)
+ $(call Image/Build/LZMAKernel/Generic,np27g,bin)
+ $(call Image/Build/LZMAKernel/Generic,wp54g,bin)
+ $(call Image/Build/LZMAKernel/Compex,wp54g-wrt,bin)
+ $(call Image/Build/LZMAKernel/Admboot,br-6104k,gz)
+ $(call Image/Build/LZMAKernel/Admboot,easy-5120,gz)
+ $(call Image/Build/LZMAKernel/Admboot,easy-83000,gz)
+ $(call Image/Build/LZMAKernel/Admboot,cas-630,gz)
+ $(call Image/Build/LZMAKernel/Admboot,cas-670,gz)
+ $(call Image/Build/LZMAKernel/Admboot,cas-700,gz)
+ $(call Image/Build/LZMAKernel/Admboot,cas-771,gz)
+ $(call Image/Build/LZMAKernel/Admboot,cas-790,gz)
+ $(call Image/Build/LZMAKernel/Admboot,cas-861,gz)
endef
$(eval $(call BuildImage))
-