X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fboot%2Fuboot-mediatek%2Fpatches%2F412-add-ubnt-unifi-6-lr.patch;h=6c35e07870279661374e88982468ed3b2fae18c8;hb=3d5c5427e17a870041e0c94b6fbbfb9301cd2c70;hp=3e7dacc3b38101a93cac1d249e0065e1c98053f9;hpb=5b605f4b51b9049a1a610a10abb6c5726b469338;p=openwrt%2Fstaging%2Fnoltari.git

diff --git a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
index 3e7dacc3b3..6c35e07870 100644
--- a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
+++ b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/configs/mt7622_ubnt_unifi-6-lr_defconfig
-@@ -0,0 +1,142 @@
+@@ -0,0 +1,143 @@
 +CONFIG_ARM=y
 +CONFIG_POSITION_INDEPENDENT=y
 +CONFIG_ARCH_MEDIATEK=y
@@ -143,6 +143,7 @@
 +CONFIG_SPI_FLASH_WINBOND=y
 +CONFIG_SPI_FLASH_XMC=y
 +CONFIG_SPI_FLASH_USE_4K_SECTORS=y
++CONFIG_SYS_HAS_NONCACHED_MEMORY=y
 --- /dev/null
 +++ b/arch/arm/dts/mt7622-ubnt-unifi-6-lr.dts
 @@ -0,0 +1,187 @@
@@ -335,7 +336,7 @@
 +};
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -1232,6 +1232,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
+@@ -1264,6 +1264,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
  	mt7623a-unielec-u7623-02-emmc.dtb \
  	mt7622-bananapi-bpi-r64.dtb \
  	mt7622-linksys-e8450-ubi.dtb \
@@ -398,7 +399,7 @@
 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"
 --- a/common/board_r.c
 +++ b/common/board_r.c
-@@ -65,6 +65,7 @@
+@@ -66,6 +66,7 @@
  #include <asm-generic/gpio.h>
  #include <efi_loader.h>
  #include <relocate.h>
@@ -406,7 +407,7 @@
  
  DECLARE_GLOBAL_DATA_PTR;
  
-@@ -409,6 +410,20 @@ static int initr_onenand(void)
+@@ -412,6 +413,20 @@ static int initr_onenand(void)
  }
  #endif
  
@@ -427,7 +428,7 @@
  #ifdef CONFIG_MMC
  static int initr_mmc(void)
  {
-@@ -714,6 +729,9 @@ static init_fnc_t init_sequence_r[] = {
+@@ -720,6 +735,9 @@ static init_fnc_t init_sequence_r[] = {
  #ifdef CONFIG_NMBM_MTD
  	initr_nmbm,
  #endif