diff options
| author | Tom Rini <trini@konsulko.com> | 2018-07-02 16:11:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-02 16:11:09 -0400 |
| commit | d4c7a9348f27c8e3fdb1b754d8f0d1fa27375d1c (patch) | |
| tree | e4f82532c04d791c257ef6e5b202389103891777 /configs | |
| parent | 03b54997d568a6879a045ba775e44d62289a8fb9 (diff) | |
| parent | a9ea30d267f26bee0b3a5cdd659624a866da3d19 (diff) | |
| download | u-boot-d4c7a9348f27c8e3fdb1b754d8f0d1fa27375d1c.zip u-boot-d4c7a9348f27c8e3fdb1b754d8f0d1fa27375d1c.tar.gz u-boot-d4c7a9348f27c8e3fdb1b754d8f0d1fa27375d1c.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/ax25-ae350_defconfig | 1 | ||||
| -rw-r--r-- | configs/pengwyn_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/ax25-ae350_defconfig b/configs/ax25-ae350_defconfig index fc04c87..a328555 100644 --- a/configs/ax25-ae350_defconfig +++ b/configs/ax25-ae350_defconfig @@ -40,3 +40,4 @@ CONFIG_DM_SPI=y CONFIG_ATCSPI200_SPI=y CONFIG_TIMER=y CONFIG_ATCPIT100_TIMER=y +CONFIG_BOOTP_PREFER_SERVERIP=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 0ee8e6e..76b5715 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_CMD_WOL=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y |