tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

MIPS: bcm3384: Rename "bcm3384" target to "bmips"

This platform is configured primarily through device tree, and we can
reuse the same code to support a bunch of other chips. Change the name
to reflect this.

[ralf@linux-mips.org: Fix conflicts with other patches.]

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: f.fainelli@gmail.com
Cc: jaedon.shin@gmail.com
Cc: abrestic@chromium.org
Cc: tglx@linutronix.de
Cc: jason@lakedaemon.net
Cc: jogo@openwrt.org
Cc: computersforpeace@gmail.com
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8838/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Kevin Cernekee and committed by
Ralf Baechle 5f2d4459 eb2236ea

+20 -20
+1 -1
arch/mips/Kbuild.platforms
··· 4 4 platforms += ar7 5 5 platforms += ath25 6 6 platforms += ath79 7 - platforms += bcm3384 8 7 platforms += bcm47xx 9 8 platforms += bcm63xx 9 + platforms += bmips 10 10 platforms += cavium-octeon 11 11 platforms += cobalt 12 12 platforms += dec
+6 -6
arch/mips/Kconfig
··· 134 134 help 135 135 Support for the Atheros AR71XX/AR724X/AR913X SoCs. 136 136 137 - config BCM3384 138 - bool "Broadcom BCM3384 based boards" 137 + config BMIPS_GENERIC 138 + bool "Broadcom Generic BMIPS kernel" 139 139 select BOOT_RAW 140 140 select NO_EXCEPT_FILL 141 141 select USE_OF ··· 155 155 select USB_OHCI_BIG_ENDIAN_DESC 156 156 select USB_OHCI_BIG_ENDIAN_MMIO 157 157 help 158 - Support for BCM3384 based boards. BCM3384/BCM33843 is a cable modem 159 - chipset with a Linux application processor that is often used to 160 - provide Samba services, a CUPS print server, and/or advanced routing 161 - features. 158 + Build a generic DT-based kernel image that boots on select 159 + BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top 160 + box chips. Note that CONFIG_CPU_BIG_ENDIAN/CONFIG_CPU_LITTLE_ENDIAN 161 + must be set appropriately for your board. 162 162 163 163 config BCM47XX 164 164 bool "Broadcom BCM47XX based boards"
arch/mips/bcm3384/Makefile arch/mips/bmips/Makefile
-7
arch/mips/bcm3384/Platform
··· 1 - # 2 - # Broadcom BCM3384 boards 3 - # 4 - platform-$(CONFIG_BCM3384) += bcm3384/ 5 - cflags-$(CONFIG_BCM3384) += \ 6 - -I$(srctree)/arch/mips/include/asm/mach-bcm3384/ 7 - load-$(CONFIG_BCM3384) := 0xffffffff80010000
arch/mips/bcm3384/dma.c arch/mips/bmips/dma.c
arch/mips/bcm3384/irq.c arch/mips/bmips/irq.c
+1 -1
arch/mips/bcm3384/setup.c arch/mips/bmips/setup.c
··· 33 33 34 34 const char *get_system_type(void) 35 35 { 36 - return "BCM3384"; 36 + return "Generic BMIPS kernel"; 37 37 } 38 38 39 39 void __init plat_time_init(void)
+7
arch/mips/bmips/Platform
··· 1 + # 2 + # Broadcom Generic BMIPS kernel 3 + # 4 + platform-$(CONFIG_BMIPS_GENERIC) += bmips/ 5 + cflags-$(CONFIG_BMIPS_GENERIC) += \ 6 + -I$(srctree)/arch/mips/include/asm/mach-bmips/ 7 + load-$(CONFIG_BMIPS_GENERIC) := 0xffffffff80010000
+1 -1
arch/mips/boot/dts/brcm/Makefile
··· 1 - dtb-$(CONFIG_BCM3384) += bcm93384wvg.dtb 1 + dtb-$(CONFIG_BMIPS_GENERIC) += bcm93384wvg.dtb 2 2 3 3 obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) 4 4
+1 -1
arch/mips/configs/bcm3384_defconfig arch/mips/configs/bmips_be_defconfig
··· 1 - CONFIG_BCM3384=y 1 + CONFIG_BMIPS_GENERIC=y 2 2 CONFIG_HIGHMEM=y 3 3 CONFIG_SMP=y 4 4 CONFIG_NR_CPUS=4
+3 -3
arch/mips/include/asm/mach-bcm3384/dma-coherence.h arch/mips/include/asm/mach-bmips/dma-coherence.h
··· 12 12 * GNU General Public License for more details. 13 13 */ 14 14 15 - #ifndef __ASM_MACH_BCM3384_DMA_COHERENCE_H 16 - #define __ASM_MACH_BCM3384_DMA_COHERENCE_H 15 + #ifndef __ASM_MACH_BMIPS_DMA_COHERENCE_H 16 + #define __ASM_MACH_BMIPS_DMA_COHERENCE_H 17 17 18 18 struct device; 19 19 ··· 45 45 return 0; 46 46 } 47 47 48 - #endif /* __ASM_MACH_BCM3384_DMA_COHERENCE_H */ 48 + #endif /* __ASM_MACH_BMIPS_DMA_COHERENCE_H */