Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69583551 authored by Álvaro Fernández Rojas's avatar Álvaro Fernández Rojas Committed by Ralf Baechle
Browse files

MIPS: BMIPS: rename bcm96358nb4ser to bcm6358-neufbox4-sercom 



The prefix bcm9* should only be used for reference and evaluation boards from
Broadcom.
Also adds missing console output to bootargs.

Signed-off-by: default avatarÁlvaro Fernández Rojas <noltari@gmail.com>
Cc: f.fainelli@gmail.com
Cc: jogo@openwrt.org
Cc: cernekee@gmail.com
Cc: robh@kernel.org
Cc: simon@fire.lp0.eu
Cc: john@phrozen.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13841/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 5035dd83

arch/mips/bmips/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ config DT_BCM93384WVG_VIPER 
	bool "BCM93384WVG Viper CPU (EXPERIMENTAL)"

	select BUILTIN_DTB



config DT_BCM96358NB4SER

	bool "BCM96358NB4SER"

	select BUILTIN_DTB



config DT_BCM96368MVWG

	bool "BCM96368MVWG"

	select BUILTIN_DTB
@@ -65,6 +61,10 @@ config DT_BCM97435SVMB 
	bool "BCM97435SVMB"

	select BUILTIN_DTB



config DT_SFR_NEUFBOX4_SERCOMM

	bool "SFR Neufbox 4 (Sercomm)"

	select BUILTIN_DTB



endchoice



endif

arch/mips/boot/dts/brcm/Makefile

+2 −1
Original line number Diff line number Diff line 
dtb-$(CONFIG_DT_BCM93384WVG)		+= bcm93384wvg.dtb

dtb-$(CONFIG_DT_BCM93384WVG_VIPER)	+= bcm93384wvg_viper.dtb

dtb-$(CONFIG_DT_BCM96358NB4SER)		+= bcm96358nb4ser.dtb

dtb-$(CONFIG_DT_BCM96368MVWG)		+= bcm96368mvwg.dtb

dtb-$(CONFIG_DT_BCM9EJTAGPRB)		+= bcm9ejtagprb.dtb

dtb-$(CONFIG_DT_BCM97125CBMB)		+= bcm97125cbmb.dtb
@@ -11,8 +10,10 @@ dtb-$(CONFIG_DT_BCM97362SVMB) += bcm97362svmb.dtb 
dtb-$(CONFIG_DT_BCM97420C)		+= bcm97420c.dtb

dtb-$(CONFIG_DT_BCM97425SVMB)		+= bcm97425svmb.dtb

dtb-$(CONFIG_DT_BCM97435SVMB)		+= bcm97435svmb.dtb

dtb-$(CONFIG_DT_SFR_NEUFBOX4_SERCOMM)	+= bcm6358-neufbox4-sercomm.dtb



dtb-$(CONFIG_DT_NONE) += \

	bcm6358-neufbox4-sercomm.dtb \

	bcm93384wvg.dtb \

	bcm93384wvg_viper.dtb \

	bcm96358nb4ser.dtb \

arch/mips/boot/dts/brcm/bcm96358nb4ser.dts→arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
	};



	chosen {

		bootargs = "console=ttyS0,115200";

		stdout-path = &uart0;

	};

};