Am 11.04.19 um 07:03 schrieb Stefan Roese:
Hi Daniel,
On 10.04.19 21:36, Daniel Schwierzeck wrote:
Am 05.04.19 um 13:44 schrieb Stefan Roese:
This patch enables USB and file-system support on the LinkIt smart MT7688 module for both, the normal and the RAM default config.
Signed-off-by: Stefan Roese sr@denx.de Cc: Daniel Schwierzeck daniel.schwierzeck@gmail.com
configs/linkit-smart-7688-ram_defconfig | 14 +++++++++++++- configs/linkit-smart-7688_defconfig | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-)
there are now conflicts with current master branch. Could you check and resend?
Are you sure? I just rebased on the current master branch and it applies clean and the resulting patch is identical with the old one.
ok sorry, the conflict is only with u-boot-mips/next because of your previous patch "mips: mt76xx: linkit: Add mtd command support".
I've applied the patch on u-boot-mips/next. Could you check if the conflict resolution is correct? Thanks.