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

u-boot: make only one u-boot recipe per soc 

BugzID: 74357

Signed-off-by: Patrick Zysset <patrick.zysset@netmodule.com>
This commit is contained in:
Alexandre Bard 2021-08-18 16:13:00 +02:00 committed by Patrick Zysset
parent b2bb823e3c
commit 7cdc60e983
14 changed files with 12 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/machine/am335x-hw25.conf
View File

@ -5,7 +5,7 @@
require am335x-nmhw24.conf
MACHINEOVERRIDES .= ":am335x-nmhw24"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-hw25"
UBOOT_MACHINE = "am335x_hw25_defconfig"
KERNEL_DEVICETREE = "am335x-hw25.dtb "

3
conf/machine/am335x-nmhw21.conf
View File

@ -12,7 +12,8 @@ KERNEL_DEVICETREE = "am335x-nmhw21-prod1.dtb \
KERNEL_IMAGETYPE = "zImage"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nmhw21"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti33x"
UBOOT_MACHINE = "am335x_nmhw21_defconfig"
USE_VT = "0"

3
conf/machine/am335x-nmhw24.conf
View File

@ -12,7 +12,8 @@ KERNEL_DEVICETREE = "am335x-nmhw24-prod1.dtb \
KERNEL_IMAGETYPE = "zImage"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nmhw24"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti33x"
UBOOT_MACHINE = "am335x_nrhw24_defconfig"
USE_VT = "0"

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

@ -15,7 +15,8 @@ KERNEL_DEVICETREE = "am335x-nrhw16.dtb \
"
KERNEL_IMAGETYPE = "zImage"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw16-v2"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti33x"
UBOOT_MACHINE = "am335x_nbhw16_v2_defconfig"
USE_VT = "0"

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

@ -11,7 +11,8 @@ KERNEL_DEVICETREE = "am335x-nrhw20-prod1.dtb \
"
KERNEL_IMAGETYPE = "zImage"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw20-v1"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti33x"
UBOOT_MACHINE = "am335x_nrhw20_defconfig"
USE_VT = "0"

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

@ -14,7 +14,8 @@ KERNEL_IMAGETYPE = "zImage"
KERNEL_MODULE_PROBECONF += "ath10k_pci"
module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada-385-nrhw18-v2"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada"
UBOOT_MACHINE = "armada-385-nrhw18-v2_defconfig"
IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18-v2.kwb"
DEFAULT_ETH = "eth2"

5
recipes-bsp/u-boot/u-boot-am335x-hw25_git.bb
View File

@ -1,5 +0,0 @@
require u-boot-am335x-nmhw24_git.bb
UBOOT_MACHINE = "am335x_hw25_defconfig"

32
recipes-bsp/u-boot/u-boot-am335x-nmhw21_git.bb
View File

@ -1,32 +0,0 @@
require u-boot-nm.inc
# Force machine configuration for this recipe
UBOOT_MACHINE = "am335x_nmhw21_defconfig"
# Be aware github/netmodule git
SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule"
# Should be updated when a new U-Boot Version is available
SRCREV ?= "${AUTOREV}"
PV = "v2016.05+git${SRCPV}"
SPL_BINARY = "MLO"
UBOOT_SUFFIX = "img"
do_deploy_append() {
rm -f ${DEPLOYDIR}/*${PN}.xmodem.bin
rm -f ${DEPLOYDIR}/*${PN}.${UBOOT_SUFFIX}
cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
}
# nmhw21 and hw26 using same u-boot sources so let's create symlinks for hw26 when building nmhw21
PN_E = "u-boot-${MACHINE}"
do_deploy_append_am335x-hw26() {
cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN_E}.xmodem.bin
cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN_E}.xmodem.bin
cp ${S}/u-boot.img ${DEPLOYDIR}/${PN_E}.${UBOOT_SUFFIX}
cp ${S}/MLO ${DEPLOYDIR}/spl-${PN_E}.${UBOOT_SUFFIX}
}

24
recipes-bsp/u-boot/u-boot-am335x-nmhw24_git.bb
View File

@ -1,24 +0,0 @@
require u-boot-nm.inc
# Force machine configuration for this recipe
UBOOT_MACHINE = "am335x_nrhw24_defconfig"
# Be aware github/netmodule git
SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule"
# Should be updated when a new U-Boot Version is available
SRCREV ?= "${AUTOREV}"
PV = "v2016.05+git${SRCPV}"
SPL_BINARY = "MLO"
UBOOT_SUFFIX = "img"
do_deploy_append() {
rm -f ${DEPLOYDIR}/*${PN}.xmodem.bin
rm -f ${DEPLOYDIR}/*${PN}.${UBOOT_SUFFIX}
cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
}

7
recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
View File

@ -1,7 +0,0 @@
require u-boot-am335x-nrhw16-common.inc
# Force machine configuration for this recipe
UBOOT_MACHINE = "am335x_nbhw16_defconfig"
# Should be updated when a new U-Boot Version is available
SRCREV ?= "a6f157c6dbd048b452c7e2640215c55be658780c"

7
recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
View File

@ -1,7 +0,0 @@
require u-boot-am335x-nrhw16-common.inc
# Force machine configuration for this recipe
UBOOT_MACHINE = "am335x_nbhw16_v2_defconfig"
SRCREV ?= "${AUTOREV}"

24
recipes-bsp/u-boot/u-boot-am335x-nrhw20-v1_git.bb
View File

@ -1,24 +0,0 @@
require u-boot-nm.inc
# Force machine configuration for this recipe
UBOOT_MACHINE = "am335x_nrhw20_defconfig"
# Be aware github/netmodule git
SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule"
# Should be updated when a new U-Boot Version is available
SRCREV ?= "${AUTOREV}"
PV = "v2016.05+git${SRCPV}"
SPL_BINARY = "MLO"
UBOOT_SUFFIX = "img"
do_deploy_append() {
rm -f ${DEPLOYDIR}/*${PN}.xmodem.bin
rm -f ${DEPLOYDIR}/*${PN}.${UBOOT_SUFFIX}
cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
}

3
recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb → recipes-bsp/u-boot/u-boot-armada_git.bb
View File

@ -1,8 +1,5 @@
require u-boot-nm.inc
# Force machine configuration for this recipe
UBOOT_MACHINE = "armada-385-nrhw18-v2_defconfig"
# Be aware github/netmodule git
SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2017.11-armada-nrhw"

3
recipes-bsp/u-boot/u-boot-am335x-nrhw16-common.inc → recipes-bsp/u-boot/u-boot-ti33x_git.bb
View File

@ -1,10 +1,10 @@
require u-boot-nm.inc
# Be aware github/netmodule git
SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule"
# Should be updated when a new U-Boot Version is available
SRCREV ?= "${AUTOREV}"
PV = "v2016.05+git${SRCPV}"
SPL_BINARY = "MLO"
@ -18,4 +18,3 @@ do_deploy_append() {
cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
}