ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-23 07:22:33 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
0ea329fec4
openwrt/package/boot/uboot-mediatek/patches/301-mt7622-generic-reset-button-ignore-env.patch

52 lines
1.2 KiB
Diff
Raw Normal View History

uboot-mediatek: add support for Linksys E8450 Build U-Boot for the Linksys E8450 in order to have support for UBI. The loader has a default environment with scripts handling the reset button as well as fall-back to recovery firmware. If the loader comes up without a valid environment found in UBI, it will automatically make sure UBI is formatted and create a new environment and proceed to load recovery firmware (either from UBI or via TFTP if recovery is corrupted or unavailable). If the button is held down during power-on, the yellow status LED turns on and the bootloader environment is reset to factory defaults. If the button is released at this point, the recovery firmware (if existing) is loaded from UBI and booted. If the button is continously held down even beyond the point that the yellow LED turned on, the loader will try to load the recovery firmware via TFTP from server 192.168.1.254, write it to UBI and boot. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-01-30 13:58:16 +00:00
--- a/board/mediatek/mt7622/mt7622_rfb.c
+++ b/board/mediatek/mt7622/mt7622_rfb.c
uboot-mediatek: add build for Ubiquiti Networks UniFi 6 LR Add U-Boot build for the Ubiquiti Networks UniFi 6 LR access point. This allows updating the bootchain to modern ARM Trusted Firmware 2.4 and U-Boot 2021.04 while keeping as much of the existing flash layout as possible (u-boot-env, factory and eeprom partitions are retained), gaining robust recovery vs. production dual-boot mechanism. Add info for the Winbond W25Q512JV SPI NOR flash used in the device and wait for GPIOs to settle after reset before checking for reset button. I2C connected LED controller is not supported yet. Writing large amounts of data to SPI flash currently doesn't work due to watchdog timeout causing reset before data write completes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-04-02 11:05:15 +00:00
@@ -6,9 +6,16 @@
uboot-mediatek: add support for Linksys E8450 Build U-Boot for the Linksys E8450 in order to have support for UBI. The loader has a default environment with scripts handling the reset button as well as fall-back to recovery firmware. If the loader comes up without a valid environment found in UBI, it will automatically make sure UBI is formatted and create a new environment and proceed to load recovery firmware (either from UBI or via TFTP if recovery is corrupted or unavailable). If the button is held down during power-on, the yellow status LED turns on and the bootloader environment is reset to factory defaults. If the button is released at this point, the recovery firmware (if existing) is loaded from UBI and booted. If the button is continously held down even beyond the point that the yellow LED turned on, the loader will try to load the recovery firmware via TFTP from server 192.168.1.254, write it to UBI and boot. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-01-30 13:58:16 +00:00
#include <common.h>
#include <config.h>
+#include <dm.h>
+#include <button.h>
#include <env.h>
#include <init.h>
uboot-mediatek: update to 2021.04-rc3 with MediaTek's patches MediaTek published their current U-Boot patchset on github: https://github.com/mtk-openwrt/u-boot/commits/mtksoc Import the platform patches from there (`00-mtk-*.patch`), arrange, them nicely, drop no longer needed local patches and rebase on top of U-Boot 2021.04-rc3. Tested and works well on Linksys E8450 (snand-1ddr) as well as Bananapi BPi-R64 (sdmmc-2ddr, emmc-2ddr). Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-02-20 13:04:38 +00:00
#include <asm/global_data.h>
uboot-mediatek: add build for Ubiquiti Networks UniFi 6 LR Add U-Boot build for the Ubiquiti Networks UniFi 6 LR access point. This allows updating the bootchain to modern ARM Trusted Firmware 2.4 and U-Boot 2021.04 while keeping as much of the existing flash layout as possible (u-boot-env, factory and eeprom partitions are retained), gaining robust recovery vs. production dual-boot mechanism. Add info for the Winbond W25Q512JV SPI NOR flash used in the device and wait for GPIOs to settle after reset before checking for reset button. I2C connected LED controller is not supported yet. Writing large amounts of data to SPI flash currently doesn't work due to watchdog timeout causing reset before data write completes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-04-02 11:05:15 +00:00
+#include <linux/delay.h>
+
uboot-mediatek: add support for Linksys E8450 Build U-Boot for the Linksys E8450 in order to have support for UBI. The loader has a default environment with scripts handling the reset button as well as fall-back to recovery firmware. If the loader comes up without a valid environment found in UBI, it will automatically make sure UBI is formatted and create a new environment and proceed to load recovery firmware (either from UBI or via TFTP if recovery is corrupted or unavailable). If the button is held down during power-on, the yellow status LED turns on and the bootloader environment is reset to factory defaults. If the button is released at this point, the recovery firmware (if existing) is loaded from UBI and booted. If the button is continously held down even beyond the point that the yellow LED turned on, the loader will try to load the recovery firmware via TFTP from server 192.168.1.254, write it to UBI and boot. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-01-30 13:58:16 +00:00
+#ifndef CONFIG_RESET_BUTTON_LABEL
+#define CONFIG_RESET_BUTTON_LABEL "reset"
+#endif
uboot-mediatek: add build for Ubiquiti Networks UniFi 6 LR Add U-Boot build for the Ubiquiti Networks UniFi 6 LR access point. This allows updating the bootchain to modern ARM Trusted Firmware 2.4 and U-Boot 2021.04 while keeping as much of the existing flash layout as possible (u-boot-env, factory and eeprom partitions are retained), gaining robust recovery vs. production dual-boot mechanism. Add info for the Winbond W25Q512JV SPI NOR flash used in the device and wait for GPIOs to settle after reset before checking for reset button. I2C connected LED controller is not supported yet. Writing large amounts of data to SPI flash currently doesn't work due to watchdog timeout causing reset before data write completes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-04-02 11:05:15 +00:00
uboot-mediatek: additions from MTK SDK * updated SNAND/SNFI driver brings support for MT7981 * add support for MediaTek NAND Memory bad Block Management (NMBM) (not used for any boards atm, but could be useful in future) * wire up NMBM support for MT7622, MT7629, MT7981 and MT7986 * replace some local patches with updated version from SDK * bring some legacy precompiler symbols which haven't been converted into Kconfig symbols in U-Boot 2022.07, remove when bumbping to U-Boot 2022.10: 100-28-include-configs-mt7986-h-from-SDK.patch Source: https://github.com/mtk-openwrt/u-boot Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-08-07 10:06:56 +00:00
#include <mtd.h>
#include <linux/mtd/mtd.h>
@@ -25,7 +32,19 @@ int board_init(void)
uboot-mediatek: add support for Linksys E8450 Build U-Boot for the Linksys E8450 in order to have support for UBI. The loader has a default environment with scripts handling the reset button as well as fall-back to recovery firmware. If the loader comes up without a valid environment found in UBI, it will automatically make sure UBI is formatted and create a new environment and proceed to load recovery firmware (either from UBI or via TFTP if recovery is corrupted or unavailable). If the button is held down during power-on, the yellow status LED turns on and the bootloader environment is reset to factory defaults. If the button is released at this point, the recovery firmware (if existing) is loaded from UBI and booted. If the button is continously held down even beyond the point that the yellow LED turned on, the loader will try to load the recovery firmware via TFTP from server 192.168.1.254, write it to UBI and boot. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-01-30 13:58:16 +00:00
int board_late_init(void)
{
- gd->env_valid = 1; //to load environment variable from persistent store
+ struct udevice *dev;
+
uboot-mediatek: unifi-6-lr: fix erase of production parition mtd erase needs to be aligned with erase blocks. Use padded image size for erasing the production volume. As the environment grew above the current size of 0x1000 bytes by introducing the new padding function, increase the env size to 0x4000. While at it, clean up reset button function to work to more reliable on that board. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-04-29 01:06:09 +00:00
+ if (!button_get_by_label(CONFIG_RESET_BUTTON_LABEL, &dev)) {
+ puts("reset button found\n");
uboot-mediatek: add build for Ubiquiti Networks UniFi 6 LR Add U-Boot build for the Ubiquiti Networks UniFi 6 LR access point. This allows updating the bootchain to modern ARM Trusted Firmware 2.4 and U-Boot 2021.04 while keeping as much of the existing flash layout as possible (u-boot-env, factory and eeprom partitions are retained), gaining robust recovery vs. production dual-boot mechanism. Add info for the Winbond W25Q512JV SPI NOR flash used in the device and wait for GPIOs to settle after reset before checking for reset button. I2C connected LED controller is not supported yet. Writing large amounts of data to SPI flash currently doesn't work due to watchdog timeout causing reset before data write completes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-04-02 11:05:15 +00:00
+#ifdef CONFIG_RESET_BUTTON_SETTLE_DELAY
uboot-mediatek: unifi-6-lr: fix erase of production parition mtd erase needs to be aligned with erase blocks. Use padded image size for erasing the production volume. As the environment grew above the current size of 0x1000 bytes by introducing the new padding function, increase the env size to 0x4000. While at it, clean up reset button function to work to more reliable on that board. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-04-29 01:06:09 +00:00
+ mdelay(CONFIG_RESET_BUTTON_SETTLE_DELAY);
uboot-mediatek: add build for Ubiquiti Networks UniFi 6 LR Add U-Boot build for the Ubiquiti Networks UniFi 6 LR access point. This allows updating the bootchain to modern ARM Trusted Firmware 2.4 and U-Boot 2021.04 while keeping as much of the existing flash layout as possible (u-boot-env, factory and eeprom partitions are retained), gaining robust recovery vs. production dual-boot mechanism. Add info for the Winbond W25Q512JV SPI NOR flash used in the device and wait for GPIOs to settle after reset before checking for reset button. I2C connected LED controller is not supported yet. Writing large amounts of data to SPI flash currently doesn't work due to watchdog timeout causing reset before data write completes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-04-02 11:05:15 +00:00
+#endif
uboot-mediatek: unifi-6-lr: fix erase of production parition mtd erase needs to be aligned with erase blocks. Use padded image size for erasing the production volume. As the environment grew above the current size of 0x1000 bytes by introducing the new padding function, increase the env size to 0x4000. While at it, clean up reset button function to work to more reliable on that board. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-04-29 01:06:09 +00:00
+ if (button_get_state(dev) == BUTTON_ON) {
+ puts("button pushed, resetting environment\n");
+ gd->env_valid = ENV_INVALID;
+ }
uboot-mediatek: add build for Ubiquiti Networks UniFi 6 LR Add U-Boot build for the Ubiquiti Networks UniFi 6 LR access point. This allows updating the bootchain to modern ARM Trusted Firmware 2.4 and U-Boot 2021.04 while keeping as much of the existing flash layout as possible (u-boot-env, factory and eeprom partitions are retained), gaining robust recovery vs. production dual-boot mechanism. Add info for the Winbond W25Q512JV SPI NOR flash used in the device and wait for GPIOs to settle after reset before checking for reset button. I2C connected LED controller is not supported yet. Writing large amounts of data to SPI flash currently doesn't work due to watchdog timeout causing reset before data write completes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-04-02 11:05:15 +00:00
+ }
uboot-mediatek: add support for Linksys E8450 Build U-Boot for the Linksys E8450 in order to have support for UBI. The loader has a default environment with scripts handling the reset button as well as fall-back to recovery firmware. If the loader comes up without a valid environment found in UBI, it will automatically make sure UBI is formatted and create a new environment and proceed to load recovery firmware (either from UBI or via TFTP if recovery is corrupted or unavailable). If the button is held down during power-on, the yellow status LED turns on and the bootloader environment is reset to factory defaults. If the button is released at this point, the recovery firmware (if existing) is loaded from UBI and booted. If the button is continously held down even beyond the point that the yellow LED turned on, the loader will try to load the recovery firmware via TFTP from server 192.168.1.254, write it to UBI and boot. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-01-30 13:58:16 +00:00
+
env_relocate();
return 0;
}
uboot-mediatek: update to version 2022.01 Tested on BananaPi R2 (SD, eMMC), BananaPi R64 (SD, eMMC, SPI-NAND) and UniElec U7623-02 (eMMC). Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-01-11 21:26:43 +00:00
--- a/arch/arm/mach-mediatek/Kconfig
+++ b/arch/arm/mach-mediatek/Kconfig
uboot-mediatek: replace patches with updated versions Weijie Gao has submitted an updated version of the patchset adding support for MT7986 and MT7981 to U-Boot. Use that v2 patchset. Changes of v2: - Add cpu driver for print_cpuinfo() - Fix NULL pointer dereference in mtk_image (was already fixed in OpenWrt) - Fix coding style - Minor changes https://patchwork.ozlabs.org/project/uboot/list/?series=316148 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-08-31 12:31:02 +00:00
@@ -140,4 +140,8 @@ config MTK_BROM_HEADER_INFO
uboot-mediatek: additions from MTK SDK * updated SNAND/SNFI driver brings support for MT7981 * add support for MediaTek NAND Memory bad Block Management (NMBM) (not used for any boards atm, but could be useful in future) * wire up NMBM support for MT7622, MT7629, MT7981 and MT7986 * replace some local patches with updated version from SDK * bring some legacy precompiler symbols which haven't been converted into Kconfig symbols in U-Boot 2022.07, remove when bumbping to U-Boot 2022.10: 100-28-include-configs-mt7986-h-from-SDK.patch Source: https://github.com/mtk-openwrt/u-boot Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-08-07 10:06:56 +00:00
source "board/mediatek/mt7629/Kconfig"
uboot-mediatek: rework support for the BPi-R2 * use built-in default environment instead of file in bootfs * get rid of bootfs alltogether and use uImage.FIT * auto-detect boot device like original script did * add support for factory button Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-07-12 15:52:21 +00:00
+config RESET_BUTTON_LABEL
+ string "Button to trigger factory reset"
+ default "reset"
+
endif
Reference in New Issue Copy Permalink