diff options
| author | Tom Rini | 2019-05-04 20:02:31 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-05-04 20:02:42 -0400 |
| commit | 86f578ee85a697afb980233312f9aac1d98816df (patch) | |
| tree | c15c40d7885eac1dff3bdd1e3236e9d42e26c820 /configs | |
| parent | c9baea6d0e96eb4bf55061d516e91e22236ed198 (diff) | |
| parent | 5c629b1b69f780540e6e3bcc57d29438749f97c5 (diff) | |
Merge tag 'mips-pull-2019-05-03' of git://git.denx.de/u-boot-mips
- mscc: small fixes, enhance network support for Serval, Luton and Ocelot
- mt7620: rename arch to more generic name mtmips
- mips: pass initrd addresses via DT as physical addresses
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/gardena-smart-gateway-mt7688-ram_defconfig | 2 | ||||
| -rw-r--r-- | configs/gardena-smart-gateway-mt7688_defconfig | 2 | ||||
| -rw-r--r-- | configs/linkit-smart-7688-ram_defconfig | 2 | ||||
| -rw-r--r-- | configs/linkit-smart-7688_defconfig | 2 | ||||
| -rw-r--r-- | configs/mscc_serval_defconfig | 6 |
5 files changed, 9 insertions, 5 deletions
diff --git a/configs/gardena-smart-gateway-mt7688-ram_defconfig b/configs/gardena-smart-gateway-mt7688-ram_defconfig index 7c8ae0f6474..e09950637ff 100644 --- a/configs/gardena-smart-gateway-mt7688-ram_defconfig +++ b/configs/gardena-smart-gateway-mt7688-ram_defconfig @@ -1,7 +1,7 @@ CONFIG_MIPS=y CONFIG_SYS_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_ARCH_MT7620=y +CONFIG_ARCH_MTMIPS=y # CONFIG_MIPS_BOOT_ENV_LEGACY is not set CONFIG_MIPS_BOOT_FDT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig index 8fd676025aa..ad0db2e7235 100644 --- a/configs/gardena-smart-gateway-mt7688_defconfig +++ b/configs/gardena-smart-gateway-mt7688_defconfig @@ -1,7 +1,7 @@ CONFIG_MIPS=y CONFIG_SYS_TEXT_BASE=0x9c000000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_ARCH_MT7620=y +CONFIG_ARCH_MTMIPS=y CONFIG_BOOT_ROM=y CONFIG_ONBOARD_DDR2_SIZE_1024MBIT=y CONFIG_ONBOARD_DDR2_CHIP_WIDTH_16BIT=y diff --git a/configs/linkit-smart-7688-ram_defconfig b/configs/linkit-smart-7688-ram_defconfig index 6e9aa7adefc..c2502b27139 100644 --- a/configs/linkit-smart-7688-ram_defconfig +++ b/configs/linkit-smart-7688-ram_defconfig @@ -1,7 +1,7 @@ CONFIG_MIPS=y CONFIG_SYS_TEXT_BASE=0x80010000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_ARCH_MT7620=y +CONFIG_ARCH_MTMIPS=y CONFIG_BOARD_LINKIT_SMART_7688=y # CONFIG_MIPS_BOOT_ENV_LEGACY is not set CONFIG_MIPS_BOOT_FDT=y diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig index 5660f41e8e3..fba1bfd653c 100644 --- a/configs/linkit-smart-7688_defconfig +++ b/configs/linkit-smart-7688_defconfig @@ -1,7 +1,7 @@ CONFIG_MIPS=y CONFIG_SYS_TEXT_BASE=0x9c000000 CONFIG_NR_DRAM_BANKS=1 -CONFIG_ARCH_MT7620=y +CONFIG_ARCH_MTMIPS=y CONFIG_BOARD_LINKIT_SMART_7688=y CONFIG_BOOT_ROM=y CONFIG_ONBOARD_DDR2_SIZE_1024MBIT=y diff --git a/configs/mscc_serval_defconfig b/configs/mscc_serval_defconfig index 146188bb0c9..753a11aa122 100644 --- a/configs/mscc_serval_defconfig +++ b/configs/mscc_serval_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi_flash" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi_flash:1m(UBoot),256k(Env),256k(Env.bk)" @@ -58,3 +57,8 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_LZMA=y +CONFIG_CMD_DHCP=y +# CONFIG_NET_TFTP_VARS is not set +# CONFIG_CMD_NFS is not set +CONFIG_CMD_PING=y +CONFIG_MSCC_SERVAL_SWITCH=y |