dany/meta-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/meta-sunxi.git synced 2024-12-26 13:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #300 from dev-0x7C6/master

Browse Source 
Bunch of tweaks.
This commit is contained in:
Marek Belisko 2020-10-23 08:16:28 +02:00 committed by GitHub
commit 4937fc91d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/layer.conf
View File

@ -14,4 +14,4 @@ LAYERVERSION_meta-sunxi = "1"
LAYERDEPENDS_meta-sunxi = "core openembedded-layer" LAYERDEPENDS_meta-sunxi = "core openembedded-layer"
LAYERSERIES_COMPAT_meta-sunxi = "zeus dunfell" LAYERSERIES_COMPAT_meta-sunxi = "zeus dunfell gatesgarth"

2
conf/machine/include/sunxi.inc
View File

@ -1,6 +1,8 @@
SOC_FAMILY ??= "" SOC_FAMILY ??= ""
include conf/machine/include/soc-family.inc include conf/machine/include/soc-family.inc
MACHINEOVERRIDES =. "sunxi:"
# Sub-architecture support # Sub-architecture support
MACHINE_SOCARCH_SUFFIX ?= "" MACHINE_SOCARCH_SUFFIX ?= ""
MACHINE_SOCARCH_SUFFIX_sun4i = "-sun4i" MACHINE_SOCARCH_SUFFIX_sun4i = "-sun4i"

2
conf/machine/include/sunxi64.inc
View File

@ -1,6 +1,8 @@
SOC_FAMILY ??= "" SOC_FAMILY ??= ""
include conf/machine/include/soc-family.inc include conf/machine/include/soc-family.inc
MACHINEOVERRIDES =. "sunxi:sunxi64:"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline" PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
PREFERRED_PROVIDER_u-boot ?= "u-boot" PREFERRED_PROVIDER_u-boot ?= "u-boot"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"

16
recipes-bsp/u-boot/u-boot_%.bbappend
View File

@ -1,9 +1,9 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS_prepend_sunxi := "${THISDIR}/files:"
DEPENDS += " bc-native dtc-native swig-native python3-native flex-native bison-native " DEPENDS_append_sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native "
DEPENDS_append_sun50i = " atf-sunxi " DEPENDS_append_sun50i = " atf-sunxi "
COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)" COMPATIBLE_MACHINE_sunxi = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
DEFAULT_PREFERENCE_sun4i="1" DEFAULT_PREFERENCE_sun4i="1"
DEFAULT_PREFERENCE_sun5i="1" DEFAULT_PREFERENCE_sun5i="1"
@ -11,19 +11,19 @@ DEFAULT_PREFERENCE_sun7i="1"
DEFAULT_PREFERENCE_sun8i="1" DEFAULT_PREFERENCE_sun8i="1"
DEFAULT_PREFERENCE_sun50i="1" DEFAULT_PREFERENCE_sun50i="1"
SRC_URI += " \ SRC_URI_append_sunxi = " \
file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \ file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
file://boot.cmd \ file://boot.cmd \
" "
UBOOT_ENV_SUFFIX = "scr" UBOOT_ENV_SUFFIX_sunxi = "scr"
UBOOT_ENV = "boot" UBOOT_ENV_sunxi = "boot"
EXTRA_OEMAKE += ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" ' EXTRA_OEMAKE_append_sunxi = ' HOSTLDSHARED="${BUILD_CC} -shared ${BUILD_LDFLAGS} ${BUILD_CFLAGS}" '
EXTRA_OEMAKE_append_sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin " EXTRA_OEMAKE_append_sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin "
do_compile_sun50i[depends] += "atf-sunxi:do_deploy" do_compile_sun50i[depends] += "atf-sunxi:do_deploy"
do_compile_append() { do_compile_append_sunxi() {
${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY} ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
} }

2
recipes-kernel/linux/linux-mainline_5.9.1.bb
View File

@ -2,6 +2,8 @@ require linux-mainline.inc
DESCRIPTION = "Mainline Stable Linux kernel" DESCRIPTION = "Mainline Stable Linux kernel"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
SRC_URI[md5sum] = "199f037b5adc4ca158dc281b60a226f6" SRC_URI[md5sum] = "199f037b5adc4ca158dc281b60a226f6"