uboot-mediatek: update configs for MT7622 devies

 * make sure USB 2.0 works (useful for UEFI-booting eg. memtest86)
 * include more useful U-Boot config options on BPi-R64.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

2 files changed, 48 insertions, 4 deletions

diff --git a/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch b/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch
index 2fb2d3aa8f..5a7101a7fe 100644
--- a/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch
+++ b/package/boot/uboot-mediatek/patches/403-add-bananapi_bpi-r64_defconfigs.patch
@@ -1,9 +1,10 @@
 --- /dev/null
 +++ b/configs/mt7622_bananapi_bpi-r64-sdmmc_defconfig
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,144 @@
 +CONFIG_ARM=y
 +CONFIG_POSITION_INDEPENDENT=y
 +CONFIG_ARCH_MEDIATEK=y
++CONFIG_TARGET_MT7622=y
 +CONFIG_SYS_TEXT_BASE=0x41e00000
 +CONFIG_SYS_MALLOC_F_LEN=0x4000
 +CONFIG_USE_DEFAULT_ENV_FILE=y
@@ -13,6 +14,7 @@
 +CONFIG_DEBUG_UART_BASE=0x11002000
 +CONFIG_DEBUG_UART_CLOCK=25000000
 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-bananapi-bpi-r64"
++CONFIG_OF_LIBFDT_OVERLAY=y
 +CONFIG_DEBUG_UART=y
 +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r64-sdmmc_env"
 +CONFIG_NET_RANDOM_ETHADDR=y
@@ -23,6 +25,7 @@
 +CONFIG_CFB_CONSOLE_ANSI=y
 +CONFIG_BUTTON=y
 +CONFIG_BUTTON_GPIO=y
++CONFIG_GPIO_HOG=y
 +CONFIG_CMD_ENV_FLAGS=y
 +CONFIG_FIT=y
 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
@@ -36,6 +39,7 @@
 +CONFIG_CMD_BOOTMENU=y
 +CONFIG_CMD_BOOTP=y
 +CONFIG_CMD_BUTTON=y
++CONFIG_CMD_CACHE=y
 +CONFIG_CMD_CDP=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_DNS=y
@@ -59,6 +63,7 @@
 +CONFIG_CMD_SF_TEST=y
 +CONFIG_CMD_PING=y
 +CONFIG_CMD_PXE=y
++CONFIG_CMD_PWM=y
 +CONFIG_CMD_SMC=y
 +CONFIG_CMD_TFTPBOOT=y
 +CONFIG_CMD_TFTPSRV=y
@@ -70,6 +75,7 @@
 +CONFIG_CMD_SLEEP=y
 +CONFIG_CMD_SNTP=y
 +CONFIG_CMD_SOURCE=y
++CONFIG_CMD_STRINGS=y
 +CONFIG_CMD_USB=y
 +CONFIG_CMD_UUID=y
 +CONFIG_DISPLAY_CPUINFO=y
@@ -78,6 +84,8 @@
 +CONFIG_DM_REGULATOR_FIXED=y
 +CONFIG_DM_REGULATOR_GPIO=y
 +CONFIG_DM_USB=y
++CONFIG_DM_PWM=y
++CONFIG_PWM_MTK=y
 +CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -93,7 +101,17 @@
 +CONFIG_REGMAP=y
 +CONFIG_SYSCON=y
 +CONFIG_CLK=y
++CONFIG_DM_GPIO=y
++CONFIG_DM_SCSI=y
++CONFIG_AHCI=y
++CONFIG_AHCI_PCI=y
++CONFIG_SCSI_AHCI=y
++CONFIG_SCSI=y
++CONFIG_CMD_SCSI=y
++CONFIG_PHY=y
++CONFIG_PHY_MTK_TPHY=y
 +CONFIG_PHY_FIXED=y
++# CONFIG_MTK_AHCI is not set
 +CONFIG_DM_ETH=y
 +CONFIG_MEDIATEK_ETH=y
 +CONFIG_PCI=y
@@ -111,7 +129,9 @@
 +CONFIG_MTK_SERIAL=y
 +CONFIG_MMC=y
 +CONFIG_MMC_DEFAULT_DEV=1
++CONFIG_MMC_HS200_SUPPORT=y
 +CONFIG_MMC_MTK=y
++CONFIG_MMC_SUPPORTS_TUNING=y
 +CONFIG_SUPPORT_EMMC_BOOT=y
 +CONFIG_SYSRESET_WATCHDOG=y
 +CONFIG_WDT_MTK=y
@@ -184,10 +204,11 @@
 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
 --- /dev/null
 +++ b/configs/mt7622_bananapi_bpi-r64-emmc_defconfig
-@@ -0,0 +1,125 @@
+@@ -0,0 +1,144 @@
 +CONFIG_ARM=y
 +CONFIG_POSITION_INDEPENDENT=y
 +CONFIG_ARCH_MEDIATEK=y
++CONFIG_TARGET_MT7622=y
 +CONFIG_SYS_TEXT_BASE=0x41e00000
 +CONFIG_SYS_MALLOC_F_LEN=0x4000
 +CONFIG_USE_DEFAULT_ENV_FILE=y
@@ -197,8 +218,9 @@
 +CONFIG_DEBUG_UART_BASE=0x11002000
 +CONFIG_DEBUG_UART_CLOCK=25000000
 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-bananapi-bpi-r64"
++CONFIG_OF_LIBFDT_OVERLAY=y
 +CONFIG_DEBUG_UART=y
-+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r64-emmc_env"
++CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r64-sdmmc_env"
 +CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_SMBIOS_PRODUCT_NAME=""
 +CONFIG_AUTOBOOT_KEYED=y
@@ -207,6 +229,7 @@
 +CONFIG_CFB_CONSOLE_ANSI=y
 +CONFIG_BUTTON=y
 +CONFIG_BUTTON_GPIO=y
++CONFIG_GPIO_HOG=y
 +CONFIG_CMD_ENV_FLAGS=y
 +CONFIG_FIT=y
 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
@@ -220,6 +243,7 @@
 +CONFIG_CMD_BOOTMENU=y
 +CONFIG_CMD_BOOTP=y
 +CONFIG_CMD_BUTTON=y
++CONFIG_CMD_CACHE=y
 +CONFIG_CMD_CDP=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_DNS=y
@@ -243,6 +267,7 @@
 +CONFIG_CMD_SF_TEST=y
 +CONFIG_CMD_PING=y
 +CONFIG_CMD_PXE=y
++CONFIG_CMD_PWM=y
 +CONFIG_CMD_SMC=y
 +CONFIG_CMD_TFTPBOOT=y
 +CONFIG_CMD_TFTPSRV=y
@@ -254,6 +279,7 @@
 +CONFIG_CMD_SLEEP=y
 +CONFIG_CMD_SNTP=y
 +CONFIG_CMD_SOURCE=y
++CONFIG_CMD_STRINGS=y
 +CONFIG_CMD_USB=y
 +CONFIG_CMD_UUID=y
 +CONFIG_DISPLAY_CPUINFO=y
@@ -262,6 +288,8 @@
 +CONFIG_DM_REGULATOR_FIXED=y
 +CONFIG_DM_REGULATOR_GPIO=y
 +CONFIG_DM_USB=y
++CONFIG_DM_PWM=y
++CONFIG_PWM_MTK=y
 +CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -277,7 +305,17 @@
 +CONFIG_REGMAP=y
 +CONFIG_SYSCON=y
 +CONFIG_CLK=y
++CONFIG_DM_GPIO=y
++CONFIG_DM_SCSI=y
++CONFIG_AHCI=y
++CONFIG_AHCI_PCI=y
++CONFIG_SCSI_AHCI=y
++CONFIG_SCSI=y
++CONFIG_CMD_SCSI=y
++CONFIG_PHY=y
++CONFIG_PHY_MTK_TPHY=y
 +CONFIG_PHY_FIXED=y
++# CONFIG_MTK_AHCI is not set
 +CONFIG_DM_ETH=y
 +CONFIG_MEDIATEK_ETH=y
 +CONFIG_PCI=y
@@ -295,6 +333,7 @@
 +CONFIG_MTK_SERIAL=y
 +CONFIG_MMC=y
 +CONFIG_MMC_DEFAULT_DEV=0
++CONFIG_MMC_HS200_SUPPORT=y
 +CONFIG_MMC_MTK=y
 +CONFIG_MMC_SUPPORTS_TUNING=y
 +CONFIG_SUPPORT_EMMC_BOOT=y
diff --git a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch
index e78641e8fe..9fe83725b3 100644
--- a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch
+++ b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch
@@ -1,9 +1,10 @@
 --- /dev/null
 +++ b/configs/mt7622_linksys_e8450_defconfig
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,133 @@
 +CONFIG_ARM=y
 +CONFIG_POSITION_INDEPENDENT=y
 +CONFIG_ARCH_MEDIATEK=y
++CONFIG_TARGET_MT7622=y
 +CONFIG_SYS_TEXT_BASE=0x41e00000
 +CONFIG_SYS_MALLOC_F_LEN=0x4000
 +CONFIG_USE_DEFAULT_ENV_FILE=y
@@ -22,6 +23,7 @@
 +CONFIG_CFB_CONSOLE_ANSI=y
 +CONFIG_BUTTON=y
 +CONFIG_BUTTON_GPIO=y
++CONFIG_GPIO_HOG=y
 +CONFIG_CMD_ENV_FLAGS=y
 +CONFIG_FIT=y
 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
@@ -95,6 +97,9 @@
 +CONFIG_SYSCON=y
 +CONFIG_CLK=y
 +CONFIG_DM_MTD=y
++CONFIG_DM_GPIO=y
++CONFIG_PHY=y
++CONFIG_PHY_MTK_TPHY=y
 +CONFIG_PHY_FIXED=y
 +CONFIG_DM_ETH=y
 +CONFIG_MEDIATEK_ETH=y