jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4803 from lrusak/aarch64

Browse Source 
linux: use KERNEL_TARGET as make target
This commit is contained in:
Stephan Raue 2016-03-02 07:44:47 +01:00
commit 79efe4e328
8 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/linux/package.mk
View File

@ -50,14 +50,6 @@ PKG_AUTORECONF="no"
PKG_MAKE_OPTS_HOST="ARCH=$TARGET_KERNEL_ARCH headers_check" 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 if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mkbootimg:host" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mkbootimg:host"
fi fi
@ -147,12 +139,12 @@ make_target() {
done done
fi fi
LDFLAGS="" make $KERNEL_IMAGE $KERNEL_MAKE_EXTRACMD LDFLAGS="" make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD
if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then 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 --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 fi
} }

4
projects/Generic/options
View File

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

4
projects/RPi/options
View File

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

4
projects/RPi2/options
View File

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

4
projects/WeTek_Core/options
View File

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

4
projects/WeTek_Play/options
View File

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

4
projects/imx6/options
View File

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

12
scripts/image
View File

@ -218,20 +218,12 @@ fi
rm -rf $TARGET_IMG/$IMAGE_NAME.kernel rm -rf $TARGET_IMG/$IMAGE_NAME.kernel
# copy kernel to target dir # 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 if [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
echo "injecting DeviceTreeBlobs to kernel..." 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" echo "...done"
else 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 fi
chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel