Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / include / configs / jadecpu.h

diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index a239efce2e765fd183491d496107a63002157c3c..7b9d36d5dfb193889d2e7843d18ce6725eef2aa7 100644 (file)
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -32,11 +32,14 @@
 #define CONFIG_SYS_TEXT_BASE   0x10000000
 
 #define CONFIG_ARM926EJS       1       /* This is an ARM926EJS Core    */
-#undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff  */
 
 #define CONFIG_USE_ARCH_MEMCPY
 #define CONFIG_USE_ARCH_MEMSET
 
+#define MACH_TYPE_JADECPU      2636
+
+#define CONFIG_MACH_TYPE MACH_TYPE_JADECPU
+
 /*
  * Environment settings
  */
@@ -126,7 +129,6 @@
 #undef CONFIG_CMD_XIMG
 
 #define CONFIG_CMD_BMP
-#define CONFIG_CMD_CAN
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
@@ -135,7 +137,6 @@
 #define CONFIG_CMD_CACHE
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* USB */
 #define CONFIG_USB_OHCI_NEW
@@ -179,7 +180,6 @@
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM + PHYS_SDRAM_SIZE)
 
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SYS_BAUDRATE_TABLE      {115200, 19200, 38400, 57600, 9600 }
 
 #define CONFIG_SYS_PROMPT      "jade> "
 #define CONFIG_SYS_CBSIZE      256
@@ -203,8 +203,6 @@
 #define CONFIG_SYS_MALLOC_LEN  (10 << 20)
 #define CONFIG_SYS_MEM_TOP_HIDE        (4 << 20)
 
-#define CONFIG_STACKSIZE       (32*1024)       /* regular stack */
-
 /*
  * Clock reset generator init
  */
@@ -291,8 +289,4 @@
 #define CONFIG_SYS_DDR2_INIT_DRIC1_10  0x0005
 #define CONFIG_SYS_DDR2_INIT_DRIC2_10  0x0002
 
-#ifdef CONFIG_USE_IRQ
-#error CONFIG_USE_IRQ not supported
-#endif
-
 #endif /* __CONFIG_H */