LM
/
coreos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: move sources from NetModule to CoreOS

This commit is contained in:
Sam Dolt 2024-01-18 15:57:23 +01:00 committed by Alexandre Bard
parent 90fb120676
commit 13a6f17abd
9 changed files with 1900 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layers/meta-belden-coreos-bsp/wic/generic-uefi.wks.in
View File

@ -1,18 +1,10 @@
# short-description: Create an EFI disk image for genericx86* # short-description: Create an EFI disk image for genericx86*
# long-description: Creates a partitioned EFI disk image for genericx86* machines # long-description: Creates a partitioned EFI disk image for genericx86* machines
<<<<<<< HEAD
${WKS_PART_EFI} --ondisk sda --align 1024 --size 64M --extra-space 0 --overhead-factor 1
${WKS_PART_ROOT_A} --ondisk sda --size ${WKS_PART_ROOT_SIZE} --extra-space 0 --overhead-factor 1
${WKS_PART_ROOT_B} --ondisk sda --size ${WKS_PART_ROOT_SIZE} --extra-space 0 --overhead-factor 1
${WKS_PART_EFIBOOTGUARD_A} --ondisk sda --align 1024 --size 128M --extra-space 0 --overhead-factor 1
${WKS_PART_EFIBOOTGUARD_B} --ondisk sda --align 1024 --size 128M --extra-space 0 --overhead-factor 1
${WKS_PART_USERDATA} --ondisk sda --size ${WKS_PART_USERDATA_SIZE} --extra-space 0 --overhead-factor 1
=======
${WKS_PART_EFI} --align 1024 --size 64M --extra-space 0 --overhead-factor 1 ${WKS_PART_EFI} --align 1024 --size 64M --extra-space 0 --overhead-factor 1
${WKS_PART_ROOT_A} --size ${WKS_PART_ROOT_SIZE} --extra-space 0 --overhead-factor 1 ${WKS_PART_ROOT_A} --size ${WKS_PART_ROOT_SIZE} --extra-space 0 --overhead-factor 1
${WKS_PART_ROOT_B} --size ${WKS_PART_ROOT_SIZE} --extra-space 0 --overhead-factor 1 ${WKS_PART_ROOT_B} --size ${WKS_PART_ROOT_SIZE} --extra-space 0 --overhead-factor 1
${WKS_PART_EFIBOOTGUARD_A} --align 1024 --size 128M --extra-space 0 --overhead-factor 1 ${WKS_PART_EFIBOOTGUARD_A} --align 1024 --size 128M --extra-space 0 --overhead-factor 1
${WKS_PART_EFIBOOTGUARD_B} --align 1024 --size 128M --extra-space 0 --overhead-factor 1 ${WKS_PART_EFIBOOTGUARD_B} --align 1024 --size 128M --extra-space 0 --overhead-factor 1
>>>>>>> 907e72e (feat(meta-netmodule-coreos-bsp): create layer and add gemini support) ${WKS_PART_USERDATA} --size ${WKS_PART_USERDATA_SIZE} --extra-space 0 --overhead-factor 1
bootloader --ptable gpt bootloader --ptable gpt

3
layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-common.inc
View File

@ -3,3 +3,6 @@
# the Cortex-A53 and Cortex-R5 core (Gemini use a multi-arch SOC) # the Cortex-A53 and Cortex-R5 core (Gemini use a multi-arch SOC)
TI_LINUX_FW_SRCREV = "0f4905088d24e474063f33777559149e11538be5" TI_LINUX_FW_SRCREV = "0f4905088d24e474063f33777559149e11538be5"
K3_IMAGE_GEN_SRCREV ?= "2308bfb01e7bd3e03514cb33f06180dd9bb79121" K3_IMAGE_GEN_SRCREV ?= "2308bfb01e7bd3e03514cb33f06180dd9bb79121"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-coreos"
PREFERRED_PROVIDER_u-boot = "u-boot-ti-coreos"

4
layers/meta-netmodule-coreos-bsp/conf/machine/include/netmodule-am64xx-k3.inc
View File

@ -24,9 +24,7 @@ SOC_FAMILY:append = ":am64xx"
# Install u-boot script # Install u-boot script
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" PREFERRED_PROVIDER_virtual/kernel = "linux-ti-coreos"
PREFERRED_VERSION_linux-netmodule = "git-5.10-ti"
PREFERRED_VERSION_trusted-firmware-a = "2.7+gitAUTOINC+0c9c984a0d"
KERNEL_DEFCONFIG ?= "gemini_defconfig" KERNEL_DEFCONFIG ?= "gemini_defconfig"
KERNEL_IMAGETYPE = "Image" KERNEL_IMAGETYPE = "Image"

43
layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-coreos/0001-ram-k3-ddrss-Fix-a-ddr4-controller-stall.patch Normal file
View File

@ -0,0 +1,43 @@
From cf50887c0d4053d5a454971633b1f71d477ebc6b Mon Sep 17 00:00:00 2001
From: Stefan Eichenberger <eichest@gmail.com>
Date: Tue, 7 Feb 2023 09:20:15 +0100
Subject: [PATCH] ram: k3-ddrss: Fix a ddr4 controller stall
The DDR4 controller might stall indefinitely if we access the same
register twice withing a short time interval. This commit makes sure we
reuse the previously read value so that we don't have to access twice.
See this article for more information:
https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1057242/am6442-access-to-ddr4-controller-register-stalls-indefinitely-while-in-lpddr4-frequency-update
---
drivers/ram/k3-ddrss/k3-ddrss.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/ram/k3-ddrss/k3-ddrss.c b/drivers/ram/k3-ddrss/k3-ddrss.c
index e8b7aec9e0..b4acb3aea6 100644
--- a/drivers/ram/k3-ddrss/k3-ddrss.c
+++ b/drivers/ram/k3-ddrss/k3-ddrss.c
@@ -241,15 +241,13 @@ static void k3_lpddr4_freq_update(struct k3_ddrss_desc *ddrss)
}
}
+static u32 dram_class = DENALI_CTL_0_DRAM_CLASS_LPDDR4;
static void k3_lpddr4_ack_freq_upd_req(const lpddr4_privatedata *pd)
{
- u32 dram_class;
struct k3_ddrss_desc *ddrss = (struct k3_ddrss_desc *)pd->ddr_instance;
debug("--->>> LPDDR4 Initialization is in progress ... <<<---\n");
- dram_class = k3_lpddr4_read_ddr_type(pd);
-
switch (dram_class) {
case DENALI_CTL_0_DRAM_CLASS_DDR4:
break;
@@ -263,7 +261,6 @@ static void k3_lpddr4_ack_freq_upd_req(const lpddr4_privatedata *pd)
static int k3_ddrss_init_freq(struct k3_ddrss_desc *ddrss)
{
- u32 dram_class;
int ret;
lpddr4_privatedata *pd = &ddrss->pd;

1845
layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-coreos/0002-gemini-board-add-board-and-device-tree.patch Normal file
View File

File diff suppressed because it is too large Load Diff

8
layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-staging_git.bb → layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-coreos_2023.01.bb
View File

@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
PV = "2023.01" PV = "2023.01"
SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot.git;protocol=ssh;user=gitea;branch=2023.01/ti/base \ SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master \
file://0001-rename-genimi-to-hw34.patch \ file://0001-ram-k3-ddrss-Fix-a-ddr4-controller-stall.patch \
file://0002-gemini-board-add-board-and-device-tree.patch \
" "
SRCREV = "72a21cd71968af4e043510b9ae1ce331a6cca289"
SRCREV = "62e2ad1ceafbfdf2c44d3dc1b6efc81e768a96b9"
PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a"

102
layers/meta-netmodule-coreos-bsp/recipes-bsp/u-boot/u-boot-ti-staging/0001-rename-genimi-to-hw34.patch
View File

@ -1,102 +0,0 @@
From 8bd97ab74792c211ea6550c1696bf5f902016c1e Mon Sep 17 00:00:00 2001
From: Samuel Dolt <samuel.dolt@netmodule.com>
Date: Wed, 31 May 2023 10:45:10 +0200
Subject: [PATCH] rename genimi to hw34
---
arch/arm/dts/Makefile | 4 ++--
arch/arm/dts/k3-am642-gemini-binman.dtsi | 4 ++--
.../{k3-am642-gemini-v1.dts => k3-am642-netmodule-hw34.dts} | 2 +-
...-am642-r5-gemini-v1.dts => k3-am642-r5-netmodule-hw34.dts} | 0
...emini_a53_defconfig => am64x_netmodule_hw34_a53_defconfig} | 2 +-
..._gemini_r5_defconfig => am64x_netmodule_hw34_r5_defconfig} | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
rename arch/arm/dts/{k3-am642-gemini-v1.dts => k3-am642-netmodule-hw34.dts} (99%)
rename arch/arm/dts/{k3-am642-r5-gemini-v1.dts => k3-am642-r5-netmodule-hw34.dts} (100%)
rename configs/{am64x_gemini_a53_defconfig => am64x_netmodule_hw34_a53_defconfig} (98%)
rename configs/{am64x_gemini_r5_defconfig => am64x_netmodule_hw34_r5_defconfig} (98%)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index b4a4b0982d..2f6f09a4f4 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1255,8 +1255,8 @@ dtb-$(CONFIG_SOC_K3_AM642) += k3-am642-evm.dtb \
k3-am642-r5-evm.dtb \
k3-am642-sk.dtb \
k3-am642-r5-sk.dtb \
- k3-am642-gemini-v1.dtb \
- k3-am642-r5-gemini-v1.dtb
+ k3-am642-netmodule-hw34.dtb \
+ k3-am642-r5-netmodule-hw34.dtb
dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-sk.dtb \
k3-am625-r5-sk.dtb
diff --git a/arch/arm/dts/k3-am642-gemini-binman.dtsi b/arch/arm/dts/k3-am642-gemini-binman.dtsi
index 38627882ea..a06dc706b3 100644
--- a/arch/arm/dts/k3-am642-gemini-binman.dtsi
+++ b/arch/arm/dts/k3-am642-gemini-binman.dtsi
@@ -13,10 +13,10 @@
#define UBOOT_IMG "u-boot.img"
#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
-#define SPL_AM642_GEMINI_DTB "spl/dts/k3-am642-gemini-v1.dtb"
+#define SPL_AM642_GEMINI_DTB "spl/dts/k3-am642-netmodule-hw34.dtb"
#define UBOOT_NODTB "u-boot-nodtb.bin"
-#define AM642_GEMINI_DTB "arch/arm/dts/k3-am642-gemini-v1.dtb"
+#define AM642_GEMINI_DTB "arch/arm/dts/k3-am642-netmodule-hw34.dtb"
&binman {
ti-spl {
diff --git a/arch/arm/dts/k3-am642-gemini-v1.dts b/arch/arm/dts/k3-am642-netmodule-hw34.dts
similarity index 99%
rename from arch/arm/dts/k3-am642-gemini-v1.dts
rename to arch/arm/dts/k3-am642-netmodule-hw34.dts
index d134e3a712..1608c3bf9d 100644
--- a/arch/arm/dts/k3-am642-gemini-v1.dts
+++ b/arch/arm/dts/k3-am642-netmodule-hw34.dts
@@ -12,7 +12,7 @@
#include "k3-am642.dtsi"
/ {
- compatible = "ti,am642-gemini", "ti,am642";
+ compatible = "netmodule,hw34", "ti,am642";
model = "NetModule AM642 based Gemini";
aliases {
diff --git a/arch/arm/dts/k3-am642-r5-gemini-v1.dts b/arch/arm/dts/k3-am642-r5-netmodule-hw34.dts
similarity index 100%
rename from arch/arm/dts/k3-am642-r5-gemini-v1.dts
rename to arch/arm/dts/k3-am642-r5-netmodule-hw34.dts
diff --git a/configs/am64x_gemini_a53_defconfig b/configs/am64x_netmodule_hw34_a53_defconfig
similarity index 98%
rename from configs/am64x_gemini_a53_defconfig
rename to configs/am64x_netmodule_hw34_a53_defconfig
index 900f29d7c1..acf5a340dc 100644
--- a/configs/am64x_gemini_a53_defconfig
+++ b/configs/am64x_netmodule_hw34_a53_defconfig
@@ -14,7 +14,7 @@ CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x3e0000
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="k3-am642-gemini-v1"
+CONFIG_DEFAULT_DEVICE_TREE="k3-am642-netmodule-hw34"
CONFIG_SPL_TEXT_BASE=0x80080000
CONFIG_SPL_MMC=y
CONFIG_SPL_SERIAL=y
diff --git a/configs/am64x_gemini_r5_defconfig b/configs/am64x_netmodule_hw34_r5_defconfig
similarity index 98%
rename from configs/am64x_gemini_r5_defconfig
rename to configs/am64x_netmodule_hw34_r5_defconfig
index 44c0364eef..c7e66a18e8 100644
--- a/configs/am64x_gemini_r5_defconfig
+++ b/configs/am64x_netmodule_hw34_r5_defconfig
@@ -11,7 +11,7 @@ CONFIG_TARGET_AM642_R5_GEMINI=y
CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
-CONFIG_DEFAULT_DEVICE_TREE="k3-am642-r5-gemini-v1"
+CONFIG_DEFAULT_DEVICE_TREE="k3-am642-r5-netmodule-hw34"
CONFIG_SPL_TEXT_BASE=0x70000000
CONFIG_SPL_MMC=y
CONFIG_SPL_SERIAL=y

26
layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule/0001-rename-k3-am642-gemini-v1.dts-to-k3-am642-netmodule-.patch
View File

@ -1,26 +0,0 @@
From 04d19014f019b6e5b3236b0f0d31d1df18ffeeca Mon Sep 17 00:00:00 2001
From: Samuel Dolt <samuel.dolt@netmodule.com>
Date: Wed, 24 May 2023 15:59:34 +0200
Subject: [PATCH] rename k3-am642-gemini-v1.dts to k3-am642-netmodule-hw34.dts
---
.../ti/{k3-am642-gemini-v1.dts => k3-am642-netmodule-hw34.dts} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename arch/arm64/boot/dts/ti/{k3-am642-gemini-v1.dts => k3-am642-netmodule-hw34.dts} (99%)
diff --git a/arch/arm64/boot/dts/ti/k3-am642-gemini-v1.dts b/arch/arm64/boot/dts/ti/k3-am642-netmodule-hw34.dts
similarity index 99%
rename from arch/arm64/boot/dts/ti/k3-am642-gemini-v1.dts
rename to arch/arm64/boot/dts/ti/k3-am642-netmodule-hw34.dts
index bc34523f7006..bca213661615 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-gemini-v1.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-netmodule-hw34.dts
@@ -13,7 +13,7 @@
#include "k3-am642.dtsi"
/ {
- compatible = "ti,am642-gemini-v1", "ti,am642";
+ compatible = "netmodule,hw34", "ti,am642";
model = "NetModule AM642 based GEMINI V1";
chosen {

5
layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-netmodule_git-5.10-ti.bb → layers/meta-netmodule-coreos-bsp/recipes-kernel/linux/linux-ti-coreos_git-5.10.bb
View File

@ -3,10 +3,9 @@ COMPATIBLE_MACHINE = "k3"
inherit kernel inherit kernel
SRC_URI = "git://gitlab.netmodule.intranet/oem-linux/linux-netmodule.git;protocol=ssh;user=git;branch=5.10/ti/base \ SRC_URI = "git://bitbucket.gad.local:7999/ico/ti-linux-kernel.git;protocol=ssh;user=git;branch=coreos/5.10 \
file://0001-rename-k3-am642-gemini-v1.dts-to-k3-am642-netmodule-.patch \
" "
SRCREV = "0417c6736055dcd90c7fc33b7bec5b77b647ab05" SRCREV = "1debdf5926e98255e7c97e3c160a91f3aa094ffc"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"