8 files changed, 18 insertions, 62 deletions
diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h
index 44b4ca5bd5..3ffcab20df 100644
--- a/include/asm-m68k/types.h
+++ b/include/asm-m68k/types.h
@@ -21,7 +21,7 @@ __extension__ typedef unsigned long long __u64;
 
 typedef struct {
 	__u32 u[4];
-} __attribute((aligned(16))) vector128;
+} __attribute__((aligned(16))) vector128;
 
 #ifdef __KERNEL__
 /*
diff --git a/include/asm-ppc/types.h b/include/asm-ppc/types.h
index 864391f03b..b27a6b753a 100644
--- a/include/asm-ppc/types.h
+++ b/include/asm-ppc/types.h
@@ -21,7 +21,7 @@ __extension__ typedef unsigned long long __u64;
 
 typedef struct {
 	__u32 u[4];
-} __attribute((aligned(16))) vector128;
+} __attribute__((aligned(16))) vector128;
 
 #ifdef __KERNEL__
 /*
diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h
index 2cf974a7a9..0a8a26c597 100644
--- a/include/asm-sparc/types.h
+++ b/include/asm-sparc/types.h
@@ -42,7 +42,7 @@ typedef unsigned long long __u64;
 
 typedef struct {
 	__u32 u[4];
-} __attribute((aligned(16))) vector128;
+} __attribute__((aligned(16))) vector128;
 
 #ifdef __KERNEL__
 /*
diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h
index b71da1fbf0..fe04f27a17 100644
--- a/include/configs/AmigaOneG3SE.h
+++ b/include/configs/AmigaOneG3SE.h
@@ -85,7 +85,7 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_FDC
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_CONSOLE|
+#define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_USB
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_PCI
diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index fbcbddb408..51e012cc46 100644
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -262,63 +262,8 @@
  */
 #if defined(CONFIG_CMD_NAND)
 
-#define CONFIG_NAND_LEGACY
 #define CONFIG_SYS_NAND0_BASE 0xE1000000
-
 #define CONFIG_SYS_MAX_NAND_DEVICE     1       /* Max number of NAND devices           */
-#define SECTORSIZE 512
-#define NAND_NO_RB
-
-#define ADDR_COLUMN 1
-#define ADDR_PAGE 2
-#define ADDR_COLUMN_PAGE 3
-
-#define NAND_ChipID_UNKNOWN     0x00
-#define NAND_MAX_FLOORS 1
-
-#define NAND_DISABLE_CE(nand) do \
-{ \
-	*(((volatile __u8 *)(nand->IO_ADDR)) + 0xc) = 0; \
-} while(0)
-
-#define NAND_ENABLE_CE(nand) do \
-{ \
-	*(((volatile __u8 *)(nand->IO_ADDR)) + 0x8) = 0; \
-} while(0)
-
-#define NAND_CTL_CLRALE(nandptr) do \
-{ \
-	*(((volatile __u8 *)nandptr) + 0x8) = 0; \
-} while(0)
-
-#define NAND_CTL_SETALE(nandptr) do \
-{ \
-	*(((volatile __u8 *)nandptr) + 0x9) = 0; \
-} while(0)
-
-#define NAND_CTL_CLRCLE(nandptr) do \
-{ \
-	*(((volatile __u8 *)nandptr) + 0x8) = 0; \
-} while(0)
-
-#define NAND_CTL_SETCLE(nandptr) do \
-{ \
-	*(((volatile __u8 *)nandptr) + 0xa) = 0; \
-} while(0)
-
-#ifdef NAND_NO_RB
-/* constant delay (see also tR in the datasheet) */
-#define NAND_WAIT_READY(nand) do { \
-	udelay(12); \
-} while (0)
-#else
-/* use the R/B pin */
-#endif
-
-#define WRITE_NAND_COMMAND(d, adr) do{ *(volatile __u8 *)((unsigned long)(adr + 0x2)) = (__u8)(d); } while(0)
-#define WRITE_NAND_ADDRESS(d, adr) do{ *(volatile __u8 *)((unsigned long)(adr + 0x1)) = (__u8)(d); } while(0)
-#define WRITE_NAND(d, adr) do{ *(volatile __u8 *)((unsigned long)(adr + 0x0)) = (__u8)d; } while(0)
-#define READ_NAND(adr) ((volatile unsigned char)(*(volatile __u8 *)(unsigned long)(adr + 0x0)))
 
 #endif /* CONFIG_CMD_NAND */
 
diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index f7ebdaad72..477a1c5821 100644
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -162,7 +162,7 @@
 #undef	CONFIG_SYS_RAMBOOT
 #endif
 
-#define CONFIG_SYS_MONITOR_LEN		(256 * 1024) /* Reserve 256 kB for Mon */
+#define CONFIG_SYS_MONITOR_LEN		(384 * 1024) /* Reserve 384 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN		(128 * 1024) /* Reserved for malloc */
 
 /*
@@ -339,7 +339,7 @@
 
 #ifndef CONFIG_SYS_RAMBOOT
 #define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_ENV_SECT_SIZE	0x20000 /* 128K(one sector) for env */
 #define CONFIG_ENV_SIZE		0x20000
 #else /* CONFIG_SYS_RAMBOOT */
diff --git a/include/configs/vct.h b/include/configs/vct.h
index d202522bd5..fe679974c0 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -61,7 +61,18 @@
 /*
  * UART
  */
-#define CONFIG_VCT_SERIAL
+#ifdef CONFIG_VCT_PLATINUMAVC
+#define UART_1_BASE		0xBDC30000
+#else
+#define UART_1_BASE		0xBF89C000
+#endif
+
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_REG_SIZE	-4
+#define CONFIG_SYS_NS16550_COM1		UART_1_BASE
+#define CONFIG_CONS_INDEX		1
+#define CONFIG_SYS_NS16550_CLK		921600
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
diff --git a/include/sa1100.h b/include/sa1100.h
deleted file mode 100644
index e69de29bb2..0000000000
--- a/include/sa1100.h
+++ /dev/null