[source] brcm63xx: Livebox 1: relocate the kernel to fix boot

[LEDE Commits]

jogo pushed a commit to source.git, branch master:
https://git.lede-project.org/aedca3ce430c0edcf582118d393fe13349fca741

commit aedca3ce430c0edcf582118d393fe13349fca741
Author: Daniel Gonzalez Cabanelas <dgcbueu at gmail.com>
AuthorDate: Mon Aug 29 16:03:33 2016 +0200

    brcm63xx: Livebox 1: relocate the kernel to fix boot
    
    Fix Image generation for the Livebox 1
    - missing "relocate-kernel", wrong "LOADADDR", fix it
    
    Signed-off-by: Daniel Gonzalez Cabanelas <dgcbueu at gmail.com>
    Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
---
 target/linux/brcm63xx/image/Makefile   | 2 +-
 target/linux/brcm63xx/image/bcm63xx.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 6e7ca8f..c9363dd 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -151,7 +151,7 @@ define Build/redboot-bin
 	$(TOPDIR)/scripts/redboot-script.pl \
 		-k $(BIN_DIR)/$(REDBOOT_PREFIX)-vmlinux.gz \
 		-r $(BIN_DIR)/$(REDBOOT_PREFIX)-$(notdir $(IMAGE_ROOTFS)) \
-		-a $(strip $(LOADADDR)) -f 0xbe430000 -l 0x7c0000 \
+		-a $(strip $(LOADER_ENTRY)) -f 0xbe430000 -l 0x7c0000 \
 		-s 0x1000 -t 20 -o $@.redbootscript
 	dd if="$@.redbootscript" of="$@.redbootscript.padded" bs=4096 conv=sync
 	cat \
diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk
index af14168..34d496e 100644
--- a/target/linux/brcm63xx/image/bcm63xx.mk
+++ b/target/linux/brcm63xx/image/bcm63xx.mk
@@ -44,7 +44,7 @@ DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_REGION
 
 define Device/bcm63xx_redboot
   FILESYSTEMS := squashfs
-  KERNEL := kernel-bin | append-dtb | gzip
+  KERNEL := kernel-bin | append-dtb | relocate-kernel | gzip
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma elf
   IMAGES := redboot.bin
   IMAGE/redboot.bin := redboot-bin