From b41d26c5211c5f4cfdefbd645868dd987ca8df37 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Mon, 7 Aug 2023 10:15:57 +0200 Subject: [PATCH] WIP: Fix fitimage build for sitara plateforms --- .../conf/machine/netmodule-hw20.conf | 2 ++ .../conf/machine/netmodule-hw24.conf | 1 + .../conf/machine/netmodule-hw26.conf | 1 + .../linux/linux-nrsw/conf/netbird.cfg | 18 +++++++++++++++--- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf index 48bbe5e..68a5ccf 100644 --- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf +++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf @@ -12,3 +12,5 @@ KERNEL_DEVICETREE = "\ am335x-nrhw20-prod1.dtb \ " +UBOOT_MACHINE = "netmodule-hw20" +SERIAL_CONSOLE = "115200;ttyS1" diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw24.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw24.conf index f1d8b09..0a52fe7 100644 --- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw24.conf +++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw24.conf @@ -10,3 +10,4 @@ NM_MODELS = "B-800" # WARNING: This file needs to be kept in sync with HW24. Therefor use the common include: require conf/machine/include/am335x-nrhw16-nrhw24.inc +UBOOT_MACHINE = "netmodule-hw24" diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf index 61336e2..2a17219 100644 --- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf +++ b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf @@ -12,3 +12,4 @@ KERNEL_DEVICETREE = "\ am335x-hw26-prod1.dtb \ " +UBOOT_MACHINE = "netmodule-hw26" diff --git a/layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/linux-nrsw/conf/netbird.cfg b/layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/linux-nrsw/conf/netbird.cfg index 8230797..7c600d2 100644 --- a/layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/linux-nrsw/conf/netbird.cfg +++ b/layers/meta-netmodule-legacy-bsp/recipes-kernel/linux/linux-nrsw/conf/netbird.cfg @@ -138,7 +138,15 @@ CONFIG_NET_NS=y # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set -# CONFIG_BLK_DEV_INITRD is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +CONFIG_RD_XZ=y +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set +# CONFIG_RD_ZSTD is not set # CONFIG_BOOT_CONFIG is not set CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set @@ -1449,7 +1457,9 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_DRBD is not set # CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_BLK_DEV_RBD is not set @@ -4116,10 +4126,12 @@ CONFIG_XZ_DEC=y # CONFIG_XZ_DEC_X86 is not set # CONFIG_XZ_DEC_POWERPC is not set # CONFIG_XZ_DEC_IA64 is not set -# CONFIG_XZ_DEC_ARM is not set +CONFIG_XZ_DEC_ARM=y # CONFIG_XZ_DEC_ARMTHUMB is not set # CONFIG_XZ_DEC_SPARC is not set +CONFIG_XZ_DEC_BCJ=y # CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_XZ=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m