---

yaml
---
r: 28105
b: refs/heads/master
c: 74617fb
h: refs/heads/master
i:
  28103: e73e576
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 695a9d236a6fd5a60557a02eff612880c37fe731
+refs/heads/master: 74617fb6b825ea370ae72565f7543306bc08ef6e

trunk/arch/arm/Kconfig

@@ -275,12 +275,6 @@ config ARCH_PNX4008
 	help
 	  This enables support for Philips PNX4008 mobile platform.
 
-config ARCH_NETX
-	bool "Hilscher NetX based"
-	select ARM_VIC
-	help
-	  This enables support for systems based on the Hilscher NetX Soc
-
 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
@@ -325,8 +319,6 @@ source "arch/arm/mach-realview/Kconfig"
 
 source "arch/arm/mach-at91rm9200/Kconfig"
 
-source "arch/arm/mach-netx/Kconfig"
-
 # Definitions to make life easier
 config ARCH_ACORN
 	bool

trunk/arch/arm/Makefile

@@ -117,7 +117,6 @@ endif
  machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200
  machine-$(CONFIG_ARCH_EP93XX)     := ep93xx
  machine-$(CONFIG_ARCH_PNX4008)    := pnx4008
- machine-$(CONFIG_ARCH_NETX)       := netx
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)
 # This is what happens if you forget the IOCS16 line.

trunk/arch/arm/boot/compressed/head-at91rm9200.S

@@ -49,18 +49,6 @@
 		cmp	r7, r3
 		beq	99f
 
-		@ Embest ATEB9200 : 923
-		mov	r3,	#(MACH_TYPE_ATEB9200 & 0xff)
-		orr	r3, r3,	#(MACH_TYPE_ATEB9200 & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ Sperry-Sun KAFA : 662
-		mov	r3,	#(MACH_TYPE_KAFA & 0xff)
-		orr	r3, r3,	#(MACH_TYPE_KAFA & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
 		@ Unknown board, use the AT91RM9200DK board
 		@ mov	r7, #MACH_TYPE_AT91RM9200
 		mov	r7,	#(MACH_TYPE_AT91RM9200DK & 0xff)