Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[platform/kernel/u-boot.git] / include / configs / jadecpu.h

diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index a239efc..d0609f6 100644 (file)
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -4,23 +4,7 @@
  *
  * Configuation settings for the jadecpu board
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -32,11 +16,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
  */
@@ -65,7 +52,6 @@
 /*
  * Serial
  */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE            (-4)
@@ -126,7 +112,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 +120,6 @@
 #define CONFIG_CMD_CACHE
 
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 /* USB */
 #define CONFIG_USB_OHCI_NEW
@@ -179,7 +163,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 +186,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 +272,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 */