LM
/
meta-netmodule-bsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: Use same branch for all HW and cleanup machine conf

This commit is contained in:
Alexandre Bard 2019-02-26 11:41:14 +01:00
parent 4a05c43443
commit 3dab9387cc
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/machine/am335x-nrhw16.conf
View File

@ -9,7 +9,7 @@ IMAGE_CLASSES += "image_types"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
KERNEL_DEFCONFIG ??= "nrhw16_defconfig" KERNEL_DEFCONFIG ??= "am335x-nrhw16_defconfig"
KERNEL_DEVICETREE = "am335x-nrhw16.dtb \ KERNEL_DEVICETREE = "am335x-nrhw16.dtb \
am335x-nrhw16-prod2.dtb \ am335x-nrhw16-prod2.dtb \
am335x-nrhw16-prod3.dtb \ am335x-nrhw16-prod3.dtb \
@ -22,5 +22,3 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw16-v2" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw16-v2"
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
PV_pn-linux-netmodule = "4.14.77-${SRCPV}"
SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/yoctoproject/linux-netmodule.git;protocol=ssh;user=gitea;branch=4.14/standard/nrhw16"

1
conf/machine/am335x-nrhw20.conf
View File

@ -26,3 +26,4 @@ IMAGE_BOOT_FILES = "MLO u-boot.img"
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw20-v1" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw20-v1"

3
conf/machine/armada-385-nrhw18.conf
View File

@ -24,6 +24,3 @@ module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada-385-nrhw18-v2" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada-385-nrhw18-v2"
IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18-v2.kwb" IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18-v2.kwb"
PV_pn-linux-netmodule = "4.14.77-${SRCPV}"
SRC_URI_pn-linux-netmodule ?= "git://git.netmodule.intranet/yoctoproject/linux-netmodule.git;protocol=ssh;user=gitea;branch=4.14/standard/nrhw18"

3
recipes-kernel/linux/linux-netmodule_git.bb
View File

@ -7,8 +7,7 @@ DESCRIPTION = "Linux kernel for various NetModule hardware"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
BRANCH_NAME = "${@'${MACHINE}'.split('-')[-1]}" SRC_URI = "git://git.netmodule.intranet/yoctoproject/linux-netmodule.git;protocol=ssh;user=gitea;branch=4.19/standard/all"
SRC_URI = "git://git.netmodule.intranet/yoctoproject/linux-netmodule.git;protocol=ssh;user=gitea;branch=4.19/standard/${BRANCH_NAME}"
SRCREV ?= "${AUTOREV}" SRCREV ?= "${AUTOREV}"
PV ?= "4.19.20-${SRCPV}" PV ?= "4.19.20-${SRCPV}"