Commit 6ad13599 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'armsoc-drop-netx-v5.3' of... 

Merge tag 'armsoc-drop-netx-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/soc

This deletes the NetX 100/500 machine support.

After discussing with the subarch maintainers and Hilscher,
we concluded that the netx subarchitecture (Netx 100/500)
is no longer maintained or tested, and noone will miss it
if we delete it. So delete it.

There is a newer Netx 4000 architecture which we may see
included at some point, but this will be supported using
the standard multiplatform and devicetree mechanisms and is
easier to develop from scratch.

* tag 'armsoc-drop-netx-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: delete netx machine

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9e0babf2 ceb02dcf

arch/arm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -374,15 +374,6 @@ config ARCH_FOOTBRIDGE 
	  Support for systems based on the DC21285 companion chip

	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.



config ARCH_NETX

	bool "Hilscher NetX based"

	select ARM_VIC

	select CLKSRC_MMIO

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	help

	  This enables support for systems based on the Hilscher NetX Soc



config ARCH_IOP13XX

	bool "IOP13xx-based"

	depends on MMU
@@ -767,8 +758,6 @@ source "arch/arm/mach-mvebu/Kconfig" 


source "arch/arm/mach-mxs/Kconfig"



source "arch/arm/mach-netx/Kconfig"



source "arch/arm/mach-nomadik/Kconfig"



source "arch/arm/mach-npcm/Kconfig"

arch/arm/Kconfig.debug

+0 −7
Original line number Diff line number Diff line
@@ -638,13 +638,6 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  for Mediatek mt8135 based platforms on UART3.



	config DEBUG_NETX_UART

		bool "Kernel low-level debugging messages via NetX UART"

		depends on ARCH_NETX

		help

		  Say Y here if you want kernel low-level debugging support

		  on Hilscher NetX based platforms.



	config DEBUG_NOMADIK_UART

		bool "Kernel low-level debugging messages via NOMADIK UART"

		depends on ARCH_NOMADIK

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ machine-$(CONFIG_ARCH_MXC) += imx 
machine-$(CONFIG_ARCH_MEDIATEK)		+= mediatek

machine-$(CONFIG_ARCH_MILBEAUT)		+= milbeaut

machine-$(CONFIG_ARCH_MXS)		+= mxs

machine-$(CONFIG_ARCH_NETX)		+= netx

machine-$(CONFIG_ARCH_NOMADIK)		+= nomadik

machine-$(CONFIG_ARCH_NPCM)		+= npcm

machine-$(CONFIG_ARCH_NSPIRE)		+= nspire

arch/arm/configs/netx_defconfig

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_ARCH_NETX=y

CONFIG_MACH_NXDKN=y

CONFIG_MACH_NXDB500=y

CONFIG_MACH_NXEB500HMI=y

CONFIG_PREEMPT=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySMX0,115200"

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPGRE=m

CONFIG_SYN_COOKIES=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m

CONFIG_NETFILTER=y

CONFIG_NET_PKTGEN=m

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PLATRAM=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_NET_NETX=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_SERIAL_NETX=y

CONFIG_SERIAL_NETX_CONSOLE=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_RTC_CLASS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRC_CCITT=m

CONFIG_LIBCRC32C=m

arch/arm/include/debug/netx.S

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/*

 * Debugging macro include header

 *

 *  Copyright (C) 1994-1999 Russell King

 *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

*/



#define UART_DATA 0

#define UART_FLAG 0x18

#define UART_FLAG_BUSY (1 << 3)



		.macro	addruart, rp, rv, tmp

		ldr	\rp, =CONFIG_DEBUG_UART_PHYS

		ldr	\rv, =CONFIG_DEBUG_UART_VIRT

		.endm



		.macro	senduart,rd,rx

		str	\rd, [\rx, #UART_DATA]

		.endm



		.macro	busyuart,rd,rx

1002:		ldr	\rd, [\rx, #UART_FLAG]

		tst	\rd, #UART_FLAG_BUSY

		bne	1002b

		.endm



		.macro	waituart,rd,rx

1001:		ldr	\rd, [\rx, #UART_FLAG]

		tst	\rd, #UART_FLAG_BUSY

		bne	1001b

		.endm

CRA Git | Maintained and supported by SUSTech CRA and CCSE