summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Hatch <jhatch@multitech.com>2023-02-14 08:45:14 -0600
committerJeff Hatch <jhatch@multitech.com>2023-02-14 08:45:14 -0600
commita6b65f50f232939e6ac6b81ca227daa07e0c8997 (patch)
tree35f4df73276ea9bb7fdfea6571b4009225a68168
parentce555f419b1f3a7ac63f7e33f7c17fe4ac5f7594 (diff)
parent62870dd27cd5e505a99c64a58cf348f8b6a3f112 (diff)
downloadmeta-multitech-atmel-a6b65f50f232939e6ac6b81ca227daa07e0c8997.tar.gz
meta-multitech-atmel-a6b65f50f232939e6ac6b81ca227daa07e0c8997.tar.bz2
meta-multitech-atmel-a6b65f50f232939e6ac6b81ca227daa07e0c8997.zip
Merge branch 'sv/gp-1878' into '6'
MTCDT : Silent Mode is ON, but there are many entries in the debug console duriā€¦ See merge request !34
-rw-r--r--recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcap.dts1
-rw-r--r--recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcdt.dts1
-rw-r--r--recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtr.dts1
-rw-r--r--recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtre.dts1
-rw-r--r--recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtrv1.dts1
-rw-r--r--recipes-kernel/linux/linux-at91_5.4.199.bb2
6 files changed, 6 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcap.dts b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcap.dts
index 730ce0b..e9f7f84 100644
--- a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcap.dts
+++ b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcap.dts
@@ -40,6 +40,7 @@
};
chosen {
+ /delete-property/ stdout-path;
bootargs = "mem=256M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2";
};
diff --git a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcdt.dts b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcdt.dts
index ed76ce1..b707328 100644
--- a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcdt.dts
+++ b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtcdt.dts
@@ -26,6 +26,7 @@
};
chosen {
+ /delete-property/ stdout-path;
bootargs = "mem=256M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2";
};
diff --git a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtr.dts b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtr.dts
index 5129950..3fc3cbf 100644
--- a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtr.dts
+++ b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtr.dts
@@ -40,6 +40,7 @@
};
chosen {
+ /delete-property/ stdout-path;
bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2";
};
diff --git a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtre.dts b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtre.dts
index 92296df..2c87d38 100644
--- a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtre.dts
+++ b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtre.dts
@@ -40,6 +40,7 @@
};
chosen {
+ /delete-property/ stdout-path;
bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2";
};
diff --git a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtrv1.dts b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtrv1.dts
index 7c68492..44104ee 100644
--- a/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtrv1.dts
+++ b/recipes-kernel/linux/linux-at91-5.4.199/mts-dts/mtrv1.dts
@@ -42,6 +42,7 @@
};
chosen {
+ /delete-property/ stdout-path;
bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2";
};
diff --git a/recipes-kernel/linux/linux-at91_5.4.199.bb b/recipes-kernel/linux/linux-at91_5.4.199.bb
index eecd1af..8647ed4 100644
--- a/recipes-kernel/linux/linux-at91_5.4.199.bb
+++ b/recipes-kernel/linux/linux-at91_5.4.199.bb
@@ -17,7 +17,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
SRCREV = "ae7a63c21ca8d85578db1acef1dae5a5c803a8a3"
SRCREV_sama7g5ek = "d67f0979dcc377863060e803a2280b7a7e1a22c0"
-PR = "r1"
+PR = "r2"
KERNEL_VERSION = "${PV}"
KERNEL_REVISION = "${PR}"
EXTRAVERSION = ""