From 9db592fab19f9251a44b177bb15cef355fd6f1ed Mon Sep 17 00:00:00 2001
From: Andrea Righi <andrea.righi@canonical.com>
Date: Mon, 3 Oct 2022 15:50:27 +0200
Subject: [PATCH] UBUNTU: [Config] update toolchain configs after rebase to 6.0

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 2 +-
 debian.master/config/arm64/config.common.arm64     | 2 +-
 debian.master/config/armhf/config.common.armhf     | 2 +-
 debian.master/config/config.common.ubuntu          | 1 -
 debian.master/config/ppc64el/config.common.ppc64el | 2 +-
 debian.master/config/riscv64/config.common.riscv64 | 2 +-
 debian.master/config/s390x/config.common.s390x     | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 86c047eaaf28..f64dc66c606c 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -59,7 +59,7 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
-CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc (Ubuntu 12.2.0-1ubuntu1) 12.2.0"
+CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0"
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CMA is not set
 CONFIG_CMDLINE_PARTITION=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index e434eefd5e1e..5da2e318a25c 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -61,7 +61,7 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 12.2.0-1ubuntu1) 12.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0"
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE="console=ttyAMA0"
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 364d3278ab7d..b8f8f2c7a2cc 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -56,7 +56,7 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
-CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 12.2.0-1ubuntu1) 12.2.0"
+CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0"
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 765b6fa6c0b7..be1630cd2bbe 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5619,7 +5619,6 @@ CONFIG_IWLDVM=m
 CONFIG_IWLEGACY=m
 # CONFIG_IWLEGACY_DEBUG is not set
 CONFIG_IWLEGACY_DEBUGFS=y
-CONFIG_IWLMEI=m
 CONFIG_IWLMVM=m
 CONFIG_IWLWIFI=m
 # CONFIG_IWLWIFI_DEBUG is not set
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index fff56cb90a6a..43443d759b7f 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -55,7 +55,7 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
-CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (Ubuntu 12.2.0-1ubuntu1) 12.2.0"
+CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0"
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index af73818d038b..4355196eed43 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -54,7 +54,7 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
-CONFIG_CC_VERSION_TEXT="riscv64-linux-gnu-gcc (Ubuntu 12.2.0-1ubuntu1) 12.2.0"
+CONFIG_CC_VERSION_TEXT="riscv64-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0"
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 276ef6779134..5700f2754be1 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -45,7 +45,7 @@ CONFIG_AUTOFS_FS=y
 # CONFIG_CAIF is not set
 # CONFIG_CAN is not set
 # CONFIG_CB710_CORE is not set
-CONFIG_CC_VERSION_TEXT="s390x-linux-gnu-gcc (Ubuntu 12.2.0-1ubuntu1) 12.2.0"
+CONFIG_CC_VERSION_TEXT="s390x-linux-gnu-gcc (Ubuntu 12.2.0-2ubuntu1) 12.2.0"
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_CMA=y
 # CONFIG_CMDLINE_PARTITION is not set