1 --- a/configs/mt7623n_bpir2_defconfig
2 +++ b/configs/mt7623n_bpir2_defconfig
3 @@ -7,34 +7,105 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
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_TARGET_MT7623=y
12 CONFIG_SYS_LOAD_ADDR=0x84000000
15 +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
21 +CONFIG_AUTOBOOT_KEYED=y
22 +CONFIG_AUTOBOOT_MENU_SHOW=y
23 +CONFIG_BOARD_LATE_INIT=y
24 +# CONFIG_BOOTSTD is not set
25 +# CONFIG_BOOT_DEFAULTS is not set
26 CONFIG_DISTRO_DEFAULTS=y
28 +CONFIG_BOOTP_SEND_HOSTNAME=y
29 CONFIG_DEFAULT_FDT_FILE="mt7623n-bananapi-bpi-r2.dtb"
30 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
31 +CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r2_env"
34 +CONFIG_RESET_BUTTON_LABEL="factory"
35 +CONFIG_CFB_CONSOLE_ANSI=y
36 +CONFIG_CMD_ENV_FLAGS=y
37 # CONFIG_DISPLAY_BOARDINFO is not set
38 -CONFIG_SYS_PROMPT="U-Boot> "
39 +CONFIG_USE_DEFAULT_ENV_FILE=y
40 +CONFIG_SYS_PROMPT="MT7623> "
42 CONFIG_SYS_PBSIZE=1049
43 CONFIG_SYS_BOOTM_LEN=0x4000000
53 +CONFIG_CMD_ENV_READMEM=y
54 +CONFIG_CMD_ERASEENV=y
57 +CONFIG_CMD_FS_GENERIC=y
59 # CONFIG_CMD_ELF is not set
60 # CONFIG_CMD_XIMG is not set
63 +# CONFIG_CMD_GPT is not set
68 +CONFIG_CMD_LINK_LOCAL=y
72 -# CONFIG_CMD_SETEXPR is not set
76 +CONFIG_CMD_TFTPBOOT=y
90 +CONFIG_DISPLAY_CPUINFO=y
95 +CONFIG_DM_REGULATOR=y
96 +CONFIG_DM_REGULATOR_FIXED=y
97 +CONFIG_DM_REGULATOR_GPIO=y
104 +CONFIG_HUSH_PARSER=y
105 CONFIG_ENV_OVERWRITE=y
106 CONFIG_ENV_IS_IN_MMC=y
107 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
108 CONFIG_NET_RANDOM_ETHADDR=y
111 CONFIG_IPADDR="192.168.1.1"
112 CONFIG_USE_SERVERIP=y
113 @@ -46,6 +117,12 @@ CONFIG_CLK=y
114 CONFIG_SUPPORT_EMMC_BOOT=y
115 CONFIG_MMC_HS400_SUPPORT=y
117 +CONFIG_OF_LIBFDT_OVERLAY=y
118 +CONFIG_PARTITION_UUIDS=y
120 +CONFIG_PCIE_MEDIATEK=y
124 CONFIG_MEDIATEK_ETH=y
126 @@ -55,10 +132,13 @@ CONFIG_POWER_DOMAIN=y
127 CONFIG_MTK_POWER_DOMAIN=y
130 +CONFIG_RANDOM_UUID=y
133 CONFIG_SYSRESET_WATCHDOG=y
136 +CONFIG_VERSION_VARIABLE=y
139 # CONFIG_EFI_GRUB_ARM32_WORKAROUND is not set
141 +++ b/bananapi_bpi-r2_env
144 +serverip=192.168.1.254
147 +console=earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200 console=tty1
148 +initrd_high=0xafffffff
151 +bootcmd=run boot_mmc
153 +bootfile=openwrt-mediatek-mt7623-bananapi_bpi-r2-initramfs-recovery.itb
154 +bootfile_upg=openwrt-mediatek-mt7623-bananapi_bpi-r2-squashfs-sysupgrade.itb
155 +bootled_pwr=bpi-r2:pio:green
156 +bootled_rec=bpi-r2:pio:blue
157 +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
160 +bootmenu_title=
\e[0;34m( ( (
\e[1;39mOpenWrt
\e[0;34m ) ) )
161 +bootmenu_0=Initialize environment.=run _firstboot
162 +bootmenu_0d=Run default boot command.=run boot_default
163 +bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
164 +boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
165 +boot_first=if button factory ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
166 +boot_tftp_forever=led bpi-r2:pio:blue on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
167 +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
168 +boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run mmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr ; fi
169 +boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr
170 +boot_mmc=run boot_production ; run boot_recovery
171 +emmc_init=run emmc_init_bl && run emmc_init_openwrt ; env default bootcmd ; saveenv
172 +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
173 +emmc_init_openwrt=run sdmmc_read_recovery && run emmc_write_recovery ; run sdmmc_read_production && run emmc_write_production
174 +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
175 +emmc_write_preloader=mmc dev 0 1 ; mmc partconf 0 1 1 1 ; mmc write $loadaddr 0x4 0x100 ; mmc partconf 0 1 1 0
176 +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
177 +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
178 +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
179 +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
180 +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
181 +mmc_write_production=if test "$bootedfrom" = "SD" ; then run sdmmc_write_production ; else run emmc_write_production ; fi
182 +mmc_write_recovery=if test "$bootedfrom" = "SD" ; run sdmmc_write_recovery ; else run emmc_write_recovery ; fi
183 +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
184 +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
185 +reset_factory=eraseenv && reset
186 +sdmmc_read_emmc_hdr=mmc dev 1 && mmc read $loadaddr 0x1ff8 0x8
187 +sdmmc_read_preloader=mmc dev 1 && mmc read $loadaddr 0x4 0x100
188 +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
189 +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
190 +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
191 +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
192 +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
193 +_checkbootedfrom=setenv _checkbootedfrom ; if itest.l *81dffff0 == 434d4d65 ; then setenv bootedfrom eMMC ; else setenv bootedfrom SD ; fi
194 +_init_env=setenv _init_env ; setenv _create_env ; saveenv ; saveenv
195 +_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
196 +_set_bootcmd_sdmmc=setenv boot_production "led $bootled_rec off ; led $bootled_pwr on ; run sdmmc_read_production && bootm $loadaddr ; led $bootled_pwr off"
197 +_set_bootcmd_emmc=setenv boot_production "led $bootled_rec off ; led $bootled_pwr on ; run emmc_read_production && bootm $loadaddr ; led $bootled_pwr off"
198 +_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
199 +_set_bootcmd2_sdmmc=setenv boot_recovery "led $bootled_pwr off ; led $bootled_rec on ; run sdmmc_read_recovery && bootm $loadaddr ; led $bootled_rec off"
200 +_set_bootcmd2_emmc=setenv boot_recovery "led $bootled_pwr off ; led $bootled_rec on ; run emmc_read_recovery && bootm $loadaddr ; led $bootled_rec off"
201 +_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
202 +_update_bootdev=setenv _update_bootdev ; if test "$bootedfrom" = "SD" ; then setenv bootargs "$console root=/dev/mmcblk1p65" ; else setenv bootargs "$console root=/dev/mmcblk0p65" ; fi
203 +_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
204 +_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
205 +_set_bm2=setenv _set_bm2 ; setenv bootmenu_2 "Boot production system from $bootedfrom.=run boot_production ; run bootmenu_confirm_return" ; run _set_bm3
206 +_set_bm3=setenv _set_bm3 ; setenv bootmenu_3 "Boot recovery system from $bootedfrom.=run boot_recovery ; run bootmenu_confirm_return" ; run _set_bm4
207 +_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
208 +_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
209 +_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
210 +_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
211 +_set_bmr=setenv _set_bmr ; setenv bootmenu_${_menu_next} "Reboot.=reset" ; setexpr _menu_next ${_menu_next} + 1 ; run _set_bmf
212 +_set_bmf=setenv _set_bmf ; setenv bootmenu_${_menu_next} "Reset all settings to factory defaults.=run reset_factory ; reset" ; setenv _menu_next
213 --- a/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
214 +++ b/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
219 +#include <dt-bindings/input/linux-event-codes.h>
220 #include "mt7623.dtsi"
221 #include "mt7623-u-boot.dtsi"
224 default-state = "off";
229 + compatible = "gpio-keys";
233 + gpios = <&gpio 256 GPIO_ACTIVE_LOW>;
234 + linux,code = <KEY_RESTART>;