package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch

   1 --- /dev/null
   2 +++ b/configs/mt7622_ubnt_unifi-6-lr_defconfig
   3 @@ -0,0 +1,141 @@
   4 +CONFIG_ARM=y
   5 +CONFIG_POSITION_INDEPENDENT=y
   6 +CONFIG_ARCH_MEDIATEK=y
   7 +CONFIG_TARGET_MT7622=y
   8 +CONFIG_SYS_TEXT_BASE=0x41e00000
   9 +CONFIG_SYS_MALLOC_F_LEN=0x4000
  10 +CONFIG_SYS_LOAD_ADDR=0x40080000
  11 +CONFIG_USE_DEFAULT_ENV_FILE=y
  12 +CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:128k(bl2),640k(fip),64k(u-boot-env),256k(factory),64k(eeprom),15232k(recovery),-(firmware)"
  13 +CONFIG_ENV_IS_IN_MTD=y
  14 +CONFIG_ENV_MTD_NAME="nor0"
  15 +CONFIG_ENV_SIZE_REDUND=0x4000
  16 +CONFIG_ENV_SIZE=0x4000
  17 +CONFIG_ENV_OFFSET=0xc0000
  18 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  19 +CONFIG_BOARD_LATE_INIT=y
  20 +CONFIG_RESET_BUTTON_SETTLE_DELAY=400
  21 +CONFIG_BOOTP_SEND_HOSTNAME=y
  22 +CONFIG_DEFAULT_ENV_FILE="ubnt_unifi-6-lr_env"
  23 +CONFIG_DEBUG_UART_BASE=0x11002000
  24 +CONFIG_DEBUG_UART_CLOCK=25000000
  25 +CONFIG_DEFAULT_DEVICE_TREE="mt7622-ubnt-unifi-6-lr"
  26 +CONFIG_DEBUG_UART=y
  27 +CONFIG_SMBIOS_PRODUCT_NAME=""
  28 +CONFIG_AUTOBOOT_KEYED=y
  29 +CONFIG_BOOTDELAY=30
  30 +CONFIG_AUTOBOOT_MENU_SHOW=y
  31 +CONFIG_CFB_CONSOLE_ANSI=y
  32 +CONFIG_BUTTON=y
  33 +CONFIG_BUTTON_GPIO=y
  34 +CONFIG_GPIO_HOG=y
  35 +CONFIG_CMD_ENV_FLAGS=y
  36 +CONFIG_FIT=y
  37 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
  38 +CONFIG_LOGLEVEL=7
  39 +CONFIG_LOG=y
  40 +CONFIG_DEFAULT_FDT_FILE="mt7622-ubnt-unifi-6-lr"
  41 +CONFIG_SYS_PROMPT="MT7622> "
  42 +# CONFIG_LEGACY_IMAGE_FORMAT is not set
  43 +# CONFIG_BOOTM_PLAN9 is not set
  44 +# CONFIG_BOOTM_RTEMS is not set
  45 +# CONFIG_BOOTM_VXWORKS is not set
  46 +# CONFIG_EFI is not set
  47 +# CONFIG_EFI_LOADER is not set
  48 +CONFIG_CMD_BOOTMENU=y
  49 +# CONFIG_CMD_BOOTEFI is not set
  50 +CONFIG_CMD_BOOTP=y
  51 +CONFIG_CMD_BUTTON=y
  52 +CONFIG_CMD_CDP=y
  53 +CONFIG_CMD_DHCP=y
  54 +CONFIG_CMD_DNS=y
  55 +CONFIG_CMD_ECHO=y
  56 +# CONFIG_CMD_ELF is not set
  57 +# CONFIG_CMD_BOOTEFI_BOOTMGR is not set
  58 +CONFIG_CMD_ENV_READMEM=y
  59 +CONFIG_CMD_ERASEENV=y
  60 +CONFIG_CMD_GPIO=y
  61 +CONFIG_CMD_HASH=y
  62 +CONFIG_CMD_ITEST=y
  63 +CONFIG_CMD_LED=y
  64 +CONFIG_CMD_LINK_LOCAL=y
  65 +# CONFIG_CMD_MBR is not set
  66 +CONFIG_CMD_MTD=y
  67 +CONFIG_CMD_MTDPART=y
  68 +# CONFIG_CMD_PCI is not set
  69 +CONFIG_CMD_SF_TEST=y
  70 +CONFIG_CMD_PING=y
  71 +CONFIG_CMD_PXE=y
  72 +CONFIG_CMD_SMC=y
  73 +CONFIG_CMD_TFTPBOOT=y
  74 +CONFIG_CMD_TFTPSRV=y
  75 +# CONFIG_CMD_UNLZ4 is not set
  76 +CONFIG_CMD_ASKENV=y
  77 +CONFIG_CMD_PSTORE=y
  78 +CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
  79 +CONFIG_CMD_RARP=y
  80 +CONFIG_CMD_SETEXPR=y
  81 +CONFIG_CMD_SLEEP=y
  82 +CONFIG_CMD_SOURCE=y
  83 +CONFIG_CMD_UUID=y
  84 +CONFIG_DISPLAY_CPUINFO=y
  85 +CONFIG_DM_ETH=y
  86 +CONFIG_DM_ETH_PHY=y
  87 +CONFIG_DM_GPIO=y
  88 +CONFIG_DM_MDIO=y
  89 +CONFIG_DM_MTD=y
  90 +CONFIG_DM_REGULATOR=y
  91 +CONFIG_DM_REGULATOR_FIXED=y
  92 +CONFIG_DM_REGULATOR_GPIO=y
  93 +# CONFIG_DM_MMC is not set
  94 +CONFIG_DM_SERIAL=y
  95 +CONFIG_DM_SPI=y
  96 +CONFIG_DM_SPI_FLASH=y
  97 +CONFIG_HUSH_PARSER=y
  98 +# CONFIG_PARTITION_UUIDS is not set
  99 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 100 +# CONFIG_LED is not set
 101 +# CONFIG_LZ4 is not set
 102 +CONFIG_VERSION_VARIABLE=y
 103 +CONFIG_NETCONSOLE=y
 104 +CONFIG_REGMAP=y
 105 +CONFIG_SYSCON=y
 106 +CONFIG_CLK=y
 107 +CONFIG_PHY=y
 108 +CONFIG_PHY_FIXED=y
 109 +CONFIG_PHYLIB_10G=y
 110 +CONFIG_PHY_AQUANTIA=y
 111 +CONFIG_PHY_ADDR_ENABLE=y
 112 +CONFIG_PHY_ADDR=8
 113 +CONFIG_MEDIATEK_ETH=y
 114 +CONFIG_MTD=y
 115 +# CONFIG_MMC is not set
 116 +CONFIG_PINCTRL=y
 117 +CONFIG_PINCONF=y
 118 +CONFIG_PINCTRL_MT7622=y
 119 +CONFIG_POWER_DOMAIN=y
 120 +CONFIG_PRE_CONSOLE_BUFFER=y
 121 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
 122 +CONFIG_MTK_POWER_DOMAIN=y
 123 +CONFIG_RAM=y
 124 +CONFIG_MTK_SERIAL=y
 125 +CONFIG_SPI=y
 126 +CONFIG_MTK_SNFI_SPI=y
 127 +CONFIG_MTK_SNOR=y
 128 +CONFIG_SYSRESET_WATCHDOG=y
 129 +CONFIG_WDT_MTK=y
 130 +CONFIG_HEXDUMP=y
 131 +CONFIG_RANDOM_UUID=y
 132 +CONFIG_REGEX=y
 133 +CONFIG_SPI_FLASH=y
 134 +CONFIG_SPI_FLASH_BAR=y
 135 +CONFIG_SPI_FLASH_MTD=y
 136 +CONFIG_SPI_FLASH_UNLOCK_ALL=y
 137 +CONFIG_SPI_FLASH_EON=y
 138 +CONFIG_SPI_FLASH_GIGADEVICE=y
 139 +CONFIG_SPI_FLASH_MACRONIX=y
 140 +CONFIG_SPI_FLASH_SPANSION=y
 141 +CONFIG_SPI_FLASH_STMICRO=y
 142 +CONFIG_SPI_FLASH_SST=y
 143 +CONFIG_SPI_FLASH_WINBOND=y
 144 +CONFIG_SPI_FLASH_XMC=y
 145 --- /dev/null
 146 +++ b/arch/arm/dts/mt7622-ubnt-unifi-6-lr.dts
 147 @@ -0,0 +1,202 @@
 148 +// SPDX-License-Identifier: GPL-2.0
 149 +/*
 150 + * Copyright (c) 2019 MediaTek Inc.
 151 + * Author: Sam Shih <sam.shih@mediatek.com>
 152 + */
 153 +
 154 +/dts-v1/;
 155 +#include "mt7622.dtsi"
 156 +#include "mt7622-u-boot.dtsi"
 157 +
 158 +/ {
 159 +       #address-cells = <1>;
 160 +       #size-cells = <1>;
 161 +       model = "mt7622-ubnt-unifi-6-lr";
 162 +       compatible = "mediatek,mt7622", "ubnt,unifi-6-lr";
 163 +
 164 +       chosen {
 165 +               stdout-path = &uart0;
 166 +               tick-timer = &timer0;
 167 +       };
 168 +
 169 +       aliases {
 170 +               spi0 = &snor;
 171 +       };
 172 +
 173 +       gpio-keys {
 174 +               compatible = "gpio-keys";
 175 +               u-boot,dm-pre-reloc;
 176 +
 177 +               reset {
 178 +                       label = "reset";
 179 +                       gpios = <&gpio 62 GPIO_ACTIVE_LOW>;
 180 +                       u-boot,dm-pre-reloc;
 181 +               };
 182 +       };
 183 +
 184 +       memory@40000000 {
 185 +               device_type = "memory";
 186 +               reg = <0x40000000 0x20000000>;
 187 +       };
 188 +
 189 +       reg_1p8v: regulator-1p8v {
 190 +               compatible = "regulator-fixed";
 191 +               regulator-name = "fixed-1.8V";
 192 +               regulator-min-microvolt = <1800000>;
 193 +               regulator-max-microvolt = <1800000>;
 194 +               regulator-boot-on;
 195 +               regulator-always-on;
 196 +       };
 197 +
 198 +       reg_3p3v: regulator-3p3v {
 199 +               compatible = "regulator-fixed";
 200 +               regulator-name = "fixed-3.3V";
 201 +               regulator-min-microvolt = <3300000>;
 202 +               regulator-max-microvolt = <3300000>;
 203 +               regulator-boot-on;
 204 +               regulator-always-on;
 205 +       };
 206 +
 207 +       reg_5v: regulator-5v {
 208 +               compatible = "regulator-fixed";
 209 +               regulator-name = "fixed-5V";
 210 +               regulator-min-microvolt = <5000000>;
 211 +               regulator-max-microvolt = <5000000>;
 212 +               regulator-boot-on;
 213 +               regulator-always-on;
 214 +       };
 215 +};
 216 +
 217 +&pcie {
 218 +       pinctrl-names = "default";
 219 +       pinctrl-0 = <&pcie0_pins>, <&pcie1_pins>;
 220 +       status = "okay";
 221 +
 222 +       pcie@0,0 {
 223 +               status = "okay";
 224 +       };
 225 +
 226 +       pcie@1,0 {
 227 +               status = "okay";
 228 +       };
 229 +};
 230 +
 231 +&pinctrl {
 232 +       eth_pins: eth-pins {
 233 +               mux {
 234 +                       function = "eth";
 235 +                       groups = "mdc_mdio", "rgmii_via_gmac2";
 236 +               };
 237 +       };
 238 +
 239 +       pcie0_pins: pcie0-pins {
 240 +               mux {
 241 +                       function = "pcie";
 242 +                       groups = "pcie0_pad_perst",
 243 +                                "pcie0_1_waken",
 244 +                                "pcie0_1_clkreq";
 245 +               };
 246 +       };
 247 +
 248 +       pcie1_pins: pcie1-pins {
 249 +               mux {
 250 +                       function = "pcie";
 251 +                       groups = "pcie1_pad_perst",
 252 +                                "pcie1_0_waken",
 253 +                                "pcie1_0_clkreq";
 254 +               };
 255 +       };
 256 +
 257 +       snfi_pins: snfi-pins {
 258 +               mux {
 259 +                       function = "flash";
 260 +                       groups = "snfi";
 261 +               };
 262 +       };
 263 +
 264 +       snor_pins: snor-pins {
 265 +               mux {
 266 +                       function = "flash";
 267 +                       groups = "spi_nor";
 268 +               };
 269 +       };
 270 +
 271 +       uart0_pins: uart0 {
 272 +               mux {
 273 +                       function = "uart";
 274 +                       groups = "uart0_0_tx_rx" ;
 275 +               };
 276 +       };
 277 +
 278 +       watchdog_pins: watchdog-default {
 279 +               mux {
 280 +                       function = "watchdog";
 281 +                       groups = "watchdog";
 282 +               };
 283 +       };
 284 +};
 285 +
 286 +&snfi {
 287 +       pinctrl-names = "default", "snfi";
 288 +       pinctrl-0 = <&snor_pins>;
 289 +       pinctrl-1 = <&snfi_pins>;
 290 +       status = "okay";
 291 +
 292 +       spi-flash@0 {
 293 +               compatible = "jedec,spi-nor";
 294 +               reg = <0>;
 295 +               u-boot,dm-pre-reloc;
 296 +       };
 297 +};
 298 +
 299 +&snor {
 300 +       pinctrl-names = "default";
 301 +       pinctrl-0 = <&snor_pins>;
 302 +       status = "okay";
 303 +
 304 +       spi-flash@0 {
 305 +               compatible = "jedec,spi-nor";
 306 +               reg = <0>;
 307 +               spi-tx-bus-width = <1>;
 308 +               spi-rx-bus-width = <4>;
 309 +               u-boot,dm-pre-reloc;
 310 +       };
 311 +};
 312 +
 313 +&uart0 {
 314 +       pinctrl-names = "default";
 315 +       pinctrl-0 = <&uart0_pins>;
 316 +       status = "okay";
 317 +};
 318 +
 319 +&watchdog {
 320 +       pinctrl-names = "default";
 321 +       pinctrl-0 = <&watchdog_pins>;
 322 +       status = "okay";
 323 +};
 324 +
 325 +&eth {
 326 +       status = "okay";
 327 +       pinctrl-names = "default";
 328 +       pinctrl-0 = <&eth_pins>;
 329 +
 330 +       mediatek,gmac-id = <0>;
 331 +       phy-mode = "sgmii";
 332 +       phy-handle = <&gphy>;
 333 +
 334 +       fixed-link {
 335 +               speed = <1000>;
 336 +               full-duplex;
 337 +       };
 338 +
 339 +       mdio-bus {
 340 +               #address-cells = <1>;
 341 +               #size-cells = <0>;
 342 +
 343 +               gphy: ethernet-phy@8 {
 344 +                       /* Marvell AQRate AQR112W - no driver */
 345 +                       compatible = "ethernet-phy-ieee802.3-c45";
 346 +                       reg = <0x8>;
 347 +               };
 348 +       };
 349 +};
 350 --- a/arch/arm/dts/Makefile
 351 +++ b/arch/arm/dts/Makefile
 352 @@ -1204,6 +1204,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
 353         mt7623a-unielec-u7623-02-emmc.dtb \
 354         mt7622-bananapi-bpi-r64.dtb \
 355         mt7622-linksys-e8450-ubi.dtb \
 356 +       mt7622-ubnt-unifi-6-lr.dtb \
 357         mt7623n-bananapi-bpi-r2.dtb \
 358         mt7629-rfb.dtb \
 359         mt8183-pumpkin.dtb \
 360 --- /dev/null
 361 +++ b/ubnt_unifi-6-lr_env
 362 @@ -0,0 +1,50 @@
 363 +ethaddr_factory=mtd read nor0 $loadaddr 0x110000 0x10000 && env readmem -b ethaddr $loadaddr 0x6 ; setenv ethaddr_factory
 364 +ipaddr=192.168.1.1
 365 +serverip=192.168.1.254
 366 +loadaddr=0x48000000
 367 +bootcmd=if pstore check ; then run boot_recovery ; else run boot_nor ; fi
 368 +bootdelay=0
 369 +bootfile=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-ubootmod-initramfs-recovery.itb
 370 +bootfile_bl2=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-ubootmod-preloader.bin
 371 +bootfile_fip=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-ubootmod-bl31-uboot.fip
 372 +bootfile_upg=openwrt-mediatek-mt7622-ubnt_unifi-6-lr-ubootmod-squashfs-sysupgrade.itb
 373 +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
 374 +bootmenu_default=0
 375 +bootmenu_delay=0
 376 +bootmenu_title=      \e[0;34m( ( ( \e[1;39mOpenWrt\e[0;34m ) ) )\e[0m
 377 +bootmenu_0=Initialize environment.=run _firstboot
 378 +bootmenu_0d=Run default boot command.=run boot_default
 379 +bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
 380 +bootmenu_2=Boot production system from flash.=run boot_production ; run bootmenu_confirm_return
 381 +bootmenu_3=Boot recovery system from flash.=run boot_recovery ; run bootmenu_confirm_return
 382 +bootmenu_4=Load production system via TFTP then write to flash.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
 383 +bootmenu_5=Load recovery system via TFTP then write to flash.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
 384 +bootmenu_6=\e[31mLoad BL31+U-Boot FIP via TFTP then write to flash.\e[0m=run boot_tftp_write_fip ; run bootmenu_confirm_return
 385 +bootmenu_7=\e[31mLoad BL2 preloader via TFTP then write to flash.\e[0m=run boot_tftp_write_preloader ; run bootmenu_confirm_return
 386 +bootmenu_8=Reboot.=reset
 387 +bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
 388 +boot_first=if button reset ; then run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
 389 +boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
 390 +boot_production=run nor_read_production && bootm $loadaddr
 391 +boot_recovery=run nor_read_recovery ; bootm $loadaddr
 392 +boot_serial_write_fip=loadx $loadaddr 115200 && run boot_write_fip
 393 +boot_serial_write_preloader=loadx $loadaddr 115200 && run boot_write_preloader
 394 +boot_tftp_forever=while true ; do run boot_tftp_recovery ; sleep 1 ; done
 395 +boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run nor_write_production ; if env exists noboot ; then else bootm $loadaddr ; fi
 396 +boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run nor_write_recovery ; if env exists noboot ; then else bootm $loadaddr ; fi
 397 +boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr
 398 +boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run boot_write_fip
 399 +boot_tftp_write_preloader=tftpboot $loadaddr $bootfile_bl2 && run boot_write_preloader
 400 +boot_nor=run boot_production ; run boot_recovery
 401 +boot_write_fip=mtd erase nor0 0x20000 0x80000 && mtd write nor0 $loadaddr 0x20000 0x80000
 402 +boot_write_preloader=mtd erase nor0 0x0 0x20000 && mtd write nor0 $loadaddr 0x0 0x20000
 403 +reset_factory=mtd erase nor0 0xc0000 0x10000 && reset
 404 +nor_read_production=mtd read nor0 $loadaddr 0x1000000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x1000000 $image_size
 405 +nor_read_recovery=mtd read nor0 $loadaddr 0x120000 0x1000 && imsz $loadaddr image_size && mtd read nor0 $loadaddr 0x120000 $image_size
 406 +nor_pad_size=imsz $loadaddr image_size ; setexpr image_eb $image_size / 0x1000 ; setexpr tmp1 image_size % 0x1000 ; test 0x$tmp1 -gt 0 && setexpr image_eb $image_eb + 1 ; setexpr image_eb $image_eb * 0x1000
 407 +nor_write_production=run nor_pad_size ; test 0x$image_eb -le 0x3000000 && mtd erase nor0 0x1000000 0x$image_eb && mtd write nor0 $loadaddr 0x1000000 $filesize
 408 +nor_write_recovery=run nor_pad_size ; test 0x$image_eb -le 0xee0000 && mtd erase nor0 0x120000 0x$image_eb && mtd write nor0 $loadaddr 0x120000 $filesize
 409 +_init_env=setenv _init_env ; saveenv
 410 +_firstboot=setenv _firstboot ; run _switch_to_menu ; run ethaddr_factory ; run _init_env ; run boot_first
 411 +_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
 412 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       \e[33m$ver\e[0m"
 413 --- a/common/board_r.c
 414 +++ b/common/board_r.c
 415 @@ -62,6 +62,7 @@
 416  #include <asm-generic/gpio.h>
 417  #include <efi_loader.h>
 418  #include <relocate.h>
 419 +#include <spi_flash.h>
 420
 421  DECLARE_GLOBAL_DATA_PTR;
 422
 423 @@ -392,6 +393,20 @@ static int initr_onenand(void)
 424  }
 425  #endif
 426
 427 +#if defined(CONFIG_SPI_FLASH)
 428 +/* probe SPI FLASH */
 429 +static int initr_spiflash(void)
 430 +{
 431 +       struct udevice *new;
 432 +
 433 +spi_flash_probe_bus_cs(CONFIG_SF_DEFAULT_BUS,
 434 +                       CONFIG_SF_DEFAULT_CS,
 435 +                       &new);
 436 +
 437 +       return 0;
 438 +}
 439 +#endif
 440 +
 441  #ifdef CONFIG_MMC
 442  static int initr_mmc(void)
 443  {
 444 @@ -703,6 +718,9 @@ static init_fnc_t init_sequence_r[] = {
 445  #ifdef CONFIG_CMD_ONENAND
 446         initr_onenand,
 447  #endif
 448 +#ifdef CONFIG_SPI_FLASH
 449 +       initr_spiflash,
 450 +#endif
 451  #ifdef CONFIG_MMC
 452         initr_mmc,
 453  #endif