[MIPS] TXx9: Reorganize code (22b1d707) · Commits · 戴 / test

arch/mips/Kconfig

+1 −2

Original line number	Diff line number	Diff line
		@@ -642,8 +642,7 @@ source "arch/mips/lasat/Kconfig"
		source "arch/mips/pmc-sierra/Kconfig"
		source "arch/mips/sgi-ip27/Kconfig"
		source "arch/mips/sibyte/Kconfig"
		source "arch/mips/tx4927/Kconfig"
		source "arch/mips/tx4938/Kconfig"
		source "arch/mips/txx9/Kconfig"
		source "arch/mips/vr41xx/Kconfig"

		endmenu

arch/mips/Makefile

+6 −6

Original line number	Diff line number	Diff line
		@@ -553,8 +553,8 @@ all-$(CONFIG_SNI_RM) := vmlinux.ecoff
		#
		# Toshiba JMR-TX3927 board
		#
		core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/jmr3927/rbhma3100/ \
		arch/mips/jmr3927/common/
		core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/txx9/jmr3927/ \
		arch/mips/txx9/generic/
		cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
		load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000

		@@ -562,16 +562,16 @@ load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000
		# Toshiba RBTX4927 board or
		# Toshiba RBTX4937 board
		#
		core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/toshiba_rbtx4927/
		core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/tx4927/common/
		core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/txx9/rbtx4927/
		core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/txx9/generic/
		cflags-$(CONFIG_TOSHIBA_RBTX4927) += -Iinclude/asm-mips/mach-tx49xx
		load-$(CONFIG_TOSHIBA_RBTX4927) += 0xffffffff80020000

		#
		# Toshiba RBTX4938 board
		#
		core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/
		core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/
		core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/
		core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/generic/
		cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
		load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000

arch/mips/jmr3927/common/Makefile

deleted100644 → 0

+0 −7

Original line number	Diff line number	Diff line
		#
		# Makefile for the common code of TOSHIBA JMR-TX3927 board
		#

		obj-y += prom.o puts.o

		EXTRA_CFLAGS += -Werror

arch/mips/jmr3927/common/puts.c

deleted100644 → 0

+0 −60

Original line number	Diff line number	Diff line
		/*
		*
		* BRIEF MODULE DESCRIPTION
		* Low level uart routines to directly access a TX[34]927 SIO.
		*
		* Copyright 2001 MontaVista Software Inc.
		* Author: MontaVista Software, Inc.
		* ahennessy@mvista.com or source@mvista.com
		*
		* Copyright (C) 2000-2001 Toshiba Corporation
		*
		* Based on arch/mips/au1000/common/puts.c
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the
		* Free Software Foundation; either version 2 of the License, or (at your
		* option) any later version.
		*
		* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
		* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
		* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
		* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
		* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
		* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
		* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
		* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*
		* You should have received a copy of the GNU General Public License along
		* with this program; if not, write to the Free Software Foundation, Inc.,
		* 675 Mass Ave, Cambridge, MA 02139, USA.
		*/

		#include <asm/jmr3927/tx3927.h>

		#define TIMEOUT 0xffffff

		void
		prom_putchar(char c)
		{
		int i = 0;

		do {
		i++;
		if (i>TIMEOUT)
		break;
		} while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS));
		tx3927_sioptr(1)->tfifo = c;
		return;
		}

		void
		puts(const char *cp)
		{
		while (*cp)
		prom_putchar(*cp++);
		prom_putchar('\r');
		prom_putchar('\n');
		}

arch/mips/pci/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
		obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
		obj-$(CONFIG_TOSHIBA_JMR3927) += fixup-jmr3927.o pci-jmr3927.o
		obj-$(CONFIG_TOSHIBA_RBTX4927) += fixup-rbtx4927.o ops-tx4927.o
		obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-tx4938.o ops-tx4938.o
		obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-rbtx4938.o ops-tx4938.o
		obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
		obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
		obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o

Admin message