diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-11 08:04:26 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-11 08:04:26 -0500 |
| commit | 5b30997fd26f0e13837e9ba3cd289a037b8353bd (patch) | |
| tree | df8233b2d73eff88fcdf5d0d5f62da02cf498fa1 /include/configs/microblaze-generic.h | |
| parent | f401e907fcbc94adff1a8e8097c8f0a5b0aee580 (diff) | |
| parent | 7364dfe7bfca8632bfe02de5c333a64472812ebe (diff) | |
Merge tag 'xilinx-for-v2017.03' of git://www.denx.de/git/u-boot-microblaze
Xilinx changes for v2017.03
- ATF handoff
- DT syncups
- gem: Use wait_for_bit(), add simple clk support
- Simple clk driver for ZynqMP
- Other small changes
Diffstat (limited to 'include/configs/microblaze-generic.h')
| -rw-r--r-- | include/configs/microblaze-generic.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 7abffdb2ef0..36b0a0eb163 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -235,15 +235,13 @@ #define CONFIG_BOOTARGS "root=romfs" #define CONFIG_HOSTNAME XILINX_BOARD_NAME #define CONFIG_BOOTCOMMAND "base 0;tftp 11000000 image.img;bootm" -#define CONFIG_IPADDR 192.168.0.3 -#define CONFIG_SERVERIP 192.168.0.5 -#define CONFIG_GATEWAYIP 192.168.0.1 /* architecture dependent code */ #define CONFIG_SYS_USR_EXCEP /* user exception */ #define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv preboot;echo" +#ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" \ "nor0=flash-0\0"\ "mtdparts=mtdparts=flash-0:"\ @@ -253,6 +251,7 @@ "setenv stdin nc\0" \ "serial=setenv stdout serial;"\ "setenv stdin serial\0" +#endif #define CONFIG_CMDLINE_EDITING |