ramips: fix the number of uarts for each SoC

- Use default number of uarts (2) for rt288x/rt305x/rt3883/mt7620.
- Allow up to 3 uarts on MT7621 and MT7628.
- Remove unneeded SERIAL_8250_RT288X for MT7628.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/ramips/mt7620/config-4.4 b/target/linux/ramips/mt7620/config-4.4
index 4bc890ca842f59ff2fac2448cea9a8f9fa40ebab..cd90484e1e0f7c3d6ddc733daeacad337f405b0d 100644 (file)
--- a/target/linux/ramips/mt7620/config-4.4
+++ b/target/linux/ramips/mt7620/config-4.4
@@ -180,7 +180,6 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_SCHED_INFO is not set
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SOC_MT7620=y

diff --git a/target/linux/ramips/mt7621/config-4.4 b/target/linux/ramips/mt7621/config-4.4
index 862c8e977e294e6eb38f23b280eb8c984c5158ac..58568c8114c738b41604205b95a1d1a308eba3a9 100644 (file)
--- a/target/linux/ramips/mt7621/config-4.4
+++ b/target/linux/ramips/mt7621/config-4.4
@@ -218,7 +218,8 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=3
+CONFIG_SERIAL_8250_RUNTIME_UARTS=3
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SMP=y
 CONFIG_SMP_UP=y

diff --git a/target/linux/ramips/mt7628/config-4.4 b/target/linux/ramips/mt7628/config-4.4
index ef282b5f007ef542a6b7497ec33d50e72612c8a5..6b04457f1786cf90fbf043726637784967f83dd2 100644 (file)
--- a/target/linux/ramips/mt7628/config-4.4
+++ b/target/linux/ramips/mt7628/config-4.4
@@ -177,8 +177,8 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_SCHED_INFO is not set
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_NR_UARTS=3
+CONFIG_SERIAL_8250_RUNTIME_UARTS=3
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SOC_MT7620=y
 # CONFIG_SOC_MT7621 is not set

diff --git a/target/linux/ramips/rt288x/config-4.4 b/target/linux/ramips/rt288x/config-4.4
index 9c86e80da509b4c1efbd1888575b89aa7b72f48c..94e4cdde5376ac4fe503687ee91b26402d5f5fe6 100644 (file)
--- a/target/linux/ramips/rt288x/config-4.4
+++ b/target/linux/ramips/rt288x/config-4.4
@@ -164,7 +164,6 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_SCHED_INFO is not set
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SOC_MT7620 is not set

diff --git a/target/linux/ramips/rt305x/config-4.4 b/target/linux/ramips/rt305x/config-4.4
index 4c14e3724c9f817668c9361e2b838f37b53f2c0b..9911d9249ea9f1268e056db5d7b45742302a47e8 100644 (file)
--- a/target/linux/ramips/rt305x/config-4.4
+++ b/target/linux/ramips/rt305x/config-4.4
@@ -166,7 +166,6 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_SCHED_INFO is not set
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SOC_MT7620 is not set

diff --git a/target/linux/ramips/rt3883/config-4.4 b/target/linux/ramips/rt3883/config-4.4
index b25face30c187e84a9cb455f10a9cc3baf5941bb..26f0fd9cdb931e46c842b2a0959e766f74e10a55 100644 (file)
--- a/target/linux/ramips/rt3883/config-4.4
+++ b/target/linux/ramips/rt3883/config-4.4
@@ -174,7 +174,6 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_SCHED_INFO is not set
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RT288X=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SOC_MT7620 is not set