From e3f47958dd16137ea903ca3733435862d9f602ae Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Mon, 4 Sep 2017 13:42:49 +0800 Subject: [PATCH] layerscape: make uImage with zImage for 32-bit kernel uImage should be made with zImage. This patch is to support making uImage with zImage. Signed-off-by: Yangbo Lu --- target/linux/layerscape/Makefile | 1 - target/linux/layerscape/armv8_32b/target.mk | 1 + target/linux/layerscape/armv8_64b/target.mk | 1 + target/linux/layerscape/image/Makefile | 4 +++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/linux/layerscape/Makefile b/target/linux/layerscape/Makefile index c2d3cc07af..9c92bb4896 100644 --- a/target/linux/layerscape/Makefile +++ b/target/linux/layerscape/Makefile @@ -10,7 +10,6 @@ BOARD:=layerscape BOARDNAME:=NXP Layerscape DEVICE_TYPE:=developerboard KERNEL_PATCHVER:=4.4 -KERNELNAME:=Image dtbs FEATURES:=squashfs nand usb pcie gpio SUBTARGETS:=armv8_64b armv8_32b MAINTAINER:=Yangbo Lu diff --git a/target/linux/layerscape/armv8_32b/target.mk b/target/linux/layerscape/armv8_32b/target.mk index ed89d8e4ec..e859c071d5 100644 --- a/target/linux/layerscape/armv8_32b/target.mk +++ b/target/linux/layerscape/armv8_32b/target.mk @@ -8,6 +8,7 @@ ARCH:=arm BOARDNAME:=ARMv8 32-bit based boards CPU_TYPE:=cortex-a9 +KERNELNAME:=zImage dtbs define Target/Description Build firmware images for NXP Layerscape ARMv8 32-bit based boards. diff --git a/target/linux/layerscape/armv8_64b/target.mk b/target/linux/layerscape/armv8_64b/target.mk index f1db72d973..274a729440 100644 --- a/target/linux/layerscape/armv8_64b/target.mk +++ b/target/linux/layerscape/armv8_64b/target.mk @@ -7,6 +7,7 @@ ARCH:=aarch64 BOARDNAME:=ARMv8 64-bit based boards +KERNELNAME:=Image dtbs define Target/Description Build firmware images for NXP Layerscape ARMv8 64-bit based boards. diff --git a/target/linux/layerscape/image/Makefile b/target/linux/layerscape/image/Makefile index 7f672d7db5..38bb06fe3d 100644 --- a/target/linux/layerscape/image/Makefile +++ b/target/linux/layerscape/image/Makefile @@ -33,15 +33,17 @@ endef define Device/Default PROFILES = Default FILESYSTEMS := squashfs - KERNEL := kernel-bin | gzip | uImage gzip DEVICE_DTS := IMAGES = firmware.bin ifeq ($(SUBTARGET),armv8_64b) + KERNEL := kernel-bin | gzip | uImage gzip KERNEL_LOADADDR = 0x80080000 KERNEL_ENTRY_POINT = 0x80080000 endif ifeq ($(SUBTARGET),armv8_32b) + KERNEL := kernel-bin | uImage none + KERNEL_NAME := zImage KERNEL_LOADADDR = 0x80008000 KERNEL_ENTRY_POINT = 0x80008000 endif