diff options
| author | Tom Rini <trini@ti.com> | 2013-04-30 09:58:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-01 10:37:35 -0400 |
| commit | 92daa4d2cff74d35a8b479c27a419025a464533f (patch) | |
| tree | 7ea40acf8c6aa7301643e67acc53418050a9a00a /include | |
| parent | 19fe4b3e3122071fbe6481df05bd819405e1983e (diff) | |
| parent | 0f21f98dd4d6bff72df4eeaca4163779896cb336 (diff) | |
| download | u-boot-92daa4d2cff74d35a8b479c27a419025a464533f.tar.gz u-boot-92daa4d2cff74d35a8b479c27a419025a464533f.tar.bz2 u-boot-92daa4d2cff74d35a8b479c27a419025a464533f.zip | |
Merge branch 'microblaze' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/microblaze-generic.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index d172e56bcf..0c4e7193ba 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -120,6 +120,14 @@ # define CONFIG_SYS_TIMER_0_IRQ XILINX_TIMER_IRQ #endif +/* watchdog */ +#if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ) +# define CONFIG_WATCHDOG_BASEADDR XILINX_WATCHDOG_BASEADDR +# define CONFIG_WATCHDOG_IRQ XILINX_WATCHDOG_IRQ +# define CONFIG_HW_WATCHDOG +# define CONFIG_XILINX_TB_WATCHDOG +#endif + /* * memory layout - Example * CONFIG_SYS_TEXT_BASE = 0x1200_0000; defined in config.mk @@ -414,10 +422,17 @@ "nor0=flash-0\0"\ "mtdparts=mtdparts=flash-0:"\ "256k(u-boot),256k(env),3m(kernel),"\ - "1m(romfs),1m(cramfs),-(jffs2)\0" + "1m(romfs),1m(cramfs),-(jffs2)\0"\ + "nc=setenv stdout nc;"\ + "setenv stdin nc\0" \ + "serial=setenv stdout serial;"\ + "setenv stdin serial\0" #define CONFIG_CMDLINE_EDITING +#define CONFIG_NETCONSOLE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV + /* Use the HUSH parser */ #define CONFIG_SYS_HUSH_PARSER |