From 31e5d533a83bcb9ddae649dfad22467f3bc93734 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 27 May 2009 18:07:53 +0000
Subject: [PATCH] Make amazon build again.
SVN-Revision: 16118
---
target/linux/amazon/Makefile | 2 --
target/linux/amazon/config-2.6.21 | 10 ----------
.../amazon/files/include/asm-mips/amazon/amazon.h | 8 ++++----
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/target/linux/amazon/Makefile b/target/linux/amazon/Makefile
index 576f8508b9..cca8a415fa 100644
--- a/target/linux/amazon/Makefile
+++ b/target/linux/amazon/Makefile
@@ -18,6 +18,4 @@ define Target/Description
Build firmware images for Infineon Amazon boards
endef
-KERNELNAME:="uImage"
-
$(eval $(call BuildTarget))
diff --git a/target/linux/amazon/config-2.6.21 b/target/linux/amazon/config-2.6.21
index 790202f2ea..da338fda3e 100644
--- a/target/linux/amazon/config-2.6.21
+++ b/target/linux/amazon/config-2.6.21
@@ -9,10 +9,7 @@ CONFIG_AMAZON_PCI=y
CONFIG_AMAZON_WDT=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ATM is not set
-# CONFIG_ATMEL is not set
CONFIG_BASE_SMALL=0
-# CONFIG_BCM43XX is not set
CONFIG_BITREVERSE=y
CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/bin/sh"
CONFIG_CPU_BIG_ENDIAN=y
@@ -48,7 +45,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_EARLY_PRINTK=y
-CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
# CONFIG_GENERIC_GPIO is not set
# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
@@ -56,15 +52,11 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAVE_STD_PC_SERIAL_PORT=y
-# CONFIG_HERMES is not set
-# CONFIG_HOSTAP is not set
CONFIG_HW_HAS_PCI=y
CONFIG_HW_RANDOM=y
# CONFIG_I2C is not set
# CONFIG_IDE is not set
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
CONFIG_IRQ_CPU=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -128,7 +120,6 @@ CONFIG_NET_SCH_FIFO=y
# CONFIG_PNPACPI is not set
# CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PRISM54 is not set
# CONFIG_RTC is not set
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
# CONFIG_SERIAL_8250 is not set
@@ -154,4 +145,3 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
# CONFIG_TOSHIBA_RBTX4938 is not set
CONFIG_TRAD_SIGNALS=y
# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB is not set
diff --git a/target/linux/amazon/files/include/asm-mips/amazon/amazon.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon.h
index d28bb418f1..56e6943f66 100644
--- a/target/linux/amazon/files/include/asm-mips/amazon/amazon.h
+++ b/target/linux/amazon/files/include/asm-mips/amazon/amazon.h
@@ -999,10 +999,10 @@ If set and clear bit are written concurrently with 1, the associated bit is not
#define AMAZON_DMA_H_MASK 0x00000fff
/***External Interrupt Control Register***/
-#define AMAZON_ICU_EXTINTCR (AMAZON_ICU + 0x0000)
-#define AMAZON_ICU_IRNICR (AMAZON_ICU + 0x0004)
-#define AMAZON_ICU_IRNCR (AMAZON_ICU + 0x0008)
-#define AMAZON_ICU_IRNEN (AMAZON_ICU + 0x000c)
+#define AMAZON_ICU_EXTINTCR ((volatile u32*)(AMAZON_ICU + 0x0000))
+#define AMAZON_ICU_IRNICR ((volatile u32*)(AMAZON_ICU + 0x0004))
+#define AMAZON_ICU_IRNCR ((volatile u32*)(AMAZON_ICU + 0x0008))
+#define AMAZON_ICU_IRNEN ((volatile u32*)(AMAZON_ICU + 0x000c))
/***********************************************************************/
/* Module : PCI/Card-BUS/PC-Card register address and bits */
--
GitLab