From e5845e21224dbe2fe47b11f1cdf95de7f84be7cb Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 28 Mar 2008 11:04:01 +0100 Subject: microblaze: ML401 and XUPV2P remove emac and emaclite reference Signed-off-by: Michal Simek --- include/configs/xupv2p.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'include/configs/xupv2p.h') diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h index c9320c287c2..eef4f72e28e 100644 --- a/include/configs/xupv2p.h +++ b/include/configs/xupv2p.h @@ -36,10 +36,6 @@ #define CONFIG_BAUDRATE XILINX_UART_BAUDRATE #define CFG_BAUDRATE_TABLE { CONFIG_BAUDRATE } -/* ethernet */ -#define CONFIG_EMAC 1 -#define XPAR_EMAC_0_DEVICE_ID XPAR_XEMAC_NUM_INSTANCES - /* * setting reset address * @@ -51,6 +47,16 @@ */ /* #define CFG_RESET_ADDRESS 0x36000000 */ +/* ethernet */ +#ifdef XILINX_EMAC_BASEADDR +#define CONFIG_XILINX_EMAC 1 +#else +#ifdef XILINX_EMACLITE_BASEADDR +#define CONFIG_XILINX_EMACLITE 1 +#endif +#endif +#undef ET_DEBUG + /* gpio */ #ifdef XILINX_GPIO_BASEADDR #define CFG_GPIO_0 1 -- cgit v1.2.3 From af7ae1a411c67ee9d17a66d17ce50b374f3dd4e7 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 28 Mar 2008 12:13:03 +0100 Subject: microblaze: clean uart16550 and uartlite handling Signed-off-by: Michal Simek --- include/configs/xupv2p.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'include/configs/xupv2p.h') diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h index eef4f72e28e..f86b3b9549d 100644 --- a/include/configs/xupv2p.h +++ b/include/configs/xupv2p.h @@ -31,10 +31,23 @@ #define CONFIG_XUPV2P 1 /* uart */ +#ifdef XILINX_UARTLITE_BASEADDR #define CONFIG_XILINX_UARTLITE -#define CONFIG_SERIAL_BASE XILINX_UART_BASEADDR -#define CONFIG_BAUDRATE XILINX_UART_BAUDRATE +#define CONFIG_SERIAL_BASE XILINX_UARTLITE_BASEADDR +#define CONFIG_BAUDRATE XILINX_UARTLITE_BAUDRATE #define CFG_BAUDRATE_TABLE { CONFIG_BAUDRATE } +#else +#ifdef XILINX_UART16550_BASEADDR +#define CFG_NS16550 +#define CFG_NS16550_SERIAL +#define CFG_NS16550_REG_SIZE 4 +#define CONFIG_CONS_INDEX 1 +#define CFG_NS16550_COM1 XILINX_UART16550_BASEADDR +#define CFG_NS16550_CLK XILINX_UART16550_CLOCK_HZ +#define CONFIG_BAUDRATE 115200 +#define CFG_BAUDRATE_TABLE { 9600, 115200 } +#endif +#endif /* * setting reset address -- cgit v1.2.3 From cf5c679ca04a6b54bf53a55b8b9c29335b387287 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 28 Mar 2008 12:47:19 +0100 Subject: microblaze: xupv2p fix config file for supporting FDT --- include/configs/xupv2p.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/configs/xupv2p.h') diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h index f86b3b9549d..30fb303c961 100644 --- a/include/configs/xupv2p.h +++ b/include/configs/xupv2p.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007 Michal Simek + * (C) Copyright 2007-2008 Michal Simek * * Michal SIMEK * @@ -156,6 +156,7 @@ #include #undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_IMLS #define CONFIG_CMD_ASKENV @@ -203,4 +204,7 @@ #define CONFIG_DOS_PARTITION #endif +#define CONFIG_CMDLINE_EDITING +#define CONFIG_OF_LIBFDT 1 /* flat device tree */ + #endif /* __CONFIG_H */ -- cgit v1.2.3