Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2022-12-05 10:01:26 +01:00
commit 6ca0edcb5f
585 changed files with 2859 additions and 4505 deletions

View File

@ -144,6 +144,16 @@ endif
###############################################################################
comment "Legacy options removed in 2023.02"
config BR2_PACKAGE_USBREDIR_SERVER
bool "usbredirserver removed"
select BR2_LEGACY
help
usbredirserver has been dropped by upstream since version
0.13.0. usbredir tools (which include usbredirect binary) can
be used as a replacement.
comment "Legacy options removed in 2022.11"
config BR2_PACKAGE_RABBITMQ_SERVER

View File

@ -519,6 +519,9 @@ F: package/alsa-plugins/
N: Changming Huang <jerry.huang@nxp.com>
F: package/qoriq-cadence-dp-firmware/
N: Chris Dimich <chris.dimich@boundarydevices.com>
F: package/freescale-imx/imx-vpu-hantro-daemon/
N: Chris Packham <judge.packham@gmail.com>
F: package/coremark/
F: package/coremark-pro/
@ -681,6 +684,7 @@ F: package/luaexpat/
F: package/xinetd/
N: Dario Binacchi <dario.binacchi@amarulasolutions.com>
F: package/sscep/
F: package/uuu/
N: Dario Binacchi <dariobin@libero.it>
@ -1394,6 +1398,7 @@ F: package/rtl8192eu/
F: package/serd/
F: package/sord/
F: package/sratom/
F: package/stb/
F: package/zchunk/
F: support/testing/tests/package/sample_python_rtoml.py
F: support/testing/tests/package/test_python_rtoml.py
@ -1672,6 +1677,7 @@ F: package/python-gnupg/
F: package/python-pyalsa/
F: package/riscv-isa-sim/
F: package/tinycompress/
F: package/z3/
F: package/zynaddsubfx/
F: support/testing/tests/package/sample_python_distro.py
F: support/testing/tests/package/sample_python_gnupg.py
@ -1683,6 +1689,7 @@ F: support/testing/tests/package/test_ola/
F: support/testing/tests/package/test_python_distro.py
F: support/testing/tests/package/test_python_gnupg.py
F: support/testing/tests/package/test_python_pyalsa.py
F: support/testing/tests/package/test_z3.py
N: Julien Viard de Galbert <julien@vdg.name>
F: package/dieharder/
@ -2144,14 +2151,17 @@ F: package/pkg-qmake.mk
F: package/qt5/qt5opcua/
N: Neal Frager <neal.frager@amd.com>
F: board/versal/
F: board/zynq/
F: board/zynqmp/
F: board/zynqmp/kria/
F: configs/versal_vck190_defconfig
F: configs/zynq_zc706_defconfig
F: configs/zynqmp_zcu102_defconfig
F: configs/zynqmp_zcu106_defconfig
F: configs/zynqmp_kria_kv260_defconfig
F: package/bootgen/
F: package/versal-firmware/
N: Nicola Di Lieto <nicola.dilieto@gmail.com>
F: package/uacme/
@ -2940,6 +2950,7 @@ F: package/utp_com/
N: Vincent Stehlé <vincent.stehle@arm.com>
F: board/qemu/aarch64-ebbr/
F: configs/qemu_aarch64_ebbr_defconfig
F: package/edk2-non-osi/
N: Vincent Stehlé <vincent.stehle@laposte.net>
F: board/bananapi/bananapi-m2-zero/

View File

@ -396,6 +396,9 @@ unexport DESTDIR
# Causes breakage with packages that needs host-ruby
unexport RUBYOPT
# Compilation of perl-related packages will fail otherwise
unexport PERL_MM_OPT
include package/pkg-utils.mk
include package/doc-asciidoc.mk

View File

@ -1,274 +0,0 @@
/dts-v1/;
/ {
#address-cells = <2>;
#size-cells = <2>;
compatible = "andestech,ae350";
model = "andestech,ax45";
aliases {
uart0 = &serial0;
spi0 = &spi;
};
chosen {
bootargs = "console=ttyS0,38400n8 earlycon=sbi debug loglevel=7";
stdout-path = "uart0:38400n8";
};
cpus {
#address-cells = <1>;
#size-cells = <0>;
timebase-frequency = <60000000>;
CPU0: cpu@0 {
device_type = "cpu";
reg = <0>;
status = "okay";
compatible = "riscv";
riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0";
riscv,priv-major = <1>;
riscv,priv-minor = <10>;
mmu-type = "riscv,sv48";
clock-frequency = <60000000>;
i-cache-size = <0x8000>;
i-cache-sets = <256>;
i-cache-block-size = <64>;
i-cache-line-size = <64>;
d-cache-size = <0x8000>;
d-cache-sets = <128>;
d-cache-block-size = <64>;
d-cache-line-size = <64>;
next-level-cache = <&L2>;
CPU0_intc: interrupt-controller {
#interrupt-cells = <1>;
interrupt-controller;
compatible = "riscv,cpu-intc";
};
};
CPU1: cpu@1 {
device_type = "cpu";
reg = <1>;
status = "okay";
compatible = "riscv";
riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0";
riscv,priv-major = <1>;
riscv,priv-minor = <10>;
mmu-type = "riscv,sv48";
clock-frequency = <60000000>;
i-cache-size = <0x8000>;
i-cache-sets = <256>;
i-cache-block-size = <64>;
i-cache-line-size = <64>;
d-cache-size = <0x8000>;
d-cache-sets = <128>;
d-cache-block-size = <64>;
d-cache-line-size = <64>;
next-level-cache = <&L2>;
CPU1_intc: interrupt-controller {
#interrupt-cells = <1>;
interrupt-controller;
compatible = "riscv,cpu-intc";
};
};
CPU2: cpu@2 {
device_type = "cpu";
reg = <2>;
status = "okay";
compatible = "riscv";
riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0";
riscv,priv-major = <1>;
riscv,priv-minor = <10>;
mmu-type = "riscv,sv48";
clock-frequency = <60000000>;
i-cache-size = <0x8000>;
i-cache-sets = <256>;
i-cache-block-size = <64>;
i-cache-line-size = <64>;
d-cache-size = <0x8000>;
d-cache-sets = <128>;
d-cache-block-size = <64>;
d-cache-line-size = <64>;
next-level-cache = <&L2>;
CPU2_intc: interrupt-controller {
#interrupt-cells = <1>;
interrupt-controller;
compatible = "riscv,cpu-intc";
};
};
CPU3: cpu@3 {
device_type = "cpu";
reg = <3>;
status = "okay";
compatible = "riscv";
riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0";
riscv,priv-major = <1>;
riscv,priv-minor = <10>;
mmu-type = "riscv,sv48";
clock-frequency = <60000000>;
i-cache-size = <0x8000>;
i-cache-sets = <256>;
i-cache-block-size = <64>;
i-cache-line-size = <64>;
d-cache-size = <0x8000>;
d-cache-sets = <128>;
d-cache-block-size = <64>;
d-cache-line-size = <64>;
next-level-cache = <&L2>;
CPU3_intc: interrupt-controller {
#interrupt-cells = <1>;
interrupt-controller;
compatible = "riscv,cpu-intc";
};
};
};
L2: l2-cache@e0500000 {
compatible = "cache";
cache-level = <2>;
cache-size = <0x80000>;
reg = <0x00000000 0xe0500000 0x00000000 0x00001000>;
andes,inst-prefetch = <3>;
andes,data-prefetch = <3>;
// The value format is <XRAMOCTL XRAMICTL>
andes,tag-ram-ctl = <0 0>;
andes,data-ram-ctl = <0 0>;
};
memory@0 {
reg = <0x00000000 0x00000000 0x00000000 0x80000000>;
device_type = "memory";
};
soc {
#address-cells = <2>;
#size-cells = <2>;
compatible = "andestech,riscv-ae350-soc", "simple-bus";
ranges;
plic0: interrupt-controller@e4000000 {
compatible = "riscv,plic0";
reg = <0x00000000 0xe4000000 0x00000000 0x02000000>;
interrupts-extended = < &CPU0_intc 11 &CPU0_intc 9 &CPU1_intc 11 &CPU1_intc 9 &CPU2_intc 11 &CPU2_intc 9 &CPU3_intc 11 &CPU3_intc 9>;
interrupt-controller;
#address-cells = <2>;
#interrupt-cells = <2>;
riscv,ndev = <71>;
};
plic1: interrupt-controller@e6400000 {
compatible = "riscv,plic1";
reg = <0x00000000 0xe6400000 0x00000000 0x00400000>;
interrupts-extended = < &CPU0_intc 3 &CPU1_intc 3 &CPU2_intc 3 &CPU3_intc 3>;
interrupt-controller;
#address-cells = <2>;
#interrupt-cells = <2>;
riscv,ndev = <4>;
};
plmt0: plmt0@e6000000 {
compatible = "riscv,plmt0";
reg = <0x00000000 0xe6000000 0x00000000 0x00100000>;
interrupts-extended = < &CPU0_intc 7 &CPU1_intc 7 &CPU2_intc 7 &CPU3_intc 7>;
};
spiclk: virt_100mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <100000000>;
};
timer0: timer@f0400000 {
compatible = "andestech,atcpit100";
reg = <0x00000000 0xf0400000 0x00000000 0x00001000>;
interrupts = <3 4>;
interrupt-parent = <&plic0>;
clock-frequency = <60000000>;
};
pwm: pwm@f0400000 {
compatible = "andestech,atcpit100-pwm";
reg = <0x00000000 0xf0400000 0x00000000 0x00001000>;
interrupts = <3 4>;
interrupt-parent = <&plic0>;
clock-frequency = <60000000>;
pwm-cells = <2>;
};
wdt: wdt@f0500000 {
compatible = "andestech,atcwdt200";
reg = <0x00000000 0xf0500000 0x00000000 0x00001000>;
interrupts = <3 4>;
interrupt-parent = <&plic0>;
clock-frequency = <15000000>;
};
serial0: serial@f0300000 {
compatible = "andestech,uart16550", "ns16550a";
reg = <0x00000000 0xf0300000 0x00000000 0x00001000>;
interrupts = <9 4>;
interrupt-parent = <&plic0>;
clock-frequency = <19660800>;
reg-shift = <2>;
reg-offset = <32>;
no-loopback-test = <1>;
};
rtc0: rtc@f0600000 {
compatible = "andestech,atcrtc100";
reg = <0x00000000 0xf0600000 0x00000000 0x00001000>;
interrupts = <1 4 2 4>;
interrupt-parent = <&plic0>;
wakeup-source;
};
gpio: gpio@f0700000 {
compatible = "andestech,atcgpio100";
reg = <0x00000000 0xf0700000 0x00000000 0x00001000>;
interrupts = <7 4>;
interrupt-parent = <&plic0>;
wakeup-source;
};
mac0: mac@e0100000 {
compatible = "andestech,atmac100";
reg = <0x00000000 0xe0100000 0x00000000 0x00001000>;
interrupts = <19 4>;
interrupt-parent = <&plic0>;
dma-coherent;
};
smu: smu@f0100000 {
compatible = "andestech,atcsmu";
reg = <0x00000000 0xf0100000 0x00000000 0x00001000>;
};
mmc0: mmc@f0e00000 {
compatible = "andestech,atfsdc010";
reg = <0x00000000 0xf0e00000 0x00000000 0x00001000>;
interrupts = <18 4>;
interrupt-parent = <&plic0>;
clock-freq-min-max = <400000 100000000>;
max-frequency = <100000000>;
fifo-depth = <16>;
cap-sd-highspeed;
dma-coherent;
};
dma0: dma@f0c00000 {
compatible = "andestech,atcdmac300";
reg = <0x00000000 0xf0c00000 0x00000000 0x00001000>;
interrupts = <10 4 64 4 65 4 66 4 67 4 68 4 69 4 70 4 71 4>;
interrupt-parent = <&plic0>;
dma-channels = <8>;
};
lcd0: lcd@e0200000 {
compatible = "andestech,atflcdc100";
reg = <0x00000000 0xe0200000 0x00000000 0x00001000>;
interrupts = <20 4>;
interrupt-parent = <&plic0>;
dma-coherent;
};
pmu: pmu {
compatible = "riscv,andes-pmu";
device_type = "pmu";
};
spi: spi@f0b00000 {
compatible = "andestech,atcspi200";
reg = <0x00000000 0xf0b00000 0x00000000 0x00001000>;
interrupts = <4 4>;
interrupt-parent = <&plic0>;
#address-cells = <1>;
#size-cells = <0>;
num-cs = <1>;
clocks = <&spiclk>;
flash@0 {
compatible = "jedec,spi-nor";
reg = <0x00000000>;
spi-max-frequency = <50000000>;
spi-cpol;
spi-cpha;
};
};
};
};

View File

@ -3,7 +3,7 @@ image boot.vfat {
files = {
"u-boot-spl.bin",
"u-boot.itb",
"ae350.dtb",
"ae350_ax45mp.dtb",
}
}
size = 2M

View File

@ -1,29 +0,0 @@
From 3ccb71eeca42dbcd5e4d00ae1877a489ae82598d Mon Sep 17 00:00:00 2001
From: Yu Chien Peter Lin <peterlin@andestech.com>
Date: Wed, 29 Dec 2021 16:04:54 +0800
Subject: [PATCH] Disable PIC explicitly for assembling
This patch is necessary if the fw_dynamic load address
is not equal to link address.
However, they are equal currently, since we include an u-boot
patch for preventing fw_dynamic relocation.
Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index d6f097d..441518d 100644
--- a/Makefile
+++ b/Makefile
@@ -225,6 +225,7 @@ ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
ASFLAGS += $(GENFLAGS)
ASFLAGS += $(platform-asflags-y)
ASFLAGS += $(firmware-asflags-y)
+ASFLAGS += -fno-pic
ARFLAGS = rcs
--
2.25.1

View File

@ -1,25 +0,0 @@
From 325328f4204b40b1fcc8db3b46c7c8805710d21c Mon Sep 17 00:00:00 2001
From: Yu Chien Peter Lin <peterlin@andestech.com>
Date: Thu, 30 Dec 2021 08:47:34 +0800
Subject: [PATCH] Enable cache for opensbi jump mode
Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
---
firmware/fw_base.S | 2 ++
1 file changed, 2 insertions(+)
diff --git a/firmware/fw_base.S b/firmware/fw_base.S
index ab33e11..155d230 100644
--- a/firmware/fw_base.S
+++ b/firmware/fw_base.S
@@ -46,6 +46,8 @@
.globl _start
.globl _start_warm
_start:
+ li t0, 0x80003
+ csrw 0x7ca, t0
/* Find preferred boot HART id */
MOV_3R s0, a0, s1, a1, s2, a2
call fw_boot_hart
--
2.25.1

View File

@ -1,27 +0,0 @@
From ea4675215b53d16a72d29b8a6fc6a86cccf59cf0 Mon Sep 17 00:00:00 2001
From: Yu Chien Peter Lin <peterlin@andestech.com>
Date: Wed, 5 Jan 2022 11:00:59 +0800
Subject: [PATCH] Fix mmc no partition table error
Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
---
drivers/mmc/ftsdc010_mci.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index 570d54cf..3b1e0aa0 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -438,10 +438,6 @@ static int ftsdc010_mmc_probe(struct udevice *dev)
return ret;
#endif
- if (dev_read_bool(dev, "cap-mmc-highspeed") || \
- dev_read_bool(dev, "cap-sd-highspeed"))
- chip->caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz;
-
ftsdc_setup_cfg(&plat->cfg, dev->name, chip->buswidth, chip->caps,
priv->minmax[1] , priv->minmax[0]);
chip->mmc = &plat->mmc;
--
2.25.1

View File

@ -0,0 +1,38 @@
From 16aad5594e08550295ea3c12c1c9ed6f64774748 Mon Sep 17 00:00:00 2001
From: Rick Chen <rick@andestech.com>
Date: Tue, 29 Mar 2022 13:41:10 +0800
Subject: [PATCH] mmc: ftsdc010_mci: Support DTS of ftsdc010 driver for
generic dma
The ftsdc010 driver has been implemented for generic dma in Linux
kernel. And its compatible is andestech,atfsdc010g to distinguish
the legacy andestech,atfsdc010 which is not for generic dma.
Althought the ftsdc010_mci driver in U-Boot does not use dma, but
it still can work well with the mmc node for generic dma. So add
the compatible string to support it.
Signed-off-by: Rick Chen <rick@andestech.com>
Upstream-Status: Pending
Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
---
drivers/mmc/ftsdc010_mci.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
index 570d54cf9d..65b1d447a8 100644
--- a/drivers/mmc/ftsdc010_mci.c
+++ b/drivers/mmc/ftsdc010_mci.c
@@ -460,6 +460,7 @@ int ftsdc010_mmc_bind(struct udevice *dev)
static const struct udevice_id ftsdc010_mmc_ids[] = {
{ .compatible = "andestech,atfsdc010" },
+ { .compatible = "andestech,atfsdc010g" },
{ }
};
--
2.34.1

View File

@ -1,27 +0,0 @@
From 4c0c5378d032f2f95577585935624baf7b4decf3 Mon Sep 17 00:00:00 2001
From: Yu Chien Peter Lin <peterlin@andestech.com>
Date: Wed, 5 Jan 2022 11:02:26 +0800
Subject: [PATCH] Prevent fw_dynamic from relocation
This patch prevents OpenSBI relocation, load fw_dynamic to link address
Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
---
board/AndesTech/ax25-ae350/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig
index e50f505a..385c4c11 100644
--- a/board/AndesTech/ax25-ae350/Kconfig
+++ b/board/AndesTech/ax25-ae350/Kconfig
@@ -25,7 +25,7 @@ config SPL_TEXT_BASE
default 0x800000
config SPL_OPENSBI_LOAD_ADDR
- default 0x01000000
+ default 0x0
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
--
2.25.1

View File

@ -0,0 +1,42 @@
From 933ad8a59f7fd9b2088badc3e97167d750a40b5a Mon Sep 17 00:00:00 2001
From: Bin Meng <bmeng.cn@gmail.com>
Date: Mon, 12 Jul 2021 11:52:31 +0800
Subject: [PATCH] spl: Align device tree blob address at 8-byte boundary
Since libfdt v1.6.1, a new requirement on the device tree address via:
commit 5e735860c478 ("libfdt: Check for 8-byte address alignment in fdt_ro_probe_()")
must be met that the device tree must be loaded in to memory at an
8-byte aligned address.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This patch was imported from U-boot patchwork:
https://patchwork.ozlabs.org/project/uboot/patch/20210712035231.26475-1-bmeng.cn@gmail.com/
Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
---
common/spl/spl_fit.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index a35be529..a76ad14a 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -382,6 +382,12 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
*/
image_info.load_addr = spl_image->load_addr + spl_image->size;
+ /*
+ * Since libfdt v1.6.1, the device tree must be loaded in to memory
+ * at an 8-byte aligned address.
+ */
+ image_info.load_addr = roundup(image_info.load_addr, 8);
+
/* Figure out which device tree the board wants to use */
node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index++);
if (node < 0) {
--
2.34.1

View File

@ -1,26 +0,0 @@
From 3d09501175ae6f5e3f6520b48b1358226a99ff16 Mon Sep 17 00:00:00 2001
From: Yu Chien Peter Lin <peterlin@andestech.com>
Date: Wed, 5 Jan 2022 18:17:39 +0800
Subject: [PATCH] Fix u-boot proper booting issue
Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
---
arch/riscv/cpu/start.S | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S
index 76850ec9..2ccda4f5 100644
--- a/arch/riscv/cpu/start.S
+++ b/arch/riscv/cpu/start.S
@@ -139,7 +139,9 @@ call_harts_early_init:
* accesses gd).
*/
mv gp, s0
+#if !CONFIG_IS_ENABLED(RISCV_SMODE)
bnez tp, secondary_hart_loop
+#endif
#endif
jal board_init_f_init_reserve
--
2.25.1

View File

@ -1,25 +0,0 @@
From 3847a959ac4c07facbd80104ca5fa6a91fad5f35 Mon Sep 17 00:00:00 2001
From: Yu Chien Peter Lin <peterlin@andestech.com>
Date: Thu, 6 Jan 2022 13:50:07 +0800
Subject: [PATCH] Enable printing OpenSBI boot logo
Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
---
include/opensbi.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/opensbi.h b/include/opensbi.h
index d812cc8c..91fb8fd9 100644
--- a/include/opensbi.h
+++ b/include/opensbi.h
@@ -20,7 +20,7 @@
enum sbi_scratch_options {
/** Disable prints during boot */
- SBI_SCRATCH_NO_BOOT_PRINTS = (1 << 0),
+ SBI_SCRATCH_NO_BOOT_PRINTS = 0,
};
/** Representation dynamic info passed by previous booting stage */
--
2.25.1

View File

@ -1,3 +1,3 @@
#!/bin/sh
cp $BINARIES_DIR/Image $TARGET_DIR/boot
cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot
cp $BINARIES_DIR/ae350_ax45mp.dtb $TARGET_DIR/boot

View File

@ -30,12 +30,10 @@ Result of the build
After building, you should obtain the following files:
output/images/
|-- ae350.dtb
|-- ae350_ax45mp.dtb
|-- boot.vfat
|-- fw_dynamic.bin
|-- fw_dynamic.elf
|-- fw_jump.bin
|-- fw_jump.elf
|-- Image
|-- rootfs.ext2
|-- rootfs.ext4 -> rootfs.ext2

View File

@ -1,4 +1,4 @@
label linux
kernel /boot/Image
fdt /boot/ae350.dtb
fdt /boot/ae350_ax45mp.dtb
append earlycon=sbi root=/dev/mmcblk0p2 rootwait

View File

@ -1,5 +1,7 @@
CONFIG_SPL_FS_FAT=y
CONFIG_SPL_MMC=y
# CONFIG_SPL_RAM_SUPPORT is not set
# CONFIG_OF_BOARD is not set
CONFIG_OF_SEPARATE=y
CONFIG_SPL_OPENSBI_LOAD_ADDR=0x0
CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0
CONFIG_DISPLAY_CPUINFO=y
CONFIG_DISPLAY_BOARDINFO=y

View File

@ -8,6 +8,16 @@ for more details about the board and the QorIQ Layerscape SoC, see the following
- https://www.nxp.com/design/qoriq-developer-resources/layerscape-ls1028a-reference-design-board:LS1028ARDB
- https://www.nxp.com/LS1028A
for the software NXP LSDK (Layerscape Software Development Kit), see
- https://www.nxp.com/docs/en/user-guide/LSDKUG_Rev21.08.pdf
the components from NXP are:
- rcw, LSDK 21.08
- atf (fork), LSDK 21.08
- uboot (fork), LSDK 21.08
- cadence-dp-firmware (blob), LSDK 20.12
- linux (fork), LSDK 21.08
Build
=====
@ -58,3 +68,20 @@ To boot your newly created system:
- put a DB9F cable into the UART1 Port and connect using a terminal
emulator at 115200 bps, 8n1;
- power on the board.
The Cadence DP (Display Port) firmware must loaded from uboot with the following commands:
=> ext2load mmc 0 0x80000000 /boot/ls1028a-dp-fw.bin
102464 bytes read in 24 ms (4.1 MiB/s)
=> hdp load 0x80000000 0x2000
Loading hdp firmware from 0x0000000080000000 offset 0x0000000000002000
Loading hdp firmware Complete
=> boot
The interfaces of Ethernet switch (Felix DSA) are bring up with the following commands:
ip link set eno2 up
ip link set swp0 up
ip link set swp1 up
ip link set swp2 up
ip link set swp3 up

View File

@ -1,4 +1,4 @@
label ls1028ardb-buildroot
kernel /boot/Image
devicetree /boot/fsl-ls1028a-rdb.dtb
append root=/dev/mmcblk0p1 rootwait
append root=/dev/mmcblk0p1 rootwait video=1920x1080-32@60 cma=256M

30
board/versal/genimage.cfg Normal file
View File

@ -0,0 +1,30 @@
image boot.vfat {
vfat {
files = {
"boot.bin",
"system.dtb",
"Image"
}
file extlinux/extlinux.conf {
image = extlinux.conf
}
}
size = 32M
}
image sdcard.img {
hdimage {
}
partition boot {
partition-type = 0xC
bootable = "true"
image = "boot.vfat"
}
partition rootfs {
partition-type = 0x83
image = "rootfs.ext4"
}
}

16
board/versal/post-build.sh Executable file
View File

@ -0,0 +1,16 @@
#!/bin/sh
# genimage will need to find the extlinux.conf
# in the binaries directory
BOARD_DIR="$(dirname $0)"
CONSOLE=$2
ROOT=$3
mkdir -p "${BINARIES_DIR}"
cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
label linux
kernel /Image
devicetree /system.dtb
append console=${CONSOLE} clk_ignore_unused root=/dev/${ROOT} rw rootwait
__HEADER_EOF

35
board/versal/post-image.sh Executable file
View File

@ -0,0 +1,35 @@
#!/bin/sh
# By default U-Boot loads DTB from a file named "system.dtb", so
# let's use a symlink with that name that points to the *first*
# devicetree listed in the config.
FIRST_DT=$(sed -nr \
-e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \
${BR2_CONFIG})
[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb
BOARD_DIR="$(dirname $0)"
BOARD_NAME=$4
mkdir -p "${BINARIES_DIR}"
cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif"
the_ROM_image:
{
image {
{ type=bootimage, file=${BINARIES_DIR}/${BOARD_NAME}_vpl_gen_fixed.pdi }
{ type=bootloader, file=${BINARIES_DIR}/${BOARD_NAME}_plm.elf }
{ core=psm, file=${BINARIES_DIR}/${BOARD_NAME}_psmfw.elf }
}
image {
id = 0x1c000000, name=apu_subsystem
{ type=raw, load=0x00001000, file=${BINARIES_DIR}/system.dtb }
{ core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf }
{ core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf }
}
}
__HEADER_EOF
${HOST_DIR}/bin/bootgen -arch versal -image ${BINARIES_DIR}/bootgen.bif -o ${BINARIES_DIR}/boot.bin -w on
support/scripts/genimage.sh -c ${BOARD_DIR}/genimage.cfg

54
board/versal/readme.txt Normal file
View File

@ -0,0 +1,54 @@
******************************************
Xilinx VCK190 board - Versal
******************************************
This document describes the Buildroot support for the VCK190
board by Xilinx, based on Versal. It has been tested with the
VCK190 production board.
Evaluation board features can be found here with the link below.
VCK190:
https://www.xilinx.com/products/boards-and-kits/vck190.html
How to build it
===============
Configure Buildroot:
$ make versal_vck190_defconfig
Compile everything and build the rootfs image:
$ make
Result of the build
-------------------
After building, you should get a tree like this:
output/images/
+-- boot.bin
+-- boot.vfat
+-- Image
+-- rootfs.ext2
+-- rootfs.ext4 -> rootfs.ext2
+-- sdcard.img
+-- system.dtb -> versal-vck190-rev1.1.dtb
`-- versal-vck190-rev1.1.dtb
How to write the SD card
========================
WARNING! This will destroy all the card content. Use with care!
The sdcard.img file is a complete bootable image ready to be written
on the boot medium. To install it, simply copy the image to an SD
card:
# dd if=output/images/sdcard.img of=/dev/sdX
Where 'sdX' is the device node of the SD.
Eject the SD card, insert it in the board, and power it up.

View File

@ -1 +0,0 @@
CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"

View File

@ -1 +0,0 @@
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"

View File

@ -1 +0,0 @@
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"

View File

@ -1,4 +1,3 @@
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-smk-k26-revA"
CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000
CONFIG_DTB_RESELECT=y
CONFIG_DMA=y

View File

@ -1,48 +0,0 @@
From 59aa67f7a4d8efc564b46fe467aaf6eccec17183 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 20 Dec 2021 22:32:38 +0800
Subject: [PATCH] MdeModulePkg/UsbBusDxe: fix NOOPT build error
gcc-11 (fedora 35):
/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c: In function ?UsbIoBulkTransfer?:
/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c:277:12: error: ?UsbHcBulkTransfer? accessing 80 bytes in a region of size 8 [-Werror=stringop-overflow=]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
(cherry picked from commit ae8272ef787d80950803c521a13a308651bdc62e)
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 2 +-
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index 7529e03e85..b2ce97ca37 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -285,7 +285,7 @@ UsbHcBulkTransfer (
IN UINT8 DevSpeed,
IN UINTN MaxPacket,
IN UINT8 BufferNum,
- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
+ IN OUT VOID *Data[],
IN OUT UINTN *DataLength,
IN OUT UINT8 *DataToggle,
IN UINTN TimeOut,
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
index 1d2b8a6174..1316a5981f 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
@@ -149,7 +149,7 @@ UsbHcBulkTransfer (
IN UINT8 DevSpeed,
IN UINTN MaxPacket,
IN UINT8 BufferNum,
- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
+ IN OUT VOID *Data[],
IN OUT UINTN *DataLength,
IN OUT UINT8 *DataToggle,
IN UINTN TimeOut,
--
2.35.3

View File

@ -88,6 +88,7 @@ config BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN
bool "SolidRun MacchiatoBin"
depends on BR2_aarch64
depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE
select BR2_PACKAGE_EDK2_NON_OSI
select BR2_PACKAGE_HOST_DTC
select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP
help

View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 04791c13b414a6d1877182a6d565cb762c30aa63e49bb4d495fca68ef4dd209d edk2-edk2-stable202102-br1.tar.gz
sha256 c10520f269557d566e35fe8104141aa2865f9085ad2b3a30aae8a7e78a3ca5aa edk2-edk2-stable202208-br1.tar.gz
sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt

View File

@ -4,7 +4,7 @@
#
################################################################################
EDK2_VERSION = edk2-stable202102
EDK2_VERSION = edk2-stable202208
EDK2_SITE = https://github.com/tianocore/edk2
EDK2_SITE_METHOD = git
EDK2_LICENSE = BSD-2-Clause-Patent
@ -47,7 +47,7 @@ endif
EDK2_GIT_SUBMODULES = YES
EDK2_BUILD_PACKAGES = $(@D)/Build/Buildroot
EDK2_PACKAGES_PATH = $(@D):$(EDK2_BUILD_PACKAGES):$(STAGING_DIR)/usr/share/edk2-platforms
EDK2_PACKAGES_PATHS = $(@D) $(EDK2_BUILD_PACKAGES) $(STAGING_DIR)/usr/share/edk2-platforms
ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_I386),y)
EDK2_ARCH = IA32
@ -108,12 +108,13 @@ endef
else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN),y)
EDK2_ARCH = AARCH64
EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware
EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware edk2-non-osi
EDK2_PACKAGE_NAME = Platform/SolidRun/Armada80x0McBin
EDK2_PLATFORM_NAME = Armada80x0McBin
EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH)
EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/
EDK2_BUILD_OPTS += -D INCLUDE_TFTP_COMMAND
EDK2_PACKAGES_PATHS += $(STAGING_DIR)/usr/share/edk2-non-osi
else ifeq ($(BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA),y)
EDK2_ARCH = AARCH64
@ -134,6 +135,8 @@ EDK2_BASETOOLS_OPTS = \
EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
EXTRA_OPTFLAGS="$(HOST_CPPFLAGS)"
EDK2_PACKAGES_PATH = $(subst $(space),:,$(strip $(EDK2_PACKAGES_PATHS)))
EDK2_BUILD_ENV += \
WORKSPACE=$(@D) \
PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \

View File

@ -277,7 +277,19 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_BIN
bool "u-boot-nand.bin"
config BR2_TARGET_UBOOT_FORMAT_ELF
bool "u-boot"
help
Install the u-boot image, which is directly the ELF binary
for the main U-Boot, potentially with debugging symbols.
config BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF
bool "u-boot.elf"
help
Install the u-boot.elf image, which is produced when
CONFIG_REMAKE_ELF=y. It is an ELF image (u-boot.elf)
produced from the raw U-Boot binary (u-boot.bin), which may
already have been statically relocated and may already have
a device-tree appended to it.
config BR2_TARGET_UBOOT_FORMAT_IMG
bool "u-boot.img"

View File

@ -60,6 +60,10 @@ UBOOT_MAKE_TARGET += mdbtrick
endif
endif
ifeq ($(BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF),y)
UBOOT_BINS += u-boot.elf
endif
# Call 'make all' unconditionally
UBOOT_MAKE_TARGET += all

View File

@ -4,32 +4,33 @@ BR2_RISCV_ISA_CUSTOM_RVM=y
BR2_RISCV_ISA_CUSTOM_RVF=y
BR2_RISCV_ISA_CUSTOM_RVD=y
BR2_RISCV_ISA_CUSTOM_RVC=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y
BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
BR2_ROOTFS_OVERLAY="board/andes/ae350/rootfs_overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/andes/ae350/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/andes/ae350/genimage_sdcard.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/andestech/linux.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10.84-ae350_45"
BR2_LINUX_KERNEL_DEFCONFIG="ae350_rv64_smp"
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,andestech,linux,v6.0.y_ae350-ax45mp)/linux-v6.0.y_ae350-ax45mp.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="ae350_ax45mp"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/andes/ae350/ae350.dts"
BR2_LINUX_KERNEL_INTREE_DTS_NAME="andes/ae350_ax45mp"
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_OPENSBI=y
BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y
BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,riscv,opensbi,22f38ee6c658a660083aa45c4ec6c72f66a17260)/opensbi-22f38ee6c658a660083aa45c4ec6c72f66a17260.tar.gz"
BR2_TARGET_OPENSBI_PLAT="andes/ae350"
# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,u-boot,u-boot,a5dfa3b8a0f7ad555495bad1386613d2de4ba619)/u-boot-a5dfa3b8a0f7ad555495bad1386613d2de4ba619.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment"
BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_OPENSBI=y

View File

@ -26,6 +26,9 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-rdb"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
# Target package
BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE=y
# Filesystem
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y

View File

@ -24,8 +24,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_v2020.10
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz"
# Latest revision of branch boundary-v2022.04
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
@ -36,7 +36,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.15.y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="boundary"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y

View File

@ -23,8 +23,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_v2020.10
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz"
# Latest revision of branch boundary-v2022.04
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
@ -35,7 +35,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.15.y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="boundary"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y

View File

@ -23,8 +23,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_v2020.10
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz"
# Latest revision of branch boundary-v2022.04
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
@ -35,7 +35,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.15.y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="boundary"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y

View File

@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y
# ARM Trusted Firmware
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.4.70_2.3.0
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz"
# Latest revision of branch boundary-lf-5.15.52-2.1.0
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
@ -39,8 +39,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m"
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_v2020.10
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz"
# Latest revision of branch boundary-v2022.04
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
BR2_TARGET_UBOOT_NEEDS_DTC=y
@ -51,7 +51,7 @@ BR2_TARGET_UBOOT_SPL=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.15.y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="boundary"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INSTALL_TARGET=y

View File

@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y
# ARM Trusted Firmware
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.4.70_2.3.0
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz"
# Latest revision of branch boundary-lf-5.15.52-2.1.0
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
@ -39,8 +39,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g"
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_v2020.10
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz"
# Latest revision of branch boundary-v2022.04
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
BR2_TARGET_UBOOT_NEEDS_DTC=y
@ -51,7 +51,7 @@ BR2_TARGET_UBOOT_SPL=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.15.y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="boundary"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INSTALL_TARGET=y

View File

@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y
# ARM Trusted Firmware
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.4.70_2.3.0
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz"
# Latest revision of branch boundary-lf-5.15.52-2.1.0
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
@ -39,8 +39,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0"
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_v2020.10
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz"
# Latest revision of branch boundary-v2022.04
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
BR2_TARGET_UBOOT_NEEDS_DTC=y
@ -51,7 +51,7 @@ BR2_TARGET_UBOOT_SPL=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.15.y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="boundary"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INSTALL_TARGET=y

View File

@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y
# ARM Trusted Firmware
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.4.70_2.3.0
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz"
# Latest revision of branch boundary-lf-5.15.52-2.1.0
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
@ -39,8 +39,8 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mp_2gr0"
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_v2020.10
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1d21a3d5.tar.gz"
# Latest revision of branch boundary-v2022.04
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
BR2_TARGET_UBOOT_NEEDS_DTC=y
@ -51,7 +51,7 @@ BR2_TARGET_UBOOT_SPL=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# Latest revision of branch boundary-imx_5.15.y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/5dcbb9a6.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="boundary"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INSTALL_TARGET=y

View File

@ -0,0 +1,38 @@
BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2 vck190"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_versal"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt"
BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y
BR2_PACKAGE_VERSAL_FIRMWARE=y
BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="v2022.2"
BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_BOOTGEN=y

View File

@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz"
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynq/microzed/uboot.fragment"
BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-microzed"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_FORMAT_IMG=y

View File

@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz"
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynq/zc706/uboot.fragment"
BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc706"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_FORMAT_IMG=y

View File

@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@ -19,9 +19,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.1)/xlnx_rebase_v2022.01_2022.1.tar.gz"
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynq/zed/uboot.fragment"
BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zed"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_FORMAT_IMG=y

View File

@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/kv260/uboot.fragment"
BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_SPL=y

View File

@ -443,6 +443,7 @@ menu "Firmware"
source "package/sunxi-boards/Config.in"
source "package/ts4900-fpga/Config.in"
source "package/ux500-firmware/Config.in"
source "package/versal-firmware/Config.in"
source "package/wilc-firmware/Config.in"
source "package/wilink-bt-firmware/Config.in"
source "package/zd1211-firmware/Config.in"
@ -488,6 +489,7 @@ endmenu
source "package/dvb-apps/Config.in"
source "package/dvbsnoop/Config.in"
source "package/edid-decode/Config.in"
source "package/edk2-non-osi/Config.in"
source "package/edk2-platforms/Config.in"
source "package/eudev/Config.in"
source "package/ev3dev-linux-drivers/Config.in"
@ -722,6 +724,7 @@ menu "Lua libraries/modules"
source "package/lua-lyaml/Config.in"
source "package/lua-markdown/Config.in"
source "package/lua-messagepack/Config.in"
source "package/lua-mqtt/Config.in"
source "package/lua-msgpack-native/Config.in"
source "package/lua-periphery/Config.in"
source "package/lua-resty-http/Config.in"
@ -1020,6 +1023,7 @@ menu "External python modules"
source "package/python-defusedxml/Config.in"
source "package/python-dialog3/Config.in"
source "package/python-dicttoxml/Config.in"
source "package/python-dicttoxml2/Config.in"
source "package/python-distro/Config.in"
source "package/python-django/Config.in"
source "package/python-django-enumfields/Config.in"
@ -1211,6 +1215,7 @@ menu "External python modules"
source "package/python-pysnmp/Config.in"
source "package/python-pysnmp-mibs/Config.in"
source "package/python-pysocks/Config.in"
source "package/python-pyspnego/Config.in"
source "package/python-pytablereader/Config.in"
source "package/python-pytablewriter/Config.in"
source "package/python-pytest/Config.in"
@ -1264,6 +1269,7 @@ menu "External python modules"
source "package/python-sip/Config.in"
source "package/python-six/Config.in"
source "package/python-slob/Config.in"
source "package/python-smbprotocol/Config.in"
source "package/python-smbus-cffi/Config.in"
source "package/python-smmap2/Config.in"
source "package/python-snappy/Config.in"
@ -1593,6 +1599,7 @@ menu "Graphics"
source "package/opencl-clhpp/Config.in"
source "package/opencv3/Config.in"
source "package/opencv4/Config.in"
source "package/opencv4-contrib/Config.in"
source "package/opengl/Config.in"
source "package/openjpeg/Config.in"
source "package/pango/Config.in"
@ -1600,6 +1607,7 @@ menu "Graphics"
source "package/pixman/Config.in"
source "package/poppler/Config.in"
source "package/powervr/Config.in"
source "package/stb/Config.in"
source "package/tiff/Config.in"
source "package/unclutter-xfixes/Config.in"
source "package/waffle/Config.in"
@ -1949,6 +1957,7 @@ menu "Networking"
source "package/slirp4netns/Config.in"
source "package/snmppp/Config.in"
source "package/sofia-sip/Config.in"
source "package/sscep/Config.in"
source "package/sysrepo/Config.in"
source "package/thrift/Config.in"
source "package/usbredir/Config.in"
@ -2187,6 +2196,7 @@ menu "Miscellaneous"
source "package/wine/Config.in"
source "package/xmrig/Config.in"
source "package/xutil_util-macros/Config.in"
source "package/z3/Config.in"
endmenu
menu "Networking applications"

View File

@ -1,5 +1,5 @@
# From https://downloads.apache.org/avro/avro-1.11.0/c/avro-c-1.11.0.tar.gz.sha512
sha512 5369ec11832e0ce1aa0181d594f657bae82ab5fb317ec1bee5ba190de9ed42956b425a5bf7e423940e8f871a54ae1246b92db2ce8562f270b4a05523ec4b60ae avro-c-1.11.0.tar.gz
# From https://downloads.apache.org/avro/avro-1.11.1/c/avro-c-1.11.1.tar.gz.sha512
sha512 e72e8c245a8b86326bc18a5d5127e9beeaceaf805e8a62760fd88d627e29954c750346485bb43822df408c8a172d910c27ddf7e3815bddbdb04d16c54d859323 avro-c-1.11.1.tar.gz
# License files
sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE

View File

@ -5,7 +5,7 @@
################################################################################
# When updating the version, please also update python-avro
AVRO_C_VERSION = 1.11.0
AVRO_C_VERSION = 1.11.1
AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c
AVRO_C_LICENSE = Apache-2.0
AVRO_C_LICENSE_FILES = LICENSE

View File

@ -1,4 +1,4 @@
# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/sha256sums.asc
sha256 9184a6ebbd9ce7eb211152e7f741a6c82f2d1cc0e24a84ec9c52939eee0f0542 cryptsetup-2.5.0.tar.xz
# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc
sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz
sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING
sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL

View File

@ -4,7 +4,7 @@
#
################################################################################
CRYPTSETUP_VERSION_MAJOR = 2.5
CRYPTSETUP_VERSION_MAJOR = 2.6
CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0
CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)

View File

@ -1,5 +1,5 @@
# From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
sha256 3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1 dropbear-2022.82.tar.bz2
sha256 bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b dropbear-2022.83.tar.bz2
# License file, locally computed
sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE

View File

@ -4,7 +4,7 @@
#
################################################################################
DROPBEAR_VERSION = 2022.82
DROPBEAR_VERSION = 2022.83
DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain
@ -64,13 +64,9 @@ define DROPBEAR_ENABLE_LEGACY_CRYPTO
echo '#define DROPBEAR_ENABLE_CBC_MODE 1' >> $(@D)/localoptions.h
echo '#define DROPBEAR_SHA1_96_HMAC 1' >> $(@D)/localoptions.h
echo '#define DROPBEAR_DH_GROUP1 1' >> $(@D)/localoptions.h
echo '#define DROPBEAR_DSS 1' >> $(@D)/localoptions.h
endef
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO
else
define DROPBEAR_DISABLE_LEGACY_CRYPTO
echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h
endef
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_LEGACY_CRYPTO
endif
ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),)

View File

@ -0,0 +1,11 @@
config BR2_PACKAGE_EDK2_NON_OSI
bool
help
EDK2 description files for additional platforms, not
compatible with the normal licensing requirements.
The main EDK2 bootloader package will depend on these
description files while building firmware for some platforms.
Only the Marvell Armada files are copied at this point.
https://github.com/tianocore/edk2-non-osi

View File

@ -0,0 +1,3 @@
# Locally calculated
sha256 7d27b1e6d90a26f3585ab58a2e051da69eae1b97754d3e2d80a5372879ae2501 edk2-non-osi-61662e8596dd9a64e3372f9a3ba6622d2628607c.tar.gz
sha256 38d73db2f9dfb32e1666d898cb9d7c1ccd78302dd9922d5fac4a9cf61fa872d9 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf

View File

@ -0,0 +1,27 @@
################################################################################
#
# edk2-non-osi
#
################################################################################
# Keep in sync with latest commit as of the release date for boot/edk2
EDK2_NON_OSI_VERSION = 61662e8596dd9a64e3372f9a3ba6622d2628607c
EDK2_NON_OSI_SITE = $(call github,tianocore,edk2-non-osi,$(EDK2_NON_OSI_VERSION))
EDK2_NON_OSI_INSTALL_TARGET = NO
EDK2_NON_OSI_INSTALL_STAGING = YES
# Copy Marvell Armada files
EDK2_NON_OSI_LICENSE += BSD-2-Clause-Patent (Marvell Armada)
EDK2_NON_OSI_LICENSE_FILES += Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
EDK2_NON_OSI_DIRS += Silicon/Marvell/Armada7k8k/DeviceTree
# There is nothing to build for edk2-non-osi. All we need to do is to copy
# the selected description files to staging, for other packages to build with.
define EDK2_NON_OSI_INSTALL_STAGING_CMDS
$(foreach d,$(EDK2_NON_OSI_DIRS),\
mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi/$(d) && \
cp -rf $(@D)/$(d)/* $(STAGING_DIR)/usr/share/edk2-non-osi/$(d)/
)
endef
$(eval $(generic-package))

View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 dfdc34fea86e5037a3a6cbd2a83b1f655f16b4c9ab4f5ff9da91e45a358c9a14 edk2-platforms-db922e1253cb6f1fc456805bc42fb7d401eed5c2.tar.gz
sha256 1ed3f369a2743cc5a5fa4804d0af154e37b578f4e68c2e7f69734701a9b874db edk2-platforms-3c3b1168017073c2bb2d97336c5929ebae805be1.tar.gz
sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt

View File

@ -5,7 +5,7 @@
################################################################################
# Keep in sync with latest commit as of the release date for boot/edk2
EDK2_PLATFORMS_VERSION = db922e1253cb6f1fc456805bc42fb7d401eed5c2
EDK2_PLATFORMS_VERSION = 3c3b1168017073c2bb2d97336c5929ebae805be1
EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION))
EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent
EDK2_PLATFORMS_LICENSE_FILES = License.txt

View File

@ -1,61 +0,0 @@
Subject: Fix prototype generation for openat
Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
Date: 2021-12-30
Bug-Debian: https://bugs.debian.org/995393
Forwarded: Yes (implicitely)
As jrtc27 pointed out in IRC, ppc64el is more strict than other
architectures when it comes to va_arg handling:
it's that ppc64le uses the elfv2 abi, and for variadic calls you
must reserve space for a parameter save area
So enhance wrapawk to create a proper prototype and argument
handling although it's specific to the openat call. Also add the
missing documentation for the sixth column to wrapfunc.inp.
Signed-off-by: Joel Stanley <joel@jms.id.au>
--- a/wrapawk
+++ b/wrapawk
@@ -37,7 +37,25 @@
argtype=$3;
argname=$4;
MACRO=$5;
- if(MACRO){
+ openat_extra=$6;
+ if(openat_extra){
+ print " {(void(*))&next_" name ", \"" name "\"}," > structfile;
+ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile;
+ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile;
+
+ print ret " tmp_" name, openat_extra "{" > tmpffile;
+ print " mode_t mode = 0;" > tmpffile;
+ print " if (flags & O_CREAT) {" > tmpffile;
+ print " va_list args;" > tmpffile;
+ print " va_start(args, flags);" > tmpffile;
+ print " mode = va_arg(args, int);" > tmpffile;
+ print " va_end(args);" > tmpffile;
+ print " }" > tmpffile;
+ print " load_library_symbols();" > tmpffile;
+ print " return next_" name, argname ";" > tmpffile;
+ print "}" > tmpffile;
+ print "" > tmpffile;
+ } else if(MACRO){
print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile;
print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile;
print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile;
--- a/wrapfunc.inp
+++ b/wrapfunc.inp
@@ -9,8 +9,10 @@
/**/ */
/* each line of this file lists 4 fields, seperated by a ";". */
/* The first field is the name of the wrapped function, then it's return */
-/* value. After that come the function arguments with types, and the last */
+/* value. After that come the function arguments with types, and the fifth */
/* field contains the function arguments without types. */
+/* A sixth field is a special needed when wrapping the openat syscall. */
+/* Otherwise it's like the third (function arguments with types). */
/**/
/* __*xstat are used on glibc systems instead of just *xstat. */

View File

@ -1,4 +1,4 @@
# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.26-1.dsc
sha256 480a578ffdc5592e73df4c086950d321b4adc78dbdaec56c82e4fe1fb68de8e9 fakeroot_1.26.orig.tar.gz
# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.30.1-1.dsc
sha256 32ebb1f421aca0db7141c32a8c104eb95d2b45c393058b9435fbf903dd2b6a75 fakeroot_1.30.1.orig.tar.gz
# License files, locally calculated
sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING

View File

@ -4,9 +4,9 @@
#
################################################################################
FAKEROOT_VERSION = 1.26
FAKEROOT_VERSION = 1.30.1
FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz
FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20210907T092512Z/pool/main/f/fakeroot
FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20221120T030258Z/pool/main/f/fakeroot
HOST_FAKEROOT_DEPENDENCIES = host-acl
# Force capabilities detection off
@ -18,9 +18,4 @@ HOST_FAKEROOT_CONF_ENV = \
FAKEROOT_LICENSE = GPL-3.0+
FAKEROOT_LICENSE_FILES = COPYING
define HOST_FAKEROOT_BUILD_AUX
mkdir -p $(@D)/build-aux
endef
HOST_FAKEROOT_POST_PATCH_HOOKS += HOST_FAKEROOT_BUILD_AUX
$(eval $(host-autotools-package))

View File

@ -115,6 +115,7 @@ source "package/freescale-imx/imx-vpuwrap/Config.in"
source "package/freescale-imx/firmware-imx/Config.in"
source "package/freescale-imx/imx-sc-firmware/Config.in"
source "package/freescale-imx/imx-seco/Config.in"
source "package/freescale-imx/imx-vpu-hantro-daemon/Config.in"
source "package/freescale-imx/imx-vpu-hantro-vc/Config.in"
if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53)
source "package/freescale-imx/gpu-amd-bin-mx51/Config.in"

View File

@ -1,5 +1,5 @@
# Locally calculated
sha256 39fe307916e19a0892a514621121086e276a43858af90230372a1344852116a2 imx-gpu-g2d-6.4.3.p2.0-arm.bin
sha256 2642a49e088daae4cf568a150d01e7c095995e8a6ff1883c02c3fa6d26d254b3 imx-gpu-g2d-6.4.3.p2.0-aarch64.bin
sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING
sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA
sha256 7737a3372bcde34e2d275397df67c307df5033d5b133ac770f75cac4e1ec2580 imx-gpu-g2d-6.4.3.p4.4-arm.bin
sha256 8341d6e2cde3f3ffa035dc95b0487dd04a50531cc80f4cddc5a689ebc4946e02 imx-gpu-g2d-6.4.3.p4.4-aarch64.bin
sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING
sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA

View File

@ -5,9 +5,9 @@
################################################################################
ifeq ($(BR2_aarch64),y)
IMX_GPU_G2D_VERSION = 6.4.3.p2.0-aarch64
IMX_GPU_G2D_VERSION = 6.4.3.p4.4-aarch64
else
IMX_GPU_G2D_VERSION = 6.4.3.p2.0-arm
IMX_GPU_G2D_VERSION = 6.4.3.p4.4-arm
endif
IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE)
IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin

View File

@ -1,5 +1,5 @@
# Locally calculated
sha256 1324b1aaf190110b80ad9a6f6533f4f50dce9e9ab8d49d8503f59764b151d219 imx-gpu-viv-6.4.3.p2.0-aarch32.bin
sha256 003c30baefb1655790b475c3cdfa5cefbf81ea89ef37c6649b64f151dd23a52e imx-gpu-viv-6.4.3.p2.0-aarch64.bin
sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING
sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA
sha256 5b9dd02cb2dfa564903872576cd6586fbf4a02abdb8e180978bd84205ab302a7 imx-gpu-viv-6.4.3.p4.4-aarch32.bin
sha256 5c52bd15146c24d449638c6276c07103949c8efbc53d002518541bc37c57e424 imx-gpu-viv-6.4.3.p4.4-aarch64.bin
sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING
sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA

View File

@ -5,9 +5,9 @@
################################################################################
ifeq ($(BR2_aarch64),y)
IMX_GPU_VIV_VERSION = 6.4.3.p2.0-aarch64
IMX_GPU_VIV_VERSION = 6.4.3.p4.4-aarch64
else
IMX_GPU_VIV_VERSION = 6.4.3.p2.0-aarch32
IMX_GPU_VIV_VERSION = 6.4.3.p4.4-aarch32
endif
IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE)
IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin

View File

@ -0,0 +1,17 @@
comment "imx-vpu-hantro-daemon needs an i.MX-specific Linux kernel to be built"
depends on !BR2_LINUX_KERNEL
comment "imx-vpu-hantro-daemon needs an i.MX platform with Hantro VPU"
depends on BR2_LINUX_KERNEL
depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
config BR2_PACKAGE_IMX_VPU_HANTRO_DAEMON
bool "imx-vpu-hantro-daemon"
depends on BR2_LINUX_KERNEL
depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO
select BR2_PACKAGE_IMX_VPU_HANTRO
select BR2_PACKAGE_IMX_VPU_HANTRO_VC if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP
help
i.MX Hantro V4L2 Daemon specific for the NXP i.MX SoC
integrating a Hantro Video Processing Unit (VPU) such as the
i.MX8MQ/i.MX8MM/i.MX8MP.

View File

@ -0,0 +1,3 @@
# Locally computed:
sha256 83ba2798564702d74ab65f6238f95f59247d983b846de1de4c19bdfaf6dabeb8 imx-vpu-hantro-daemon-1.1.4.tar.gz
sha256 bb645f02b260955f333348100e40af76253e2cd8b116bac047230439dd53ec5a LICENSE.txt

View File

@ -0,0 +1,34 @@
################################################################################
#
# imx-vpu-hantro-daemon
#
################################################################################
IMX_VPU_HANTRO_DAEMON_VERSION = 1.1.4
IMX_VPU_HANTRO_DAEMON_SITE = $(FREESCALE_IMX_SITE)
IMX_VPU_HANTRO_DAEMON_LICENSE = NXP Semiconductor Software License Agreement
IMX_VPU_HANTRO_DAEMON_LICENSE_FILES = LICENSE.txt
IMX_VPU_HANTRO_DAEMON_REDISTRIBUTE = NO
IMX_VPU_HANTRO_DAEMON_DEPENDENCIES = imx-vpu-hantro linux
ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP),y)
IMX_VPU_HANTRO_DAEMON_DEPENDENCIES += imx-vpu-hantro-vc
endif
IMX_VPU_HANTRO_DAEMON_MAKE_ENV = \
$(TARGET_MAKE_ENV) \
CROSS_COMPILE="$(TARGET_CROSS)" \
SDKTARGETSYSROOT=$(STAGING_DIR) \
LINUX_KERNEL_ROOT=$(LINUX_DIR) \
CTRLSW_HDRPATH="$(STAGING_DIR)/usr/include" \
PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM)
define IMX_VPU_HANTRO_DAEMON_BUILD_CMDS
$(MAKE) -C $(@D) $(IMX_VPU_HANTRO_DAEMON_MAKE_ENV)
endef
define IMX_VPU_HANTRO_DAEMON_INSTALL_TARGET_CMDS
$(IMX_VPU_HANTRO_DAEMON_MAKE_ENV) $(MAKE) -C $(@D) \
DEST_DIR=$(TARGET_DIR) libdir=/usr/lib install
endef
$(eval $(generic-package))

View File

@ -1,4 +1,4 @@
# Locally computed:
sha256 d5efae484c4271c098286d007590d6bf40c272d4f35702ff65625f2362715ab3 imx-vpu-hantro-vc-1.4.0.bin
sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING
sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA
sha256 62b5ba3c4aab21d0d4be3eee9b204a9bb50b83b6140ee1a3b27c648809bdfbaa imx-vpu-hantro-vc-1.9.0.bin
sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING
sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA

View File

@ -4,10 +4,11 @@
#
################################################################################
IMX_VPU_HANTRO_VC_VERSION = 1.4.0
IMX_VPU_HANTRO_VC_VERSION = 1.9.0
IMX_VPU_HANTRO_VC_SITE = $(FREESCALE_IMX_SITE)
IMX_VPU_HANTRO_VC_SOURCE = imx-vpu-hantro-vc-$(IMX_VPU_HANTRO_VC_VERSION).bin
IMX_VPU_HANTRO_VC_DEPENDENCIES = linux
IMX_VPU_HANTRO_VC_INSTALL_STAGING = YES
IMX_VPU_HANTRO_VC_LICENSE = NXP Semiconductor Software License Agreement
IMX_VPU_HANTRO_VC_LICENSE_FILES = EULA COPYING
@ -17,6 +18,13 @@ define IMX_VPU_HANTRO_VC_EXTRACT_CMDS
$(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE))
endef
define IMX_VPU_HANTRO_VC_INSTALL_STAGING_CMDS
mkdir -p $(STAGING_DIR)/usr/include/
cp -dpfr $(@D)/usr/include/hantro_VC8000E_enc/*.h $(STAGING_DIR)/usr/include/
$(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so $(STAGING_DIR)/usr/lib/libhantro_vc8000e.so
$(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so.1 $(STAGING_DIR)/usr/lib/libhantro_vc8000e.so.1
endef
define IMX_VPU_HANTRO_VC_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so $(TARGET_DIR)/usr/lib/libhantro_vc8000e.so
$(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so.1 $(TARGET_DIR)/usr/lib/libhantro_vc8000e.so.1

View File

@ -0,0 +1,45 @@
From 73cd57c18066ff863335a8616d0b348541d26118 Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Tue, 15 Nov 2022 21:43:47 +0100
Subject: [PATCH] Fix Linux kernel version header
- Up to kernel 5.10, NXP was using ION for memory management
- Starting with 5.15 kernels, NXP uses DMABUF and the ION header is no
longer in the kernel
- So keep the previous patch for people using kernel <= 5.10
- Add path to the version.h header as imx-vpu-hantro will only include
ion.h depending on the kernel version
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
Makefile_G1G2 | 1 +
Makefile_H1 | 1 +
2 files changed, 2 insertions(+)
diff --git a/Makefile_G1G2 b/Makefile_G1G2
index 25884fa..8e03e91 100755
--- a/Makefile_G1G2
+++ b/Makefile_G1G2
@@ -11,6 +11,7 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so
INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc
#INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver
INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
+INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi
INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \
diff --git a/Makefile_H1 b/Makefile_H1
index 479940a..7ac6f8d 100755
--- a/Makefile_H1
+++ b/Makefile_H1
@@ -18,6 +18,7 @@ ENV = -DENC_MODULE_PATH=\\\"/dev/mxc_hantro_h1\\\"
ENV += -DEWL_NO_HW_TIMEOUT
ENV += -DUSE_ION
ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include
+ENV += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi
ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi
ifeq ($(CFG_SECURE_DATA_PATH), y)
--
2.35.1

View File

@ -1,4 +1,4 @@
# Locally computed:
sha256 03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00 imx-vpu-hantro-1.22.0.bin
sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING
sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA
sha256 7e9bcdbd067ce66a1247373cbf088945346feb0027deb61af541ebc1256277c3 imx-vpu-hantro-1.27.0.bin
sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING
sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA

View File

@ -4,7 +4,7 @@
#
################################################################################
IMX_VPU_HANTRO_VERSION = 1.22.0
IMX_VPU_HANTRO_VERSION = 1.27.0
IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE)
IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin
IMX_VPU_HANTRO_DEPENDENCIES = linux

View File

@ -1,3 +1,3 @@
# locally computed
sha256 b816ab94b1d248cfc5fe5f6381422346c273d01760bb324303e0298e10bd46e2 kernel-module-imx-gpu-viv-82c6cb6c607424403b8d76805bb17e7be74292f6.tar.gz
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
sha256 0754114b3088a46b9fee9a5bd1c7b9ec94b6ca656ed930c4cad9e04382e8e372 kernel-module-imx-gpu-viv-00fe5a0bedc07337c873f93998da9025083116ed.tar.gz
sha256 0754114b3088a46b9fee9a5bd1c7b9ec94b6ca656ed930c4cad9e04382e8e372 COPYING

View File

@ -4,7 +4,7 @@
#
################################################################################
KERNEL_MODULE_IMX_GPU_VIV_VERSION = 82c6cb6c607424403b8d76805bb17e7be74292f6
KERNEL_MODULE_IMX_GPU_VIV_VERSION = 00fe5a0bedc07337c873f93998da9025083116ed
KERNEL_MODULE_IMX_GPU_VIV_SITE = \
$(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION))
KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0

View File

@ -1,3 +1,3 @@
# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.9.sha256sum
sha256 28f7958e7bf29a32d4e963556d241d0a41a6786582ff6a5ad11665e0347fc962 gdk-pixbuf-2.42.9.tar.xz
# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.sha256sum
sha256 ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b gdk-pixbuf-2.42.10.tar.xz
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING

View File

@ -5,7 +5,7 @@
################################################################################
GDK_PIXBUF_VERSION_MAJOR = 2.42
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).9
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10
GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR)
GDK_PIXBUF_LICENSE = LGPL-2.1+

View File

@ -1,3 +1,3 @@
# Locally computed
sha256 63a7963f750ec45a7cb34a660b7247a0aa6def98706b7bd80efc95053e66822d gitlab-runner-14.5.1.tar.gz
sha256 f7482926d20dbf98434e3d34662d93b601166eb784c6fb4bc56f89c1a4eff19d gitlab-runner-15.5.0.tar.gz
sha256 0ae968b7ddd25da0209c3c6594aac1ac74ddf90385940b02b420463e2e0734de LICENSE

View File

@ -4,7 +4,7 @@
#
################################################################################
GITLAB_RUNNER_VERSION = 14.5.1
GITLAB_RUNNER_VERSION = 15.5.0
GITLAB_RUNNER_SITE = https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(GITLAB_RUNNER_VERSION)
GITLAB_RUNNER_LICENSE = MIT
GITLAB_RUNNER_LICENSE_FILES = LICENSE

View File

@ -0,0 +1,42 @@
From 45fe4ac55ad88b6793d225e676205c30388ec138 Mon Sep 17 00:00:00 2001
From: Ryan Volz <ryan.volz@gmail.com>
Date: Fri, 16 Sep 2022 21:05:51 -0400
Subject: [PATCH] blocks: Including missing <vector> in blockinterleaver.
Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
[Retrieved (and backported) from:
https://github.com/gnuradio/gnuradio/commit/463c3477549b26b32d9b73eef30044e97c4eee64]
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 2 +-
gr-blocks/lib/blockinterleaving.cc | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
index 9d4e0f249..df831fe5a 100644
--- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
@@ -12,7 +12,7 @@
#define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H
#include <gnuradio/blocks/api.h>
-
+#include <vector>
namespace gr {
namespace blocks {
diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc
index fc5873e11..768ad9ea7 100644
--- a/gr-blocks/lib/blockinterleaving.cc
+++ b/gr-blocks/lib/blockinterleaving.cc
@@ -12,6 +12,7 @@
#include <spdlog/fmt/fmt.h>
#include <algorithm>
#include <numeric>
+#include <vector>
namespace gr {
namespace blocks {
--
2.35.1

View File

@ -1,39 +0,0 @@
From f643bc12100c67288adda3699a9e61d6a66fb529 Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Fri, 7 Feb 2020 16:49:30 +0100
Subject: [PATCH] gr-digital:glfsr.h: drop boost/cstdint.hpp and use cstdint
gr-digital/glfsr.h include boost/cstdint.hpp to have uintxx_t.
These types are in boost namespace but nor using namespace xxx, nor boost:: are used.
The result is :
In file included from /home/buildroot/autobuild/instance-0/output-1/build/gnuradio-3.8.0.0/gr-digital/lib/glfsr.cc:23:
/home/buildroot/autobuild/instance-0/output-1/build/gnuradio-3.8.0.0/gr-digital/lib/../include/gnuradio/digital/glfsr.h:42:5: error: 'uint32_t' does not name a type; did you mean 'u_int32_t'?
uint32_t d_shift_register;
^~~~~~~~
u_int32_t
Since Gnuradio policy is Less boost == better and C++11 is used, use cstdint
instead of boost/cstdint.hpp.
[backported from 475e4a156b516c089175afb998acdc80b740b437]
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
gr-digital/include/gnuradio/digital/glfsr.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gr-digital/include/gnuradio/digital/glfsr.h b/gr-digital/include/gnuradio/digital/glfsr.h
index 0b5141f1f..1003bcd01 100644
--- a/gr-digital/include/gnuradio/digital/glfsr.h
+++ b/gr-digital/include/gnuradio/digital/glfsr.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_GLFSR_H
#include <gnuradio/digital/api.h>
-#include <boost/cstdint.hpp>
+#include <cstdint>
namespace gr {
namespace digital {
--
2.24.1

View File

@ -0,0 +1,33 @@
From 901c2ad1ac88908a2e6db5615d5af39a218d826d Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Fri, 23 Sep 2022 08:41:26 +0200
Subject: [PATCH] blocks/blockinterleaving.h: add missing cstddef header
(required for size_t)
Fix build failure like:
gnuradio/gr-blocks/lib/../include/gnuradio/blocks/blockinterleaving.h:25:36: error: size_t was not declared in this scope
This failure is due to the miss of cstddef include
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
[Upstream status: https://github.com/gnuradio/gnuradio/pull/6188]
---
gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
index df831fe5a..33c59e35b 100644
--- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
@@ -13,6 +13,7 @@
#include <gnuradio/blocks/api.h>
#include <vector>
+#include <cstddef>
namespace gr {
namespace blocks {
--
2.35.1

View File

@ -1,57 +0,0 @@
From 84dea8284c521f08508bb2dcbc99db3b5d3438fd Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Thu, 27 Aug 2020 17:32:09 +0200
Subject: [PATCH] gnuradio-runtime_pmt: dont hardcode
INTERFACE_INCLUDE_DIRECTORIES
gnuradio-runtimeTargets.cmake and gnuradio-pmtTargets.cmake are filled
using CMAKE_INSTALL_PREFIX for INSTALL_INTERFACE.
Since CMAKE_INSTALL_PREFIX, in buildroot, is set to /usr, these files contains
path to host system.
With BR2_COMPILER_PARANOID_UNSAFE_PATH package using gnuradio fails with:
arm-linux-gnueabihf-g++: ERROR: unsafe header/library path used in cross-compilation: '-isystem' '/usr/include'
By simply providing 'include', produced .cmake contains:
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
instead of
INTERFACE_INCLUDE_DIRECTORIES "/usr/include"
[Upstream status: https://github.com/gnuradio/gnuradio/pull/3737]
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
gnuradio-runtime/lib/CMakeLists.txt | 2 +-
gnuradio-runtime/lib/pmt/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt
index 5aa90a5e1..fc32f473b 100644
--- a/gnuradio-runtime/lib/CMakeLists.txt
+++ b/gnuradio-runtime/lib/CMakeLists.txt
@@ -214,7 +214,7 @@ target_link_libraries(gnuradio-runtime PUBLIC
target_include_directories(gnuradio-runtime
PUBLIC
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>
+ $<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
PRIVATE
diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt
index 9fb98d0fc..6dfcd945c 100644
--- a/gnuradio-runtime/lib/pmt/CMakeLists.txt
+++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(gnuradio-pmt
target_include_directories(gnuradio-pmt
PUBLIC
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>
+ $<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/
)
--
2.26.2

View File

@ -1,55 +0,0 @@
From 268b1a599304f58bd56c86ff09041b5912c24a0c Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Sun, 1 Nov 2020 17:24:36 +0100
Subject: [PATCH] gr-qtgui: dont't add examples/c++ subdirectory when gr-analog
is disabled
gr-qtgui examples needs to have gr-analog enabled, without this dependency
compile crash with:
In file included from
/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.cc:22:
/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.h:24:10:
fatal error: gnuradio/analog/noise_source.h: No such file or directory
24 | #include <gnuradio/analog/noise_source.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[3]: *** [gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/build.make:67:
gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/display_qt.cc.o] Error 1
make[3]: *** Waiting for unfinished jobs....
In file included from
/somewhere/gnuradio/build/gr-qtgui/examples/c++/moc_display_qt.cpp:10:
/somewhere/gnuradio/build/gr-qtgui/examples/c++/../../../../gr-qtgui/examples/c++/display_qt.h:24:10:
fatal error: gnuradio/analog/noise_source.h: No such file or directory
24 | #include <gnuradio/analog/noise_source.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
GR_ANALOG is not an explicit dependency of GR_QTGUI, so disable c++ examples if
user has not selected this option.
[backported from 7470a7a3771dd90defb826b464dfe62977cb1eb6]
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
gr-qtgui/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
index 8831f3ad9..561186fbd 100644
--- a/gr-qtgui/CMakeLists.txt
+++ b/gr-qtgui/CMakeLists.txt
@@ -68,7 +68,9 @@ if(ENABLE_GR_QTGUI)
add_subdirectory(include/gnuradio/qtgui)
add_subdirectory(lib)
add_subdirectory(docs)
-add_subdirectory(examples/c++)
+if (ENABLE_GR_ANALOG)
+ add_subdirectory(examples/c++)
+endif(ENABLE_GR_ANALOG)
if(ENABLE_PYTHON)
add_subdirectory(swig)
add_subdirectory(python/qtgui)
--
2.26.2

View File

@ -1,165 +0,0 @@
From 2c767bb260a25b415e8c9c4b3ea37280b2127cec Mon Sep 17 00:00:00 2001
From: japm48 <japm48@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:35:30 +0200
Subject: [PATCH] boost: remove deprecated math/common_factor.hpp
Remove deprecation warning and prefer using std::{lcm,gcd} to Boost.
Fixes #2712.
[Retrieved from:
https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.../include/gnuradio/CMakeLists.txt | 1 +
.../include/gnuradio/integer_math.h | 35 +++++++++++++++++++
gnuradio-runtime/lib/buffer.cc | 19 ++--------
gr-digital/lib/symbol_sync_cc_impl.cc | 4 +--
gr-digital/lib/symbol_sync_ff_impl.cc | 4 +--
5 files changed, 43 insertions(+), 20 deletions(-)
create mode 100644 gnuradio-runtime/include/gnuradio/integer_math.h
diff --git a/gnuradio-runtime/include/gnuradio/CMakeLists.txt b/gnuradio-runtime/include/gnuradio/CMakeLists.txt
index 8d718e87b5b..056af5d6f48 100644
--- a/gnuradio-runtime/include/gnuradio/CMakeLists.txt
+++ b/gnuradio-runtime/include/gnuradio/CMakeLists.txt
@@ -31,6 +31,7 @@ install(FILES
gr_complex.h
hier_block2.h
high_res_timer.h
+ integer_math.h
io_signature.h
logger.h
math.h
diff --git a/gnuradio-runtime/include/gnuradio/integer_math.h b/gnuradio-runtime/include/gnuradio/integer_math.h
new file mode 100644
index 00000000000..15141049fa4
--- /dev/null
+++ b/gnuradio-runtime/include/gnuradio/integer_math.h
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2020 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+#ifndef INCLUDED_GR_INTEGER_MATH_H
+#define INCLUDED_GR_INTEGER_MATH_H
+
+#if (__cplusplus >= 201703L)
+
+// Prefer C++17 goodness.
+#include <numeric>
+#define GR_GCD std::gcd
+#define GR_LCM std::lcm
+
+#elif (BOOST_VERSION >= 105800)
+
+// Fallback: newer boost API (introduced in Boost 1.58.0).
+#include <boost/integer/common_factor_rt.hpp>
+#define GR_GCD boost::integer::gcd
+#define GR_LCM boost::integer::lcm
+
+#else
+
+// Last resort: old deprecated boost API.
+#include <boost/math/common_factor_rt.hpp>
+#define GR_GCD boost::math::gcd
+#define GR_LCM boost::math::lcm
+
+#endif /* __cplusplus >= 201703L */
+#endif /* INCLUDED_GR_INTEGER_MATH_H */
diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc
index 720c72c4ee8..46d704542b1 100644
--- a/gnuradio-runtime/lib/buffer.cc
+++ b/gnuradio-runtime/lib/buffer.cc
@@ -13,22 +13,13 @@
#endif
#include "vmcircbuf.h"
#include <gnuradio/buffer.h>
+#include <gnuradio/integer_math.h>
#include <gnuradio/math.h>
#include <assert.h>
#include <algorithm>
#include <iostream>
#include <stdexcept>
-// the following header is deprecated as of Boost 1.66.0, and the
-// other API was introduced in Boost 1.58.0. Since we still support
-// Boost back to 1.54.0, use the older API if pre-1.5.80 and otherwise
-// use the newer API.
-#if (BOOST_VERSION < 105800)
-#include <boost/math/common_factor_rt.hpp>
-#else
-#include <boost/integer/common_factor_rt.hpp>
-#endif
-
namespace gr {
static long s_buffer_count = 0; // counts for debugging storage mgmt
@@ -68,13 +59,9 @@ static long s_buffer_reader_count = 0;
*
* type_size * nitems == k * page_size
*/
-static long minimum_buffer_items(long type_size, long page_size)
+static inline long minimum_buffer_items(long type_size, long page_size)
{
-#if (BOOST_VERSION < 105800)
- return page_size / boost::math::gcd(type_size, page_size);
-#else
- return page_size / boost::integer::gcd(type_size, page_size);
-#endif
+ return page_size / GR_GCD(type_size, page_size);
}
diff --git a/gr-digital/lib/symbol_sync_cc_impl.cc b/gr-digital/lib/symbol_sync_cc_impl.cc
index 55f85e7c6a7..55f162dc727 100644
--- a/gr-digital/lib/symbol_sync_cc_impl.cc
+++ b/gr-digital/lib/symbol_sync_cc_impl.cc
@@ -13,9 +13,9 @@
#endif
#include "symbol_sync_cc_impl.h"
+#include <gnuradio/integer_math.h>
#include <gnuradio/io_signature.h>
#include <gnuradio/math.h>
-#include <boost/math/common_factor.hpp>
#include <stdexcept>
namespace gr {
@@ -95,7 +95,7 @@ symbol_sync_cc_impl::symbol_sync_cc_impl(enum ted_type detector_type,
throw std::runtime_error("unable to create interpolating_resampler_ccf");
// Block Internal Clocks
- d_interps_per_symbol_n = boost::math::lcm(d_ted->inputs_per_symbol(), d_osps_n);
+ d_interps_per_symbol_n = GR_LCM(d_ted->inputs_per_symbol(), d_osps_n);
d_interps_per_ted_input_n = d_interps_per_symbol_n / d_ted->inputs_per_symbol();
d_interps_per_output_sample_n = d_interps_per_symbol_n / d_osps_n;
diff --git a/gr-digital/lib/symbol_sync_ff_impl.cc b/gr-digital/lib/symbol_sync_ff_impl.cc
index d0ec32ab192..1172c1b4f8a 100644
--- a/gr-digital/lib/symbol_sync_ff_impl.cc
+++ b/gr-digital/lib/symbol_sync_ff_impl.cc
@@ -13,9 +13,9 @@
#endif
#include "symbol_sync_ff_impl.h"
+#include <gnuradio/integer_math.h>
#include <gnuradio/io_signature.h>
#include <gnuradio/math.h>
-#include <boost/math/common_factor.hpp>
#include <stdexcept>
namespace gr {
@@ -97,7 +97,7 @@ symbol_sync_ff_impl::symbol_sync_ff_impl(enum ted_type detector_type,
throw std::runtime_error("unable to create interpolating_resampler_fff");
// Block Internal Clocks
- d_interps_per_symbol_n = boost::math::lcm(d_ted->inputs_per_symbol(), d_osps_n);
+ d_interps_per_symbol_n = GR_LCM(d_ted->inputs_per_symbol(), d_osps_n);
d_interps_per_ted_input_n = d_interps_per_symbol_n / d_ted->inputs_per_symbol();
d_interps_per_output_sample_n = d_interps_per_symbol_n / d_osps_n;

View File

@ -15,19 +15,19 @@ config BR2_PACKAGE_GNURADIO
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_USE_MMU # use fork()
depends on BR2_USE_WCHAR # boost
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-filesystem
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-thread
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_ATOMIC
select BR2_PACKAGE_BOOST_DATE_TIME
select BR2_PACKAGE_BOOST_FILESYSTEM
select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
select BR2_PACKAGE_BOOST_REGEX
select BR2_PACKAGE_BOOST_SYSTEM
select BR2_PACKAGE_BOOST_THREAD
select BR2_PACKAGE_LOG4CPP
select BR2_PACKAGE_GMP
select BR2_PACKAGE_SPDLOG
select BR2_PACKAGE_VOLK
help
GNU Radio is a free & open-source software development
@ -81,6 +81,7 @@ config BR2_PACKAGE_GNURADIO_PYTHON
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
select BR2_PACKAGE_BOOST_PYTHON
select BR2_PACKAGE_PYTHON_NUMPY # runtime
select BR2_PACKAGE_PYTHON_PYBIND
select BR2_PACKAGE_PYTHON_SIX # runtime
help
Enable python component

View File

@ -1,3 +1,3 @@
# Locally computed
sha256 3e293541a9ac8d78660762bae8b80c0f6195b3494e1c50c01a9fd79cc60bb624 gnuradio-3.8.2.0.tar.gz
sha256 c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd gnuradio-3.10.4.0.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING

View File

@ -4,22 +4,19 @@
#
################################################################################
GNURADIO_VERSION = 3.8.2.0
GNURADIO_SITE = https://github.com/gnuradio/gnuradio/releases/download/v$(GNURADIO_VERSION)
GNURADIO_VERSION = 3.10.4.0
GNURADIO_SITE = $(call github,gnuradio,gnuradio,v$(GNURADIO_VERSION))
GNURADIO_LICENSE = GPL-3.0+
GNURADIO_LICENSE_FILES = COPYING
GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO
# host-python-mako and host-python-six are needed for volk to compile
GNURADIO_DEPENDENCIES = \
host-python3 \
host-python-mako \
host-python-six \
host-swig \
boost \
log4cpp \
gmp \
spdlog \
volk
GNURADIO_CONF_OPTS = \
@ -115,7 +112,8 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF
endif
ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y)
GNURADIO_DEPENDENCIES += python3
GNURADIO_DEPENDENCIES += python3 python-pybind \
host-python-numpy host-python-packaging
GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON
# mandatory to install python modules in site-packages and to use
# correct path for python libraries

View File

@ -1,5 +1,5 @@
# Upstream .sha256 from GitHub
sha256 7370eb7ad5d33a9cf2e7e4a6a86c09587fbf9592cd357c6f472c33f575bac26d inadyn-2.9.1.tar.gz
sha256 1727b6aae6727f99eba584e46950369d7b259d2ef09e5bc02566e9c3c1d6daf6 inadyn-2.10.0.tar.gz
# Locally computed
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING

View File

@ -4,7 +4,7 @@
#
################################################################################
INADYN_VERSION = 2.9.1
INADYN_VERSION = 2.10.0
INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION)
INADYN_LICENSE = GPL-2.0+
INADYN_LICENSE_FILES = COPYING
@ -15,6 +15,8 @@ INADYN_CONF_OPTS += --enable-openssl
INADYN_DEPENDENCIES += openssl
else ifeq ($(BR2_PACKAGE_GNUTLS),y)
INADYN_DEPENDENCIES += gnutls
else ifeq ($BR2_PACKAGE_MBEDTLS, y)
INADYN_DEPENDENCIES += mbedtls
else
INADYN_CONF_OPTS += --disable-ssl
endif

View File

@ -1,65 +0,0 @@
From 2007edc683499d2e82772f84241b453bdf319372 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Fri, 29 Jul 2022 19:51:39 +0200
Subject: [PATCH] Fix uClibc build
uClibc does not provide execinfo.h
Patch sent upstream: https://github.com/intel/media-driver/pull/1437
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
CMakeLists.txt | 6 ++++++
.../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++
2 files changed, 10 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 053904748..4a3f0869e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
+include(CheckIncludeFileCXX)
+check_include_file_cxx("execinfo.h" HAVE_EXECINFO)
+if (HAVE_EXECINFO)
+ add_definitions(-DHAVE_EXECINFO)
+endif()
+
include(GNUInstallDirs)
if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX)
diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
index bde216b83..120b02d55 100644
--- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
@@ -34,7 +34,9 @@
#include <signal.h>
#include <unistd.h> // fork
#include <algorithm>
+#ifdef HAVE_EXECINFO
#include <execinfo.h> // backtrace
+#endif
#include <sys/types.h>
#include <sys/stat.h> // fstat
#include <sys/ipc.h> // System V IPC
@@ -2473,6 +2475,7 @@ void MosUtilities::MosTraceEvent(
MOS_FreeMemory(pTraceBuf);
}
}
+#ifdef HAVE_EXECINFO
if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK))
{
// reserve space for header and stack size field.
@@ -2492,6 +2495,7 @@ void MosUtilities::MosTraceEvent(
size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen);
}
}
+#endif
}
return;
}
--
2.30.2

View File

@ -1,43 +0,0 @@
From c5177d6fc64ad8bc25c8fbbe324e52744ef52e18 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 12 Aug 2022 09:50:33 +0200
Subject: [PATCH] Fix build with libexecinfo
Fix the following build failure with musl or uclibc-ng and libexecinfo:
/home/giuliobenetti/autobuild/run/instance-2/output-1/build/intel-mediadriver-22.5.1/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp:2481: undefined reference to `backtrace'
Fixes:
- http://autobuild.buildroot.org/results/3316e39c5113bb7600374eda45497a87c9ac9873
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/intel/media-driver/pull/1470]
---
media_driver/media_top_cmake.cmake | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake
index 0e19a47c9..936d8c35a 100755
--- a/media_driver/media_top_cmake.cmake
+++ b/media_driver/media_top_cmake.cmake
@@ -271,10 +271,16 @@ set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS})
set_target_properties(${LIB_NAME} PROPERTIES PREFIX "")
set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "")
+set(MEDIA_LINK_EXTERNAL_LIBS "${PKG_PCIACCESS_LIBRARIES} m pthread dl")
+find_package(Backtrace)
+if(Backtrace_FOUND)
+ set(MEDIA_LINK_EXTERNAL_LIBS "${MEDIA_LINK_EXTERNAL_LIBS} ${Backtrace_LIBRARY}")
+endif()
+
bs_ufo_link_libraries_noBsymbolic(
${LIB_NAME}
"${INCLUDED_LIBS}"
- "${PKG_PCIACCESS_LIBRARIES} m pthread dl"
+ "${MEDIA_LINK_EXTERNAL_LIBS}"
)
if (NOT DEFINED INCLUDED_LIBS OR "${INCLUDED_LIBS}" STREQUAL "")
--
2.35.1

View File

@ -1,3 +1,3 @@
# Locally computed
sha256 bee655102b0c56ea3eee6e8d1d203a67bf7e0c4696ebde2b8ae40067eb12b23f intel-media-22.6.0.tar.gz
sha256 f42c41dce7ab4213e21f6599cd0602e5ab40a8182ec286bfc0a16547721dff7a intel-media-22.6.3.tar.gz
sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md

View File

@ -6,7 +6,7 @@
# based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack
INTEL_MEDIADRIVER_VERSION = 22.6.0
INTEL_MEDIADRIVER_VERSION = 22.6.3
INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive
INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz
INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause

View File

@ -1,3 +1,3 @@
# Locally computed
sha256 21a54b752c6b84f032b53a3e328d29f05a448b39f4c18f75fe4e79bb219dc40e intel-mediasdk-22.6.0.tar.gz
sha256 a47a554cb3055614a8041cf478c4c89e249c2157c7e98389fbaba6144dc18783 intel-mediasdk-22.6.3.tar.gz
sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE

View File

@ -4,7 +4,7 @@
#
################################################################################
INTEL_MEDIASDK_VERSION = 22.6.0
INTEL_MEDIASDK_VERSION = 22.6.3
INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive
INTEL_MEDIASDK_LICENSE = MIT
INTEL_MEDIASDK_LICENSE_FILES = LICENSE

View File

@ -1,6 +1,6 @@
# From https://lists.freedesktop.org/archives/dri-devel/2022-August/369983.html
sha256 7fd7eb2967f63beb4606f22d50e277d993480d05ef75dd88a9bd8e677323e5e1 libdrm-2.4.113.tar.xz
sha512 fca9834ce090f63ce6dc6d04491a2c5e86162fdddfc8ea70d55a6cdeb401be656388aae1577e58f463a78d8dc502be0a641908784819874e20bbec9a39a057e0 libdrm-2.4.113.tar.xz
# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html
sha256 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026 libdrm-2.4.114.tar.xz
sha512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz
# Hash for license file
sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build

Some files were not shown because too many files have changed in this diff Show More