summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c4
-rw-r--r--cleopatre/u-boot-1.1.6/include/asm-arm/mach-types.h13
2 files changed, 16 insertions, 1 deletions
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 b3b79ea5f7..84c4ae5bf5 100644
--- a/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c
+++ b/cleopatre/u-boot-1.1.6/board/sdk300/sdk300.c
@@ -140,9 +140,11 @@ int board_init (void)
/* arch number of SPiDCOM Board */
#ifdef CONFIG_CHIP_MSE500DINI_300
gd->bd->bi_arch_number = MACH_TYPE_MSE500DINI_300;
+#elif defined(CONFIG_CHIP_MSE500)
+ gd->bd->bi_arch_number = MACH_TYPE_MSE500;
#else
gd->bd->bi_arch_number = MACH_TYPE_SPC300;
-#endif /* CONFIG_CHIP_MSE500DINI_300 */
+#endif
/* 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 84ae29dc09..4461dbf71e 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
@@ -740,6 +740,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_ARIZONA 2143
#define MACH_TYPE_SPC300 2143
#define MACH_TYPE_MSE500DINI_300 2144
+#define MACH_TYPE_MSE500 2145
#ifdef CONFIG_ARCH_EBSA110
# ifdef machine_arch_type
@@ -9429,6 +9430,18 @@ extern unsigned int __machine_arch_type;
# define machine_is_mse500dini_300() (0)
#endif
+#ifdef CONFIG_MACH_MSE500
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MSE500
+# endif
+# define machine_is_mse500() (machine_arch_type == MACH_TYPE_MSE500)
+#else
+# define machine_is_mse500() (0)
+#endif
+
/*
* These have not yet been registered
*/