ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-01 08:48:08 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ramips: define lzma loader platform in target

Browse Source 
Loader platform is a per-soc variable instead of a per-device one.
Determine corresponding loader platform at the beginning of image
Makefile.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
This commit is contained in:
Chuanhong Guo 2020-04-14 11:17:47 +08:00
parent 111029bea7
commit d9e9a0e6b1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/ramips/image/Makefile
View File

@ -18,7 +18,11 @@ loadaddr-y := 0x80000000
loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000 loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000
loadaddr-$(CONFIG_TARGET_ramips_mt7621) := 0x80001000 loadaddr-$(CONFIG_TARGET_ramips_mt7621) := 0x80001000
ldrplatform-y := ralink
ldrplatform-$(CONFIG_TARGET_ramips_mt7621) := mt7621
KERNEL_LOADADDR := $(loadaddr-y) KERNEL_LOADADDR := $(loadaddr-y)
LOADER_PLATFORM := $(ldrplatform-y)
KERNEL_DTB = kernel-bin | append-dtb | lzma KERNEL_DTB = kernel-bin | append-dtb | lzma
define Device/Default define Device/Default
@ -68,7 +72,7 @@ define Build/loader-common
$(MAKE) -C lzma-loader \ $(MAKE) -C lzma-loader \
PKG_BUILD_DIR="$@.src" \ PKG_BUILD_DIR="$@.src" \
TARGET_DIR="$(dir $@)" LOADER_NAME="$(notdir $@)" \ TARGET_DIR="$(dir $@)" LOADER_NAME="$(notdir $@)" \
BOARD="$(BOARDNAME)" PLATFORM="$(PLATFORM)" \ BOARD="$(BOARDNAME)" PLATFORM="$(LOADER_PLATFORM)" \
LZMA_TEXT_START=0x82000000 LOADADDR=$(KERNEL_LOADADDR) \ LZMA_TEXT_START=0x82000000 LOADADDR=$(KERNEL_LOADADDR) \
$(1) compile loader.$(LOADER_TYPE) $(1) compile loader.$(LOADER_TYPE)
mv "$@.$(LOADER_TYPE)" "$@" mv "$@.$(LOADER_TYPE)" "$@"

1
target/linux/ramips/image/mt7621.mk
View File

@ -504,7 +504,6 @@ define Device/MikroTik
IMAGE_SIZE := 16128k IMAGE_SIZE := 16128k
DEVICE_PACKAGES := kmod-usb3 DEVICE_PACKAGES := kmod-usb3
LOADER_TYPE := elf LOADER_TYPE := elf
PLATFORM := mt7621
KERNEL := $(KERNEL_DTB) | loader-kernel KERNEL := $(KERNEL_DTB) | loader-kernel
IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | \ IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 | \
pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | \ pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata | \