mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
537b423d9f
Remove patches adding support for MT7621 which have been merged upsteam. Patches for MT7981 and MT7986 have been merged too, but not in time to be included in the 2022.10 release, so we have to keep carrying them until the 2023.01 release. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
249 lines
12 KiB
Diff
249 lines
12 KiB
Diff
--- a/configs/mt7623n_bpir2_defconfig
|
||
+++ b/configs/mt7623n_bpir2_defconfig
|
||
@@ -4,57 +4,142 @@ CONFIG_ARCH_MEDIATEK=y
|
||
CONFIG_SYS_TEXT_BASE=0x81e00000
|
||
CONFIG_SYS_MALLOC_F_LEN=0x4000
|
||
CONFIG_NR_DRAM_BANKS=1
|
||
-CONFIG_ENV_SIZE=0x1000
|
||
+CONFIG_ENV_SIZE=0x10000
|
||
CONFIG_ENV_OFFSET=0x100000
|
||
CONFIG_DEFAULT_DEVICE_TREE="mt7623n-bananapi-bpi-r2"
|
||
-CONFIG_SYS_PROMPT="U-Boot> "
|
||
+CONFIG_USE_DEFAULT_ENV_FILE=y
|
||
+CONFIG_SYS_PROMPT="MT7623> "
|
||
CONFIG_TARGET_MT7623=y
|
||
CONFIG_SYS_LOAD_ADDR=0x84000000
|
||
CONFIG_DISTRO_DEFAULTS=y
|
||
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
||
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x81ffff10
|
||
CONFIG_FIT=y
|
||
-CONFIG_FIT_VERBOSE=y
|
||
+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
|
||
+CONFIG_LED=y
|
||
+CONFIG_LED_BLINK=y
|
||
+CONFIG_LED_GPIO=y
|
||
+CONFIG_LOGLEVEL=7
|
||
+CONFIG_LOG=y
|
||
+CONFIG_AUTOBOOT_KEYED=y
|
||
+CONFIG_AUTOBOOT_MENU_SHOW=y
|
||
+CONFIG_BOARD_LATE_INIT=y
|
||
CONFIG_BOOTDELAY=3
|
||
+CONFIG_BOOTP_SEND_HOSTNAME=y
|
||
CONFIG_DEFAULT_FDT_FILE="mt7623n-bananapi-bpi-r2.dtb"
|
||
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
||
+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r2_env"
|
||
+CONFIG_BUTTON=y
|
||
+CONFIG_BUTTON_GPIO=y
|
||
+CONFIG_RESET_BUTTON_LABEL="factory"
|
||
+CONFIG_CFB_CONSOLE_ANSI=y
|
||
+CONFIG_CMD_ENV_FLAGS=y
|
||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||
CONFIG_SYS_MAXARGS=8
|
||
CONFIG_SYS_PBSIZE=1049
|
||
CONFIG_SYS_BOOTM_LEN=0x4000000
|
||
CONFIG_CMD_BOOTMENU=y
|
||
+CONFIG_CMD_BOOTP=y
|
||
+CONFIG_CMD_BUTTON=y
|
||
+CONFIG_CMD_CACHE=y
|
||
+CONFIG_CMD_CDP=y
|
||
+CONFIG_CMD_DHCP=y
|
||
+CONFIG_CMD_DM=y
|
||
+CONFIG_CMD_DNS=y
|
||
+CONFIG_CMD_ECHO=y
|
||
+CONFIG_CMD_ENV_READMEM=y
|
||
+CONFIG_CMD_ERASEENV=y
|
||
+CONFIG_CMD_EXT4=y
|
||
+CONFIG_CMD_FAT=y
|
||
+CONFIG_CMD_FS_GENERIC=y
|
||
+CONFIG_CMD_FS_UUID=y
|
||
# CONFIG_CMD_ELF is not set
|
||
# CONFIG_CMD_XIMG is not set
|
||
CONFIG_CMD_GPIO=y
|
||
-CONFIG_CMD_GPT=y
|
||
+# CONFIG_CMD_GPT is not set
|
||
+CONFIG_CMD_HASH=y
|
||
+CONFIG_CMD_ITEST=y
|
||
+CONFIG_CMD_LED=y
|
||
+CONFIG_CMD_LICENSE=y
|
||
+CONFIG_CMD_LINK_LOCAL=y
|
||
+CONFIG_CMD_MBR=y
|
||
CONFIG_CMD_MMC=y
|
||
-CONFIG_CMD_READ=y
|
||
-# CONFIG_CMD_SETEXPR is not set
|
||
+CONFIG_CMD_MTD=y
|
||
# CONFIG_CMD_NFS is not set
|
||
+CONFIG_CMD_PCI=y
|
||
+CONFIG_CMD_SF_TEST=y
|
||
+CONFIG_CMD_PING=y
|
||
+CONFIG_CMD_PXE=y
|
||
+CONFIG_CMD_PWM=y
|
||
+CONFIG_CMD_SMC=y
|
||
+CONFIG_CMD_TFTPBOOT=y
|
||
+CONFIG_CMD_TFTPSRV=y
|
||
+CONFIG_CMD_ASKENV=y
|
||
+CONFIG_CMD_PART=y
|
||
+CONFIG_CMD_RARP=y
|
||
+CONFIG_CMD_SATA=y
|
||
+CONFIG_CMD_SETEXPR=y
|
||
+CONFIG_CMD_SLEEP=y
|
||
+CONFIG_CMD_SNTP=y
|
||
+CONFIG_CMD_SOURCE=y
|
||
+CONFIG_CMD_STRINGS=y
|
||
+CONFIG_CMD_USB=y
|
||
+CONFIG_CMD_UUID=y
|
||
+CONFIG_CMD_MMC=y
|
||
+CONFIG_CMD_READ=y
|
||
+CONFIG_CMD_SCSI=y
|
||
+CONFIG_DISPLAY_CPUINFO=y
|
||
+CONFIG_DM_ETH=y
|
||
+CONFIG_DM_GPIO=y
|
||
+CONFIG_DM_SCSI=y
|
||
+CONFIG_DM_MMC=y
|
||
+CONFIG_DM_MTD=y
|
||
+CONFIG_DM_REGULATOR=y
|
||
+CONFIG_DM_REGULATOR_FIXED=y
|
||
+CONFIG_DM_SERIAL=y
|
||
+CONFIG_DM_REGULATOR_GPIO=y
|
||
+CONFIG_DM_USB=y
|
||
+CONFIG_DM_PCI=y
|
||
+CONFIG_DM_PWM=y
|
||
+CONFIG_AHCI=y
|
||
+CONFIG_AHCI_PCI=y
|
||
+CONFIG_SCSI_AHCI=y
|
||
+CONFIG_SCSI=y
|
||
+CONFIG_PWM_MTK=y
|
||
+CONFIG_HUSH_PARSER=y
|
||
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||
CONFIG_ENV_OVERWRITE=y
|
||
CONFIG_ENV_IS_IN_MMC=y
|
||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||
CONFIG_NET_RANDOM_ETHADDR=y
|
||
+CONFIG_NETCONSOLE=y
|
||
CONFIG_REGMAP=y
|
||
CONFIG_SYSCON=y
|
||
CONFIG_CLK=y
|
||
+CONFIG_LZMA=y
|
||
+CONFIG_MEDIATEK_ETH=y
|
||
# CONFIG_MMC_QUIRKS is not set
|
||
CONFIG_SUPPORT_EMMC_BOOT=y
|
||
CONFIG_MMC_HS400_SUPPORT=y
|
||
CONFIG_MMC_MTK=y
|
||
+CONFIG_MTK_POWER_DOMAIN=y
|
||
+CONFIG_MTK_SERIAL=y
|
||
+CONFIG_MTK_TIMER=y
|
||
+CONFIG_OF_LIBFDT_OVERLAY=y
|
||
+CONFIG_PARTITION_UUIDS=y
|
||
+CONFIG_PCI=y
|
||
+CONFIG_PCIE_MEDIATEK=y
|
||
+CONFIG_PHY=y
|
||
CONFIG_PHY_FIXED=y
|
||
-CONFIG_MEDIATEK_ETH=y
|
||
CONFIG_PINCTRL=y
|
||
CONFIG_PINCONF=y
|
||
CONFIG_PINCTRL_MT7623=y
|
||
CONFIG_POWER_DOMAIN=y
|
||
-CONFIG_MTK_POWER_DOMAIN=y
|
||
-CONFIG_DM_SERIAL=y
|
||
-CONFIG_MTK_SERIAL=y
|
||
+CONFIG_RANDOM_UUID=y
|
||
+CONFIG_REGEX=y
|
||
CONFIG_SYSRESET=y
|
||
CONFIG_SYSRESET_WATCHDOG=y
|
||
CONFIG_TIMER=y
|
||
-CONFIG_MTK_TIMER=y
|
||
+CONFIG_VERSION_VARIABLE=y
|
||
CONFIG_WDT_MTK=y
|
||
-CONFIG_LZMA=y
|
||
# CONFIG_EFI_GRUB_ARM32_WORKAROUND is not set
|
||
--- /dev/null
|
||
+++ b/bananapi_bpi-r2_env
|
||
@@ -0,0 +1,70 @@
|
||
+ipaddr=192.168.1.1
|
||
+serverip=192.168.1.254
|
||
+loadaddr=0x88000000
|
||
+dtaddr=0x83f00000
|
||
+console=earlycon=uart8250,mmio32,0x11004000 console=ttyS2,115200 console=tty1
|
||
+initrd_high=0xafffffff
|
||
+part_default=3
|
||
+part_recovery=2
|
||
+bootcmd=run boot_mmc
|
||
+bootdelay=0
|
||
+bootfile=openwrt-mediatek-mt7623-bananapi_bpi-r2-initramfs-recovery.itb
|
||
+bootfile_upg=openwrt-mediatek-mt7623-bananapi_bpi-r2-squashfs-sysupgrade.itb
|
||
+bootled_pwr=bpi-r2:pio:green
|
||
+bootled_rec=bpi-r2:pio:blue
|
||
+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
|
||
+bootmenu_default=0
|
||
+bootmenu_delay=0
|
||
+bootmenu_title= [0;34m( ( ( [1;39mOpenWrt[0;34m ) ) )
|
||
+bootmenu_0=Initialize environment.=run _firstboot
|
||
+bootmenu_0d=Run default boot command.=run boot_default
|
||
+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
|
||
+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
|
||
+boot_first=if button factory ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
|
||
+boot_tftp_forever=led bpi-r2:pio:blue on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
|
||
+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
|
||
+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run mmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr ; fi
|
||
+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr
|
||
+boot_mmc=run boot_production ; run boot_recovery
|
||
+emmc_init=run emmc_init_bl && run emmc_init_openwrt ; env default bootcmd ; saveenv
|
||
+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
|
||
+emmc_init_openwrt=run sdmmc_read_recovery && run emmc_write_recovery ; run sdmmc_read_production && run emmc_write_production
|
||
+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
|
||
+emmc_write_preloader=mmc dev 0 1 ; mmc partconf 0 1 1 1 ; mmc write $loadaddr 0x4 0x100 ; mmc partconf 0 1 1 0
|
||
+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
|
||
+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
|
||
+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
|
||
+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
|
||
+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
|
||
+mmc_write_production=if test "$bootedfrom" = "SD" ; then run sdmmc_write_production ; else run emmc_write_production ; fi
|
||
+mmc_write_recovery=if test "$bootedfrom" = "SD" ; run sdmmc_write_recovery ; else run emmc_write_recovery ; fi
|
||
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$part_size && mmc write $loadaddr 0x$part_addr 0x$image_size
|
||
+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
|
||
+reset_factory=eraseenv && reset
|
||
+sdmmc_read_emmc_hdr=mmc dev 1 && mmc read $loadaddr 0x1ff8 0x8
|
||
+sdmmc_read_preloader=mmc dev 1 && mmc read $loadaddr 0x4 0x100
|
||
+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
|
||
+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
|
||
+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
|
||
+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
|
||
+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
|
||
+_checkbootedfrom=setenv _checkbootedfrom ; if itest.l *81dffff0 == 434d4d65 ; then setenv bootedfrom eMMC ; else setenv bootedfrom SD ; fi
|
||
+_init_env=setenv _init_env ; setenv _create_env ; saveenv ; saveenv
|
||
+_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
|
||
+_set_bootcmd_sdmmc=setenv boot_production "led $bootled_rec off ; led $bootled_pwr on ; run sdmmc_read_production && bootm $loadaddr ; led $bootled_pwr off"
|
||
+_set_bootcmd_emmc=setenv boot_production "led $bootled_rec off ; led $bootled_pwr on ; run emmc_read_production && bootm $loadaddr ; led $bootled_pwr off"
|
||
+_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
|
||
+_set_bootcmd2_sdmmc=setenv boot_recovery "led $bootled_pwr off ; led $bootled_rec on ; run sdmmc_read_recovery && bootm $loadaddr ; led $bootled_rec off"
|
||
+_set_bootcmd2_emmc=setenv boot_recovery "led $bootled_pwr off ; led $bootled_rec on ; run emmc_read_recovery && bootm $loadaddr ; led $bootled_rec off"
|
||
+_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
|
||
+_update_bootdev=setenv _update_bootdev ; if test "$bootedfrom" = "SD" ; then setenv bootargs "$console root=/dev/mmcblk1p65" ; else setenv bootargs "$console root=/dev/mmcblk0p65" ; fi
|
||
+_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
|
||
+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title [0;36m[$bootedfrom][0m [33m$ver[0m" ; run _set_bm2
|
||
+_set_bm2=setenv _set_bm2 ; setenv bootmenu_2 "Boot production system from $bootedfrom.=run boot_production ; run bootmenu_confirm_return" ; run _set_bm3
|
||
+_set_bm3=setenv _set_bm3 ; setenv bootmenu_3 "Boot recovery system from $bootedfrom.=run boot_recovery ; run bootmenu_confirm_return" ; run _set_bm4
|
||
+_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
|
||
+_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
|
||
+_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
|
||
+_set_bm6=setenv _set_bm6 ; setenv bootmenu_6 "[31mInstall bootloader, recovery and production to eMMC.[0m=run emmc_init ; run bootmenu_confirm_return" ; setenv _menu_next 7
|
||
+_set_bmr=setenv _set_bmr ; setenv bootmenu_${_menu_next} "Reboot.=reset" ; setexpr _menu_next ${_menu_next} + 1 ; run _set_bmf
|
||
+_set_bmf=setenv _set_bmf ; setenv bootmenu_${_menu_next} "Reset all settings to factory defaults.=run reset_factory ; reset" ; setenv _menu_next
|
||
--- a/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
|
||
+++ b/arch/arm/dts/mt7623n-bananapi-bpi-r2.dts
|
||
@@ -66,6 +66,15 @@
|
||
default-state = "off";
|
||
};
|
||
};
|
||
+
|
||
+ gpio-keys {
|
||
+ compatible = "gpio-keys";
|
||
+
|
||
+ factory {
|
||
+ label = "factory";
|
||
+ gpios = <&gpio 256 GPIO_ACTIVE_LOW>;
|
||
+ };
|
||
+ };
|
||
};
|
||
|
||
ð {
|