diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-01-10 15:26:38 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-10 15:26:38 +0000 |
| commit | 49c1bb9796d920bcf00dcd71b7ebac5b8ce36c15 (patch) | |
| tree | 67635cd7cb6a95fc1b528a13560f5c36b109d4ac /target/linux/ramips/image/Makefile | |
| parent | c6d03d1503346df167c37fb0348c2246531805b3 (diff) | |
| download | upstream-49c1bb9796d920bcf00dcd71b7ebac5b8ce36c15.tar.gz upstream-49c1bb9796d920bcf00dcd71b7ebac5b8ce36c15.tar.bz2 upstream-49c1bb9796d920bcf00dcd71b7ebac5b8ce36c15.zip | |
ramips: simplify mkimage kernel loadaddr/entry handling
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43906 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/image/Makefile')
| -rw-r--r-- | target/linux/ramips/image/Makefile | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index e4effa6f5c..18c1330bf6 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -22,21 +22,9 @@ define Image/Build/Initramfs $(call Image/Build/Profile/$(PROFILE),initramfs) endef -ifeq ($(CONFIG_SOC_RT288X),y) -define kernel_entry --a 0x88000000 -e 0x88000000 -endef -else -ifeq ($(CONFIG_SOC_MT7621),y) -define kernel_entry --a 0x80001000 -e 0x80001000 -endef -else -define kernel_entry --a 0x80000000 -e 0x80000000 -endef -endif -endif +loadaddr-y := 0x80000000 +loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000 +loadaddr-$(CONFIG_TARGET_ramips_mt7621) := 0x80001000 define MkCombineduImage $(call PatchKernelLzma,$(2),$(3)) @@ -59,7 +47,7 @@ endef # $(3), output filename define MkImage $(eval imagename=$(if $(4),$(4),MIPS OpenWrt Linux-$(LINUX_VERSION))) - -mkimage -A mips -O linux -T kernel -C $(1) $(call kernel_entry)\ + -mkimage -A mips -O linux -T kernel -C $(1) -a $(loadaddr-y) -e $(loadaddr-y) \ -n "$(imagename)" \ -d $(2) $(3) endef |