summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spc300dini.c2
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/tools/mach-types1
-rw-r--r--cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c8
-rw-r--r--cleopatre/u-boot-1.1.6/include/asm-arm/mach-types.h13
4 files changed, 21 insertions, 3 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spc300dini.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spc300dini.c
index 25f9caa2c3..73d5190061 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spc300dini.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-spc300dini.c
@@ -230,7 +230,7 @@ static void __init spc300dini_init(void)
spc300_add_device_wdt();
}
-MACHINE_START(SPC300, "SPC300 DINI - ARM SPC300 based board")
+MACHINE_START(SPC300DINI, "SPC300 DINI - ARM SPC300 based board")
/* Maintainer: SPiDCOM Technologies */
.phys_io = ARM_APB_BASE,
.io_pg_offst = ((IO_ADDRESS(ARM_APB_BASE)) >> 18) & 0xfffc,
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/tools/mach-types b/cleopatre/linux-2.6.25.10-spc300/arch/arm/tools/mach-types
index fc7457f043..82008e4a4f 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/tools/mach-types
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/tools/mach-types
@@ -1612,3 +1612,4 @@ mt7108 MACH_MT7108 MT7108 1613
smtr2440 MACH_SMTR2440 SMTR2440 1614
manao MACH_MANAO MANAO 1615
spc300 MACH_SPC300 SPC300 2143
+spc300dini MACH_SPC300DINI SPC300DINI 2144
diff --git a/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c b/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c
index 254849f331..201ff99d56 100644
--- a/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c
+++ b/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c
@@ -138,8 +138,12 @@ int board_init (void)
/* NVRAM address will be passed to C from assembly start-up in reg r10 */
gd->bd->bi_nvram_addr = nvram_addr;
- /* arch number of SPiDCOM Board */
- gd->bd->bi_arch_number = MACH_TYPE_SPC300;
+ /* arch number of SPiDCOM Board */
+#ifdef CONFIG_CHIP_SPC300DINI
+ gd->bd->bi_arch_number = MACH_TYPE_SPC300DINI;
+#else
+ gd->bd->bi_arch_number = MACH_TYPE_SPC300;
+#endif /* CONFIG_CHIP_SPC300DINI */
/* address of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
diff --git a/cleopatre/u-boot-1.1.6/include/asm-arm/mach-types.h b/cleopatre/u-boot-1.1.6/include/asm-arm/mach-types.h
index 4c20bc5323..de93f9e5da 100644
--- a/cleopatre/u-boot-1.1.6/include/asm-arm/mach-types.h
+++ b/cleopatre/u-boot-1.1.6/include/asm-arm/mach-types.h
@@ -739,6 +739,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_PDNB3 1002
#define MACH_TYPE_ARIZONA 2143
#define MACH_TYPE_SPC300 2143
+#define MACH_TYPE_SPC300DINI 2144
#ifdef CONFIG_ARCH_EBSA110
# ifdef machine_arch_type
@@ -9416,6 +9417,18 @@ extern unsigned int __machine_arch_type;
# define machine_is_spc300() (0)
#endif
+#ifdef CONFIG_MACH_SPC300DINI
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SPC300DINI
+# endif
+# define machine_is_spc300dini() (machine_arch_type == MACH_TYPE_SPC300DINI)
+#else
+# define machine_is_spc300dini() (0)
+#endif
+
/*
* These have not yet been registered
*/