package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch

   1 --- a/configs/mt7623n_bpir2_defconfig
   2 +++ b/configs/mt7623n_bpir2_defconfig
   3 @@ -7,35 +7,105 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
   4  CONFIG_NR_DRAM_BANKS=1
   5  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
   6  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x81ffff10
   7 -CONFIG_ENV_SIZE=0x1000
   8 +CONFIG_ENV_SIZE=0x10000
   9  CONFIG_ENV_OFFSET=0x100000
  10  CONFIG_DEFAULT_DEVICE_TREE="mt7623n-bananapi-bpi-r2"
  11 -CONFIG_SYS_PROMPT="U-Boot> "
  12 +CONFIG_USE_DEFAULT_ENV_FILE=y
  13 +CONFIG_SYS_PROMPT="MT7623> "
  14  CONFIG_TARGET_MT7623=y
  15  CONFIG_SYS_LOAD_ADDR=0x84000000
  16  CONFIG_FIT=y
  17 -CONFIG_FIT_VERBOSE=y
  18 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
  19 +CONFIG_LED=y
  20 +CONFIG_LED_BLINK=y
  21 +CONFIG_LED_GPIO=y
  22 +CONFIG_LOGLEVEL=7
  23 +CONFIG_LOG=y
  24 +CONFIG_AUTOBOOT_KEYED=y
  25 +CONFIG_AUTOBOOT_MENU_SHOW=y
  26 +CONFIG_BOARD_LATE_INIT=y
  27 +# CONFIG_BOOTSTD is not set
  28 +# CONFIG_BOOT_DEFAULTS is not set
  29  CONFIG_DISTRO_DEFAULTS=y
  30  CONFIG_BOOTDELAY=3
  31 +CONFIG_BOOTP_SEND_HOSTNAME=y
  32  CONFIG_DEFAULT_FDT_FILE="mt7623n-bananapi-bpi-r2.dtb"
  33  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
  34 +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r2_env"
  35 +CONFIG_BUTTON=y
  36 +CONFIG_BUTTON_GPIO=y
  37 +CONFIG_RESET_BUTTON_LABEL="factory"
  38 +CONFIG_CFB_CONSOLE_ANSI=y
  39 +CONFIG_CMD_ENV_FLAGS=y
  40  # CONFIG_DISPLAY_BOARDINFO is not set
  41  CONFIG_SYS_MAXARGS=8
  42  CONFIG_SYS_PBSIZE=1049
  43  CONFIG_SYS_BOOTM_LEN=0x4000000
  44  CONFIG_CMD_BOOTMENU=y
  45 +CONFIG_CMD_BOOTP=y
  46 +CONFIG_CMD_BUTTON=y
  47 +CONFIG_CMD_CACHE=y
  48 +CONFIG_CMD_CDP=y
  49 +CONFIG_CMD_DHCP=y
  50 +CONFIG_CMD_DM=y
  51 +CONFIG_CMD_DNS=y
  52 +CONFIG_CMD_ECHO=y
  53 +CONFIG_CMD_ENV_READMEM=y
  54 +CONFIG_CMD_ERASEENV=y
  55 +CONFIG_CMD_EXT4=y
  56 +CONFIG_CMD_FAT=y
  57 +CONFIG_CMD_FS_GENERIC=y
  58 +CONFIG_CMD_FS_UUID=y
  59  # CONFIG_CMD_ELF is not set
  60  # CONFIG_CMD_XIMG is not set
  61  CONFIG_CMD_GPIO=y
  62 -CONFIG_CMD_GPT=y
  63 +# CONFIG_CMD_GPT is not set
  64 +CONFIG_CMD_HASH=y
  65 +CONFIG_CMD_ITEST=y
  66 +CONFIG_CMD_LED=y
  67 +CONFIG_CMD_LICENSE=y
  68 +CONFIG_CMD_LINK_LOCAL=y
  69 +CONFIG_CMD_MBR=y
  70  CONFIG_CMD_MMC=y
  71  CONFIG_CMD_READ=y
  72 -# CONFIG_CMD_SETEXPR is not set
  73  # CONFIG_CMD_NFS is not set
  74 +CONFIG_CMD_SF_TEST=y
  75 +CONFIG_CMD_PING=y
  76 +CONFIG_CMD_PXE=y
  77 +CONFIG_CMD_TFTPBOOT=y
  78 +CONFIG_CMD_TFTPSRV=y
  79 +CONFIG_CMD_ASKENV=y
  80 +CONFIG_CMD_PART=y
  81 +CONFIG_CMD_RARP=y
  82 +CONFIG_CMD_SATA=y
  83 +CONFIG_CMD_SETEXPR=y
  84 +CONFIG_CMD_SLEEP=y
  85 +CONFIG_CMD_SNTP=y
  86 +CONFIG_CMD_SOURCE=y
  87 +CONFIG_CMD_STRINGS=y
  88 +CONFIG_CMD_USB=y
  89 +CONFIG_CMD_UUID=y
  90 +CONFIG_CMD_SCSI=y
  91 +CONFIG_DISPLAY_CPUINFO=y
  92 +CONFIG_DM_ETH=y
  93 +CONFIG_DM_GPIO=y
  94 +CONFIG_DM_SCSI=y
  95 +CONFIG_DM_MMC=y
  96 +CONFIG_DM_REGULATOR=y
  97 +CONFIG_DM_REGULATOR_FIXED=y
  98 +CONFIG_DM_REGULATOR_GPIO=y
  99 +CONFIG_DM_USB=y
 100 +CONFIG_DM_PCI=y
 101 +CONFIG_AHCI=y
 102 +CONFIG_AHCI_PCI=y
 103 +CONFIG_SCSI_AHCI=y
 104 +CONFIG_SCSI=y
 105 +CONFIG_HUSH_PARSER=y
 106  CONFIG_ENV_OVERWRITE=y
 107  CONFIG_ENV_IS_IN_MMC=y
 108  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 109  CONFIG_NET_RANDOM_ETHADDR=y
 110 +CONFIG_NETCONSOLE=y
 111  CONFIG_USE_IPADDR=y
 112  CONFIG_IPADDR="192.168.1.1"
 113  CONFIG_USE_SERVERIP=y
 114 @@ -47,6 +117,12 @@ CONFIG_CLK=y
 115  CONFIG_SUPPORT_EMMC_BOOT=y
 116  CONFIG_MMC_HS400_SUPPORT=y
 117  CONFIG_MMC_MTK=y
 118 +CONFIG_OF_LIBFDT_OVERLAY=y
 119 +CONFIG_PARTITION_UUIDS=y
 120 +CONFIG_PCI=y
 121 +CONFIG_PCIE_MEDIATEK=y
 122 +CONFIG_PHY=y
 123 +CONFIG_PINCONF=y
 124  CONFIG_PHY_FIXED=y
 125  CONFIG_MEDIATEK_ETH=y
 126  CONFIG_PINCTRL=y
 127 @@ -56,10 +132,13 @@ CONFIG_POWER_DOMAIN=y
 128  CONFIG_MTK_POWER_DOMAIN=y
 129  CONFIG_DM_SERIAL=y
 130  CONFIG_MTK_SERIAL=y
 131 +CONFIG_RANDOM_UUID=y
 132 +CONFIG_REGEX=y
 133  CONFIG_SYSRESET=y
 134  CONFIG_SYSRESET_WATCHDOG=y
 135  CONFIG_TIMER=y
 136  CONFIG_MTK_TIMER=y
 137 +CONFIG_VERSION_VARIABLE=y
 138  CONFIG_WDT_MTK=y
 139  CONFIG_LZMA=y
 140  # CONFIG_EFI_GRUB_ARM32_WORKAROUND is not set
 141 --- /dev/null
 142 +++ b/bananapi_bpi-r2_env
 143 @@ -0,0 +1,70 @@
 144 +ipaddr=192.168.1.1
 145 +serverip=192.168.1.254
 146 +loadaddr=0x88000000
 147 +dtaddr=0x83f00000
 148 +console=earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200 console=tty1
 149 +initrd_high=0xafffffff
 150 +part_default=3
 151 +part_recovery=2
 152 +bootcmd=run boot_mmc
 153 +bootdelay=0
 154 +bootfile=openwrt-mediatek-mt7623-bananapi_bpi-r2-initramfs-recovery.itb
 155 +bootfile_upg=openwrt-mediatek-mt7623-bananapi_bpi-r2-squashfs-sysupgrade.itb
 156 +bootled_pwr=bpi-r2:pio:green
 157 +bootled_rec=bpi-r2:pio:blue
 158 +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
 159 +bootmenu_default=0
 160 +bootmenu_delay=0
 161 +bootmenu_title=      \e[0;34m( ( ( \e[1;39mOpenWrt\e[0;34m ) ) )
 162 +bootmenu_0=Initialize environment.=run _firstboot
 163 +bootmenu_0d=Run default boot command.=run boot_default
 164 +bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
 165 +boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
 166 +boot_first=if button factory ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
 167 +boot_tftp_forever=led bpi-r2:pio:blue on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
 168 +boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run mmc_write_production ; if env exists noboot ; then else bootm $loadaddr ; fi
 169 +boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run mmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr ; fi
 170 +boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr
 171 +boot_mmc=run boot_production ; run boot_recovery
 172 +emmc_init=run emmc_init_bl && run emmc_init_openwrt ; env default bootcmd ; saveenv
 173 +emmc_init_bl=run sdmmc_read_emmc_hdr && run emmc_write_hdr && run sdmmc_read_preloader && run emmc_write_preloader && run sdmmc_read_uboot && run emmc_write_uboot
 174 +emmc_init_openwrt=run sdmmc_read_recovery && run emmc_write_recovery ; run sdmmc_read_production && run emmc_write_production
 175 +emmc_write_hdr=mmc dev 0 0 ; mmc erase 0x0 0x2000 ; mmc write $loadaddr 0x0 0x4 ; mmc dev 0 1 ; mmc partconf 0 1 1 1 ; mmc erase 0x0 0x400 ; mmc write $loadaddr 0x0 0x4 ; mmc partconf 0 1 1 0
 176 +emmc_write_preloader=mmc dev 0 1 ; mmc partconf 0 1 1 1 ; mmc write $loadaddr 0x4 0x100 ; mmc partconf 0 1 1 0
 177 +emmc_write_uboot=mmc dev 0 0 ; part size mmc 0 1 part_size && part start mmc 0 1 part_addr && mmc write $loadaddr $part_addr 0x400
 178 +emmc_write_production=mmc dev 0 0 ; iminfo $loadaddr && part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_write_vol
 179 +emmc_write_recovery=mmc dev 0 0 ; iminfo $loadaddr && part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
 180 +emmc_read_production=mmc dev 0 0 ; part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
 181 +emmc_read_recovery=mmc dev 0 0 ; part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
 182 +mmc_write_production=if test "$bootedfrom" = "SD" ; then run sdmmc_write_production ; else run emmc_write_production ; fi
 183 +mmc_write_recovery=if test "$bootedfrom" = "SD" ; run sdmmc_write_recovery ; else run emmc_write_recovery ; fi
 184 +mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
 185 +mmc_read_vol=mmc read $loadaddr $part_addr 0x8 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
 186 +reset_factory=eraseenv && reset
 187 +sdmmc_read_emmc_hdr=mmc dev 1 && mmc read $loadaddr 0x1ff8 0x8
 188 +sdmmc_read_preloader=mmc dev 1 && mmc read $loadaddr 0x4 0x100
 189 +sdmmc_read_uboot=mmc dev 1 ; part start mmc 1 1 part_addr && part size mmc 1 1 part_size && mmc read $loadaddr $part_addr $part_size
 190 +sdmmc_read_production=mmc dev 1 ; part start mmc 1 $part_default part_addr && part size mmc 1 $part_default part_size && run mmc_read_vol
 191 +sdmmc_read_recovery=mmc dev 1 ; part start mmc 1 $part_recovery part_addr && part size mmc 1 $part_recovery part_size && run mmc_read_vol
 192 +sdmmc_write_production=iminfo $fileaddr && mmc dev 1 && part start mmc 1 $part_default part_addr && part size mmc 1 $part_default part_size && run mmc_write_vol
 193 +sdmmc_write_recovery=iminfo $fileaddr && mmc dev 1 && part start mmc 1 $part_recovery part_addr && part size mmc 1 $part_recovery part_size && run mmc_write_vol
 194 +_checkbootedfrom=setenv _checkbootedfrom ; if itest.l *81dffff0 == 434d4d65 ; then setenv bootedfrom eMMC ; else setenv bootedfrom SD ; fi
 195 +_init_env=setenv _init_env ; setenv _create_env ; saveenv ; saveenv
 196 +_firstboot=setenv _firstboot ; led $bootled_pwr off ;led $bootled_rec on ; run _checkbootedfrom _switch_to_menu _update_bootdev _update_bootcmd _update_bootcmd2 _init_env boot_first
 197 +_set_bootcmd_sdmmc=setenv boot_production "led $bootled_rec off ; led $bootled_pwr on ; run sdmmc_read_production && bootm $loadaddr ; led $bootled_pwr off"
 198 +_set_bootcmd_emmc=setenv boot_production "led $bootled_rec off ; led $bootled_pwr on ; run emmc_read_production && bootm $loadaddr ; led $bootled_pwr off"
 199 +_update_bootcmd=setenv _update_bootcmd ; if test "$bootedfrom" = "SD" ; then run _set_bootcmd_sdmmc ; else run _set_bootcmd_emmc ; fi ; setenv _set_bootcmd_sdmmc ; setenv _set_bootcmd_emmc
 200 +_set_bootcmd2_sdmmc=setenv boot_recovery "led $bootled_pwr off ; led $bootled_rec on ; run sdmmc_read_recovery && bootm $loadaddr ; led $bootled_rec off"
 201 +_set_bootcmd2_emmc=setenv boot_recovery "led $bootled_pwr off ; led $bootled_rec on ; run emmc_read_recovery && bootm $loadaddr ; led $bootled_rec off"
 202 +_update_bootcmd2=setenv _update_bootcmd2 ; if test "$bootedfrom" = "SD" ; then run _set_bootcmd2_sdmmc ; else run _set_bootcmd2_emmc ; fi ; setenv _set_bootcmd2_sdmmc ; setenv _set_bootcmd2_emmc
 203 +_update_bootdev=setenv _update_bootdev ; if test "$bootedfrom" = "SD" ; then setenv bootargs "$console root=/dev/mmcblk1p65" ; else setenv bootargs "$console root=/dev/mmcblk0p65" ; fi
 204 +_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
 205 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title  \e[0;36m[$bootedfrom]\e[0m    \e[33m$ver\e[0m" ; run _set_bm2
 206 +_set_bm2=setenv _set_bm2 ; setenv bootmenu_2 "Boot production system from $bootedfrom.=run boot_production ; run bootmenu_confirm_return" ; run _set_bm3
 207 +_set_bm3=setenv _set_bm3 ; setenv bootmenu_3 "Boot recovery system from $bootedfrom.=run boot_recovery ; run bootmenu_confirm_return" ; run _set_bm4
 208 +_set_bm4=setenv _set_bm4 ; setenv bootmenu_4 "Load production system via TFTP then write to $bootedfrom.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return" ; run _set_bm5
 209 +_set_bm5=setenv _set_bm5 ; setenv bootmenu_5 "Load recovery system via TFTP then write to $bootedfrom.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return" ; run _set_bm5a
 210 +_set_bm5a=setenv _set_bm5a ; if test "$bootedfrom" = "SD" ; then run _set_bm6 ; else setenv _set_bm6 ; setenv _menu_next 6 ; fi ; run _set_bmr
 211 +_set_bm6=setenv _set_bm6 ; setenv bootmenu_6 "\e[31mInstall bootloader, recovery and production to eMMC.\e[0m=run emmc_init ; run bootmenu_confirm_return" ; setenv _menu_next 7
 212 +_set_bmr=setenv _set_bmr ; setenv bootmenu_${_menu_next} "Reboot.=reset" ; setexpr _menu_next ${_menu_next} + 1 ; run _set_bmf
 213 +_set_bmf=setenv _set_bmf ; setenv bootmenu_${_menu_next} "Reset all settings to factory defaults.=run reset_factory ; reset" ; setenv _menu_next
 214 --- a/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
 215 +++ b/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
 216 @@ -6,6 +6,7 @@
 217   */
 218
 219  /dts-v1/;
 220 +#include <dt-bindings/input/linux-event-codes.h>
 221  #include "mt7623.dtsi"
 222  #include "mt7623-u-boot.dtsi"
 223
 224 @@ -66,6 +67,16 @@
 225                         default-state = "off";
 226                 };
 227         };
 228 +
 229 +       gpio-keys {
 230 +               compatible = "gpio-keys";
 231 +
 232 +               factory {
 233 +                       label = "factory";
 234 +                       gpios = <&gpio 256 GPIO_ACTIVE_LOW>;
 235 +                       linux,code = <KEY_RESTART>;
 236 +               };
 237 +       };
 238  };
 239
 240  &eth {