Merge pull request LibreELEC#4803 from lrusak/aarch64

linux: use KERNEL_TARGET as make target
stbenz · Mar 2, 2016 · 79efe4e · 79efe4e
2 parents 52b5fc5 + 362ed24
commit 79efe4e
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 33 deletions.
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
@@ -50,14 +50,6 @@ PKG_AUTORECONF="no"
 
 PKG_MAKE_OPTS_HOST="ARCH=$TARGET_KERNEL_ARCH headers_check"
 
-if [ "$BOOTLOADER" = "u-boot" ]; then
-  KERNEL_IMAGE="$KERNEL_UBOOT_TARGET"
-elif [ "$TARGET_KERNEL_ARCH" = "arm" ]; then
-  KERNEL_IMAGE="bzImage"
-else
-  KERNEL_IMAGE="Image"
-fi
-
 if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mkbootimg:host"
 fi
@@ -147,12 +139,12 @@ make_target() {
     done
   fi
 
-  LDFLAGS="" make $KERNEL_IMAGE $KERNEL_MAKE_EXTRACMD
+  LDFLAGS="" make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD
 
   if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
-    LDFLAGS="" mkbootimg --kernel arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_IMAGE --ramdisk $ROOT/$BUILD/image/initramfs.cpio \
+    LDFLAGS="" mkbootimg --kernel arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET --ramdisk $ROOT/$BUILD/image/initramfs.cpio \
       --second "$ANDROID_BOOTIMG_SECOND" --output arch/$TARGET_KERNEL_ARCH/boot/boot.img
-    mv -f arch/$TARGET_KERNEL_ARCH/boot/boot.img arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_IMAGE
+    mv -f arch/$TARGET_KERNEL_ARCH/boot/boot.img arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET
   fi
 }
 

diff --git a/projects/Generic/options b/projects/Generic/options
@@ -26,8 +26,8 @@
   # Target Configfile for u-boot
     UBOOT_CONFIGFILE=""
 
-  # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-    KERNEL_UBOOT_TARGET=""
+  # Kernel target
+    KERNEL_TARGET="zImage"
 
   # Kernel extra targets to build
     KERNEL_UBOOT_EXTRA_TARGET=""

diff --git a/projects/RPi/options b/projects/RPi/options
@@ -46,8 +46,8 @@
   # Target Configfile for u-boot
     UBOOT_CONFIGFILE=""
 
-  # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-    KERNEL_UBOOT_TARGET=""
+  # Kernel target
+    KERNEL_TARGET="zImage"
 
   # Kernel extra targets to build
     KERNEL_UBOOT_EXTRA_TARGET=""

diff --git a/projects/RPi2/options b/projects/RPi2/options
@@ -46,8 +46,8 @@
   # Target Configfile for u-boot
     UBOOT_CONFIGFILE=""
 
-  # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-    KERNEL_UBOOT_TARGET=""
+  # Kernel target
+    KERNEL_TARGET="zImage"
 
   # Kernel extra targets to build
     KERNEL_UBOOT_EXTRA_TARGET=""

diff --git a/projects/WeTek_Core/options b/projects/WeTek_Core/options
@@ -47,8 +47,8 @@
   # Target Configfile for u-boot
     UBOOT_CONFIGFILE=""
 
-  # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-    KERNEL_UBOOT_TARGET="uImage-dtb"
+  # Kernel target
+    KERNEL_TARGET="uImage-dtb"
 
   # Kernel extra targets to build
     KERNEL_UBOOT_EXTRA_TARGET="meson8m2_wetek_core.dtd meson8m2_wetek_core.dtb"

diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options
@@ -47,8 +47,8 @@
   # Target Configfile for u-boot
     UBOOT_CONFIGFILE=""
 
-  # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-    KERNEL_UBOOT_TARGET="uImage-dtb"
+  # Kernel target
+    KERNEL_TARGET="uImage-dtb"
 
   # Kernel extra targets to build
     KERNEL_UBOOT_EXTRA_TARGET="wetek_play.dtd"

diff --git a/projects/imx6/options b/projects/imx6/options
@@ -48,8 +48,8 @@
   # Target Configfile for u-boot
     UBOOT_CONFIGFILE=""
 
-  # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-    KERNEL_UBOOT_TARGET="zImage"
+  # Kernel target
+    KERNEL_TARGET="zImage"
 
   # Kernel extra targets to build
     KERNEL_UBOOT_EXTRA_TARGET="imx6q-cubox-i.dtb imx6dl-cubox-i.dtb"

diff --git a/scripts/image b/scripts/image
@@ -218,20 +218,12 @@ fi
     rm -rf $TARGET_IMG/$IMAGE_NAME.kernel
 
 # copy kernel to target dir
-  if [ "$BOOTLOADER" = "u-boot" ]; then
-    KERNEL_IMAGE="$KERNEL_UBOOT_TARGET"
-  elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
-    KERNEL_IMAGE="zImage"
-  else
-    KERNEL_IMAGE="bzImage"
-  fi
-
   if [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
     echo "injecting DeviceTreeBlobs to kernel..."
-    perl $BUILD/linux-$(kernel_version)/scripts/mkknlimg $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$IMAGE_NAME.kernel
+    perl $BUILD/linux-$(kernel_version)/scripts/mkknlimg $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET $TARGET_IMG/$IMAGE_NAME.kernel
     echo "...done"
   else
-    cp -PR $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_IMAGE $TARGET_IMG/$IMAGE_NAME.kernel
+    cp -PR $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET $TARGET_IMG/$IMAGE_NAME.kernel
   fi
   chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel