--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -120,6 +120,22 @@ config BCM63XX
 	help
 	 Support for BCM63XX based boards
 
+config AMAZON
+	bool "Amazon support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	select DMA_NONCOHERENT
+	select IRQ_CPU
+	select CEVT_R4K
+	select CSRC_R4K
+	select SYS_HAS_CPU_MIPS32_R1
+	select SYS_HAS_CPU_MIPS32_R2
+	select HAVE_STD_PC_SERIAL_PORT
+	select SYS_SUPPORTS_BIG_ENDIAN
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_HAS_EARLY_PRINTK
+	select HW_HAS_PCI
+	select SWAP_IO_SPACE
+
 config MIPS_COBALT
 	bool "Cobalt Server"
 	select CEVT_R4K
@@ -813,6 +829,7 @@ config NLM_XLP_BOARD
 
 endchoice
 
+source "arch/mips/amazon/Kconfig"
 source "arch/mips/alchemy/Kconfig"
 source "arch/mips/ath79/Kconfig"
 source "arch/mips/bcm47xx/Kconfig"
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -6,6 +6,7 @@ platforms += ath79
 platforms += bcm47xx
 platforms += bcm63xx
 platforms += cavium-octeon
+platforms += amazon
 platforms += cobalt
 platforms += dec
 platforms += emma
--- /dev/null
+++ b/arch/mips/amazon/Platform
@@ -0,0 +1,7 @@
+#
+# Infineon AMAZON boards
+#
+platform-$(CONFIG_AMAZON)	+= amazon/
+cflags-$(CONFIG_AMAZON)	+=					\
+		-I$(srctree)/arch/mips/include/asm/mach-amazon
+load-$(CONFIG_AMAZON)		:= 0xffffffff80002000