EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bcm63xx: image: rename LOADADDR to KERNEL_LOADADDR

Browse Source 
Also remove KERNEL_ENTRY, since it's the same as KERNEL_LOADADDR

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2020-04-06 16:56:19 +02:00
parent b181294b02
commit 84646936a6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/bcm63xx/image/Makefile
View File

@ -8,22 +8,21 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
LOADADDR = 0x80010000 # RAM start + 64K KERNEL_LOADADDR = 0x80010000 # RAM start + 64K
KERNEL_ENTRY = $(LOADADDR) # Newer kernels add a jmp to the kernel_entry at the start of the binary LOADER_ENTRY = 0x80a00000 # RAM start + 10M, for relocate
LOADER_ENTRY = 0x80a00000 # RAM start + 10M, for relocate RAMSIZE = 0x02000000 # 32MB
RAMSIZE = 0x02000000 # 32MB LZMA_TEXT_START = 0x81800000 # 32MB - 8MB
LZMA_TEXT_START = 0x81800000 # 32MB - 8MB
LOADER_MAKEOPTS= \ LOADER_MAKEOPTS= \
KDIR=$(KDIR) \ KDIR=$(KDIR) \
LOADADDR=$(LOADADDR) \ LOADADDR=$(KERNEL_LOADADDR) \
KERNEL_ENTRY=$(KERNEL_ENTRY) \ KERNEL_ENTRY=$(KERNEL_LOADADDR) \
RAMSIZE=$(RAMSIZE) \ RAMSIZE=$(RAMSIZE) \
LZMA_TEXT_START=$(LZMA_TEXT_START) \ LZMA_TEXT_START=$(LZMA_TEXT_START) \
RELOCATE_MAKEOPTS= \ RELOCATE_MAKEOPTS= \
CACHELINE_SIZE=16 \ CACHELINE_SIZE=16 \
KERNEL_ADDR=$(KERNEL_ENTRY) \ KERNEL_ADDR=$(KERNEL_LOADADDR) \
CROSS_COMPILE=$(TARGET_CROSS) \ CROSS_COMPILE=$(TARGET_CROSS) \
LZMA_TEXT_START=$(LOADER_ENTRY) LZMA_TEXT_START=$(LOADER_ENTRY)
@ -37,7 +36,7 @@ endef
define Build/hcs-initramfs define Build/hcs-initramfs
$(STAGING_DIR_HOST)/bin/hcsmakeimage --magic_bytes=$(HCS_MAGIC_BYTES) \ $(STAGING_DIR_HOST)/bin/hcsmakeimage --magic_bytes=$(HCS_MAGIC_BYTES) \
--rev_maj=$(HCS_REV_MAJ) --rev_min=$(HCS_REV_MIN) --input_file=$@ \ --rev_maj=$(HCS_REV_MAJ) --rev_min=$(HCS_REV_MIN) --input_file=$@ \
--output_file=$@.hcs --ldaddress=$(LOADADDR) --output_file=$@.hcs --ldaddress=$(KERNEL_LOADADDR)
mv $@.hcs $@ mv $@.hcs $@
endef endef