Merge git://git.denx.de/u-boot-net

[oweals/u-boot.git] / include / configs / pm9g45.h

diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 7cf735005da8609dbd3d9d8e39acf1bcc520103f..5e58b6b021cb4f8b663173b8a9bfc2700b8bb960 100644 (file)
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -25,7 +25,6 @@
 #define CONFIG_PM9G45          1       /* It's an Ronetix PM9G45 */
 #define CONFIG_SYS_AT91_CPU_NAME       "AT91SAM9G45"
 
-#define MACH_TYPE_PM9G45       2672
 #define CONFIG_MACH_TYPE       MACH_TYPE_PM9G45
 
 /* ARM asynchronous clock */
@@ -70,7 +69,6 @@
  */
 #define CONFIG_CMD_NAND                1
 
-#define CONFIG_CMD_JFFS2               1
 #define CONFIG_JFFS2_CMDLINE           1
 #define CONFIG_JFFS2_NAND              1
 #define CONFIG_JFFS2_DEV               "nand0" /* NAND dev jffs2 lives on */
@@ -82,9 +80,6 @@
 #define PHYS_SDRAM                     0x70000000
 #define PHYS_SDRAM_SIZE                        0x08000000      /* 128 megs */
 
-/* NOR flash, not available */
-#define CONFIG_SYS_NO_FLASH            1
-
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
 #define CONFIG_NAND_ATMEL
@@ -137,8 +132,6 @@
                                "2M(linux)ro,-(root) rw " \
                                "rootfstype=jffs2"
 
-#define CONFIG_BAUDRATE                        115200
-
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \