aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArsalan H. Awan <Arsalan_Awan@mentor.com>2021-06-10 13:43:37 +0500
committerArsalan H. Awan <Arsalan_Awan@mentor.com>2021-06-10 13:52:05 +0500
commit3782213d77238bb4a9636c19a30a273c1ac78da9 (patch)
treeddeacd7ab2e115fbca4ad0563dc798630205d844
parentec52e64c6193fc5ccdee74d4f26a33e4bfe8604d (diff)
downloadmeta-amd-3782213d77238bb4a9636c19a30a273c1ac78da9.tar.gz
meta-amd-3782213d77238bb4a9636c19a30a273c1ac78da9.tar.bz2
meta-amd-3782213d77238bb4a9636c19a30a273c1ac78da9.zip
bsp: merge milan & rome into single bsp ethanolx as they use same board
This merges the milan and rome bsps into a single bsp called ethanolx as they make use of the same motherboard and the serial uart console device is also the same (i.e. ttyS0) on both platforms. This allows us to use the same binary images on both platforms. Signed-off-by: Arsalan H. Awan <Arsalan_Awan@mentor.com>
-rw-r--r--meta-amd-bsp/conf/machine/ethanolx.conf (renamed from meta-amd-bsp/conf/machine/milan.conf)4
-rw-r--r--meta-amd-bsp/conf/machine/rome.conf12
-rw-r--r--meta-amd-bsp/recipes-bsp/formfactor/formfactor/ethanolx/machconfig (renamed from meta-amd-bsp/recipes-bsp/formfactor/formfactor/rome/machconfig)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-ethanolx_5.10.inc (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-milan_5.10.inc)2
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rome_5.10.inc3
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.4/linux-yocto-ethanolx_5.4.inc (renamed from meta-amd-bsp/recipes-kernel/linux-5.4/linux-yocto-rome_5.4.inc)2
6 files changed, 4 insertions, 19 deletions
diff --git a/meta-amd-bsp/conf/machine/milan.conf b/meta-amd-bsp/conf/machine/ethanolx.conf
index 2d6dac9f..a3e64f97 100644
--- a/meta-amd-bsp/conf/machine/milan.conf
+++ b/meta-amd-bsp/conf/machine/ethanolx.conf
@@ -1,7 +1,7 @@
#@TYPE: Machine
-#@NAME: milan
+#@NAME: ethanolx
-#@DESCRIPTION: Machine configuration for milan systems
+#@DESCRIPTION: Machine configuration for ethanolx (i.e. rome & milan) systems
require conf/machine/include/amdx86.inc
diff --git a/meta-amd-bsp/conf/machine/rome.conf b/meta-amd-bsp/conf/machine/rome.conf
deleted file mode 100644
index 1859880d..00000000
--- a/meta-amd-bsp/conf/machine/rome.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#@TYPE: Machine
-#@NAME: rome
-
-#@DESCRIPTION: Machine configuration for rome systems
-
-require conf/machine/include/amdx86.inc
-
-# Setup a getty on all serial ports
-SERIAL_CONSOLES = "115200;ttyS0"
-
-# Enable the kernel console on ttyS0/COM0
-KERNEL_SERIAL_CONSOLE ?= "console=ttyS0,115200n8"
diff --git a/meta-amd-bsp/recipes-bsp/formfactor/formfactor/rome/machconfig b/meta-amd-bsp/recipes-bsp/formfactor/formfactor/ethanolx/machconfig
index 28ca080e..28ca080e 100644
--- a/meta-amd-bsp/recipes-bsp/formfactor/formfactor/rome/machconfig
+++ b/meta-amd-bsp/recipes-bsp/formfactor/formfactor/ethanolx/machconfig
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-milan_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-ethanolx_5.10.inc
index 246647e2..614df797 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-milan_5.10.inc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-ethanolx_5.10.inc
@@ -1,3 +1,3 @@
require linux-yocto-amdx86_5.10.inc
-COMPATIBLE_MACHINE = "milan"
+COMPATIBLE_MACHINE = "ethanolx"
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rome_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rome_5.10.inc
deleted file mode 100644
index 86c530a6..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rome_5.10.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require linux-yocto-amdx86_5.10.inc
-
-COMPATIBLE_MACHINE = "rome"
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.4/linux-yocto-rome_5.4.inc b/meta-amd-bsp/recipes-kernel/linux-5.4/linux-yocto-ethanolx_5.4.inc
index f5361a7a..c1cf9826 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.4/linux-yocto-rome_5.4.inc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.4/linux-yocto-ethanolx_5.4.inc
@@ -1,3 +1,3 @@
require linux-yocto-amdx86_5.4.inc
-COMPATIBLE_MACHINE = "rome"
+COMPATIBLE_MACHINE = "ethanolx"