December 2021 - U-Boot

[PATCH 08/18] km/ls102xa: add support for field fail-safe u-boot
by Aleksandar Gerasimovski 10 Dec '21

10 Dec '21

Field fail-safe u-boot update procedure for pg-wcom boards is defined and implemented by 59b3403. This patch invokes the update procedure for pg-wcom-ls102x designs during early misc_init_f execution. Signed-off-by: Aleksandar Gerasimovski <aleksandar.gerasimovski(a)hitachienergy.com> --- board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 7 +++++++ include/configs/km/pg-wcom-ls102xa.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c index cff18dc..3dae423 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c @@ -109,6 +109,13 @@ int board_early_init_f(void) return 0; } +int misc_init_f(void) +{ + if (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED)) + check_for_uboot_update(); + return 0; +} + int board_init(void) { if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_A010315)) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 743d09e..249bcef 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -280,4 +280,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ #define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* Increase map for Linux */ +#define CONFIG_MISC_INIT_F + #endif -- 1.8.3.1

2 2

[PATCH 07/18] km: common: implement field fail-safe u-boot update
by Aleksandar Gerasimovski 10 Dec '21

10 Dec '21

This patch provides possibility for field fail-safe u-boot updates. The implementation can be used on all pg-wcom boards that are booting from parallel NOR flash. When used in a board design, provided check_for_uboot_update function will start new u-boot at defined location if updateduboot envvar is set to yes. With this implementation it is expected that factory programmed u-boot will always stay as it is, and optionally new u-boot can be safely programmed by embedded software when the unit is rolled out on the field. It is expected check_for_uboot_update to be called early in execution before relocation (*_f) once SoC is basically initialized and environment can be read, with this possibilities to not be able to fix a u-boot bug by a u-boot update are reduced to minimum. Signed-off-by: Aleksandar Gerasimovski <aleksandar.gerasimovski(a)hitachienergy.com> --- board/keymile/Kconfig | 32 ++++++++++++++++++++++++++ board/keymile/common/common.c | 53 +++++++++++++++++++++++++++++++++++++++++++ board/keymile/common/common.h | 1 + 3 files changed, 86 insertions(+) diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index 7dd8213..863c07d 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -130,6 +130,38 @@ config SYS_IVM_EEPROM_PAGE_LEN help Page size of inventory in EEPROM. +config PG_WCOM_UBOOT_UPDATE_SUPPORTED + bool "Enable U-boot Field Fail-Safe Update Functionality" + default n + help + Indicates that field fail-safe u-boot update is supported. + This functionality works only for designs that are booting + from parallel NOR flash. + +config PG_WCOM_UBOOT_BOOTPACKAGE + bool "U-boot Is Part Of Factory Boot-Package Image" + default n + help + Indicates that u-boot will be a part of the factory programmed + boot-package image. + Has to be set for original u-boot programmed at factory. + +config PG_WCOM_UBOOT_UPDATE_TEXT_BASE + hex "Text Base For U-boot Programmed Outside Factory" + default 0xFFFFFFFF + help + Text base of an updated u-boot that is not factory programmed but + later when the unit is rolled out on the field. + Has to be set for original u-boot programmed at factory. + +config PG_WCOM_UBOOT_UPDATE + bool "U-boot Is Part Of Factory Boot-Package Image" + default n + help + Indicates that u-boot will be a part of the embedded software and + programmed at field. + Has to be set for updated u-boot version programmed at field. + source "board/keymile/km83xx/Kconfig" source "board/keymile/kmcent2/Kconfig" source "board/keymile/km_arm/Kconfig" diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index ff07260..3999f48 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -19,6 +19,8 @@ #include <asm/io.h> #include <linux/ctype.h> #include <linux/delay.h> +#include <linux/bug.h> +#include <bootcount.h> #if defined(CONFIG_POST) #include "post.h" @@ -76,6 +78,57 @@ int set_km_env(void) return 0; } +#if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) +#if ((!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ + !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ + (CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ + CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) +#error "It has to be either bootpackage or update u-boot image!" +#endif +void check_for_uboot_update(void) +{ + void (*uboot_update_entry)(void) = + (void (*)(void)) CONFIG_PG_WCOM_UBOOT_UPDATE_TEXT_BASE; + char *isupdated = env_get("updateduboot"); + ulong bootcount = bootcount_load(); + ulong ebootcount = 0; + + if (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE)) { + /* + * When running in factory burned u-boot move to the updated + * u-boot version only if updateduboot envvar is set to 'yes' + * and bootcount limit is not exceeded. + * Board must be able to start in factory bootloader mode! + */ + if (isupdated && !strncmp(isupdated, "yes", 3) && + bootcount <= CONFIG_BOOTCOUNT_BOOTLIMIT) { + printf("Check update: update detected, "); + printf("starting new image @%08x ...\n", + CONFIG_PG_WCOM_UBOOT_UPDATE_TEXT_BASE); + ebootcount = early_bootcount_load(); + if (ebootcount <= CONFIG_BOOTCOUNT_BOOTLIMIT) { + early_bootcount_store(++ebootcount); + uboot_update_entry(); + } else { + printf("Check update: warning: "); + printf("early bootcount exceeded (%lu)\n", + ebootcount); + } + } + printf("Check update: starting factory image @%08x ...\n", + CONFIG_SYS_TEXT_BASE); + } else if (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)) { + /* + * When running in field updated u-boot, make sure that + * bootcount limit is never exceeded. Must never happen! + */ + WARN_ON(bootcount > CONFIG_BOOTCOUNT_BOOTLIMIT); + printf("Check update: updated u-boot starting @%08x ...\n", + CONFIG_SYS_TEXT_BASE); + } +} +#endif + #if defined(CONFIG_SYS_I2C_INIT_BOARD) static void i2c_write_start_seq(void) { diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h index fc14728..d16c824 100644 --- a/board/keymile/common/common.h +++ b/board/keymile/common/common.h @@ -135,6 +135,7 @@ int set_km_env(void); ulong early_bootcount_load(void); void early_bootcount_store(ulong ebootcount); +void check_for_uboot_update(void); #define DELAY_ABORT_SEQ 62 /* @200kHz 9 clocks = 44us, 62us is ok */ #define DELAY_HALF_PERIOD (500 / (CONFIG_SYS_I2C_SPEED / 1000)) -- 1.8.3.1

1 1

ARM: mach-at91: how to stop U-Boot/SPL from disabling the watchdog timer on SAMAD3 Xplained
by Michael Opdenacker 10 Dec '21

10 Dec '21

Greetings, Documenting the issue and a workaround here in case other people encounter it, but if you have tips for fixing the issue in U-Boot, I'm interested of course! I noticed that the SAMA5D3 Xplained board didn't have the watchdog timer enabled in the Linux DTS. I submitted a patch to fix this: https://lkml.org/lkml/2021/12/9/740 However, applying this patch isn't sufficient to make the watchdog available on Linux: at91_wdt fffffe40.watchdog: watchdog is disabled at91_wdt: probe of fffffe40.watchdog failed with error -22 As explained on https://elixir.bootlin.com/linux/latest/source/drivers/watchdog/at91sam9_wd…, this happens because the bootloader or bootstrap code already disables the watchdog. The trouble is, unlike on SAMA5D2 and SAMAD4 (if I understood correctly),"The Watchdog Timer Mode Register can be only written to once". However, I haven't managed to disable this behavior in U-Boot (including the SPL). I have no watchdog related option turned on anywhere, and by adding puts() messages in the code, I believe that the wdt_stop() function doesn't get called either. Maybe the corresponding watchdog register is written to by the code initializing the SoC, but I couldn't find where. A workaround is to use at91bootstrap instead of U-Boot SPL, which has a configuration parameter to disable to watchdog: git clone https://github.com/linux4sam/at91bootstrap.git export CROSS_COMPILE=arm-linux- (whatever your cross-compiler is) make sama5d3_xplainedsd_uboot_defconfig make menuconfig (Disable CONFIG_DISABLE_WATCHDOG) make Copy boot.bin (under build/...) and u-boot.bin (from U-Boot sources) to the SD card. At least, this proves that the culprit is U-Boot SPL! So, any advice for making it possible prevent the SPL from disabling the watchdog on SAMA5D3 (Xplained at least)? Cheers Michael. -- Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com

2 2

[PATCH v2 0/1] rsa: adds rsa3072 algorithm
by Jamin Lin 10 Dec '21

10 Dec '21

Add to support rsa 30272 bits algorithm in tools for make-image signing at host side and add rsa 3027 bits verification in the image binary. v2: - update to send a single patch *** BLURB HERE *** Jamin Lin (1): rsa: adds rsa3072 algorithm include/u-boot/rsa.h | 1 + lib/rsa/rsa-verify.c | 6 ++++++ tools/image-sig-host.c | 7 +++++++ 3 files changed, 14 insertions(+) -- 2.17.1

2 3

[PATCH v1] Cubieboard2:Fix Cubieboard2 freeze, when LED boot enabled
by Javad Rahimi 10 Dec '21

10 Dec '21

When enabling the LED support for Cubieboard2 (SUN7I) the uboot freezes in status_led_init() function. It uses a static global variable, while the .BSS is defined in DRAM area while that function is called before DRAM Signed-off-by: Javad Rahimi <javad321javad(a)gmail.com> --- drivers/misc/status_led.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/misc/status_led.c b/drivers/misc/status_led.c index a6e9c03a02..7d30355423 100644 --- a/drivers/misc/status_led.c +++ b/drivers/misc/status_led.c @@ -23,6 +23,7 @@ typedef struct { int state; int period; int cnt; + int initialized:1; } led_dev_t; led_dev_t led_dev[] = { @@ -30,12 +31,14 @@ led_dev_t led_dev[] = { CONFIG_LED_STATUS_STATE, LED_STATUS_PERIOD, 0, + 0, }, #if defined(CONFIG_LED_STATUS1) { CONFIG_LED_STATUS_BIT1, CONFIG_LED_STATUS_STATE1, LED_STATUS_PERIOD1, 0, + 0, }, #endif #if defined(CONFIG_LED_STATUS2) @@ -43,6 +46,7 @@ led_dev_t led_dev[] = { CONFIG_LED_STATUS_STATE2, LED_STATUS_PERIOD2, 0, + 0, }, #endif #if defined(CONFIG_LED_STATUS3) @@ -50,6 +54,7 @@ led_dev_t led_dev[] = { CONFIG_LED_STATUS_STATE3, LED_STATUS_PERIOD3, 0, + 0, }, #endif #if defined(CONFIG_LED_STATUS4) @@ -57,6 +62,7 @@ led_dev_t led_dev[] = { CONFIG_LED_STATUS_STATE4, LED_STATUS_PERIOD4, 0, + 0, }, #endif #if defined(CONFIG_LED_STATUS5) @@ -64,22 +70,26 @@ led_dev_t led_dev[] = { CONFIG_LED_STATUS_STATE5, LED_STATUS_PERIOD5, 0, + 0, }, #endif }; #define MAX_LED_DEV (sizeof(led_dev)/sizeof(led_dev_t)) -static int status_led_init_done = 0; void status_led_init(void) { led_dev_t *ld; int i; - for (i = 0, ld = led_dev; i < MAX_LED_DEV; i++, ld++) + for (i = 0, ld = led_dev; i < MAX_LED_DEV; i++, ld++) { __led_init (ld->mask, ld->state); - status_led_init_done = 1; + ld->initialized = 1; + } + + return 0; + } void status_led_tick(ulong timestamp) @@ -87,11 +97,11 @@ void status_led_tick(ulong timestamp) led_dev_t *ld; int i; - if (!status_led_init_done) - status_led_init(); - for (i = 0, ld = led_dev; i < MAX_LED_DEV; i++, ld++) { + if (!ld->initialized) + continue; + if (ld->state != CONFIG_LED_STATUS_BLINKING) continue; @@ -110,11 +120,11 @@ void status_led_set(int led, int state) if (led < 0 || led >= MAX_LED_DEV) return; - if (!status_led_init_done) - status_led_init(); - ld = &led_dev[led]; + if (!ld->initialized) + return; + ld->state = state; if (state == CONFIG_LED_STATUS_BLINKING) { ld->cnt = 0; /* always start with full period */ -- 2.25.1

2 2

[PATCH] dt-bindings: u-boot: Add a few more options bindings
by Simon Glass 09 Dec '21

09 Dec '21

This adds three new options with varying degree of interest / precedent. This being sent to the mailing list since it might attract more review. A PR will be sent when this has had some review. That is why the file path is set up for https://github.com/devicetree-org/dt-schema rather than the Linux kernel. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- schemas/options/u-boot.yaml | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/schemas/options/u-boot.yaml b/schemas/options/u-boot.yaml index 71dfda7..b8bdec1 100644 --- a/schemas/options/u-boot.yaml +++ b/schemas/options/u-boot.yaml @@ -71,6 +71,37 @@ properties: 2: use simplified command line (e.g. avoid hush) 3... reserved + load-environment: + $ref: /schemas/types.yaml#/definitions/uint32 + default: 1 + maximum: 1 + description: | + This allows control over whether U-Boot loads its environment after + relocation. This normally happens automatically, but can pose a security + risk, so disabling it in certain situations is useful. + + Note: This could be a boolean. It is defined as an integer since that + allows changing the value without resizing the devicetree. I'm not sure + how ugly that is, but IMO the fact that 'false' boolean values are + represented by being missing is a bit of a pain. One must either add or + delete the property. + + Values: + + 0: don't load the environment + 1: do load the environment + + no-apm-final: + $ref: /schemas/types.yaml#/definitions/flag + description: | + For devices running on coreboot, this tells U-Boot not to lock down the + Intel Management Engine (ME) registers. This allows U-Boot to access the + hardware more fully for platforms that need it. + + Absence of this property indicates that the ME registers should be locked + down as part of U-Boot's start-up sequence and before the command line is + available. + silent-console: $ref: /schemas/types.yaml#/definitions/uint32 default: 0 @@ -88,6 +119,23 @@ properties: enabled) 2: console output is suppressed and not recorded + spl-payload-offset: + $ref: /schemas/types.yaml#/definitions/uint32 + default: 0 + description: | + If present (and SPL is controlled by the devicetree), this allows the + offset of the SPL payload (typically U-Boot) to be specified. The offset + is in bytes from the start of the media (typically SPI flash). + + Note: This is quite widely used in U-Boot, but since v2018.01 it is + possible to use Binman instead, to provide this offset (and various + others) to SPL, or even to U-Boot proper. So far I have not tried sending + the Binman bindings upstream, but perhaps that should be done instead. + + See here for details: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html#image-d… + required: - compatible @@ -101,6 +149,9 @@ examples: bootcmd = "vboot go auto"; bootdelay-sec = <(-1)>; bootsecure = <1>; + load-environment = <0>; + no-apm-final; silent-console = <1>; + spl-payload-offset = <0x40000>; /* 256K */ }; }; -- 2.34.0.rc2.393.gf8c9666880-goog

2 3

[PATCH v2 0/3] fix TCG2 error handling
by Masahisa Kojima 09 Dec '21

09 Dec '21

This series fix the efi_tcg2.c error handling. Masahisa Kojima (3): efi_loader: efi_tcg2_register returns appropriate error efi_loader: check tcg2 protocol installation outside the TCG protocol efi_loader: correctly handle no tpm device error include/efi_loader.h | 2 + lib/efi_loader/Kconfig | 2 + lib/efi_loader/efi_boottime.c | 9 ++-- lib/efi_loader/efi_image_loader.c | 13 +++-- lib/efi_loader/efi_setup.c | 4 ++ lib/efi_loader/efi_tcg2.c | 87 ++++++++++++++++++++++++------- 6 files changed, 91 insertions(+), 26 deletions(-) -- 2.17.1

2 6

Re: [PATCH v2] Cubieboard2:SUN7I:Add LED BOOT support
by Javad Rahimi 09 Dec '21

09 Dec '21

On Wed, Dec 8, 2021 at 8:33 PM Andre Przywara <andre.przywara(a)arm.com> wrote: > > On Wed, 8 Dec 2021 19:14:22 +0330 > Javad Rahimi <javad321javad(a)gmail.com> wrote: > > > On Wed, Dec 8, 2021 at 6:05 PM Andre Przywara <andre.przywara(a)arm.com> wrote: > > > > > > On Wed, 8 Dec 2021 15:25:54 +0100 > > > Frank Wunderlich <frank-w(a)public-files.de> wrote: > > > > > > Hi, > > > > > > > you should add maintainer email for your patch > > > > > > > > $ scripts/get_maintainer.pl board/sunxi/board.c > > > > Jagan Teki <jagan(a)amarulasolutions.com> (maintainer:ARM SUNXI) > > > > Andre Przywara <andre.przywara(a)arm.com> (maintainer:ARM SUNXI) > > > > u-boot(a)lists.denx.de (open list) > > > > > > Thanks Frank! > > > > > > > > Gesendet: Mittwoch, 08. Dezember 2021 um 15:22 Uhr > > > > > Von: "Javad Rahimi" <javad321javad(a)gmail.com> > > > > > An: u-boot(a)lists.denx.de > > > > > Cc: "Javad Rahimi" <javad321javad(a)gmail.com> > > > > > Betreff: [PATCH v2] Cubieboard2:SUN7I:Add LED BOOT support > > > > > > > > > > This feature makes it possible to assign one of > > > > > LED1(PH20) and LED2(PH21) to BOOT process LED. > > > > > User should activates the "Enable status LED API" in > > > > > "Device Drivers -> LED Support" > > > > > > Please have a look at the current pinephone_defconfig, because that uses > > > the boot LED already in a much easier fashion: > > > https://source.denx.de/u-boot/u-boot/-/commit/0534153fd1 > > > > > > Cheers, > > > Andre > > > > > Hi Andre, > > Thanks for your comments. I studied the pinephone_defconfig. > > By default, when activating the same options on Cubieboard2_defconfig > > it shows linker error for `__led_init` and `__led_set`. > > In other words, they are not defined. So, in this patch, I added the > > implementation for these functions for this board. > > Did you add the: > CONFIG_SPL_DRIVERS_MISC=y > line as well? And re-ran make Cubieboard2_defconfig? > Because that seemed to work for me. > > Cheers, > Andre > > When I add CONFIG_SPL_DRIVERS_MISC=y By flashing SD card and turning on the board, It freezes in this step: ``` U-Boot SPL 2022.01-rc3-00025-gf570594bc9-dirty (Dec 08 2021 - 20:36:51 +0330) ``` ----------------------------------------- The customized defconfig file for Cubieboard: ``` CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2" CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 CONFIG_MMC0_CD_PIN="PH1" CONFIG_SATAPWR="PB8" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C=y CONFIG_SCSI_AHCI=y CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_SLAVE=0x7f CONFIG_SYS_I2C_SPEED=400000 CONFIG_PHY_REALTEK=y CONFIG_ETH_DESIGNWARE=y CONFIG_MII=y CONFIG_SUN7I_GMAC=y CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y CONFIG_LED_STATUS_BIT=114 CONFIG_LED_STATUS_STATE=2 ``` Best Regards, Javad > > > > > > > > > > Signed-off-by: Javad Rahimi <javad321javad(a)gmail.com> > > > > > --- > > > > > This is my first contributation in open source world. > > > > > I'm sorry if I have mistakes in my commits and versioning. > > > > > I do my best to learn fast. > > > > > > > > > > Changes in v2: > > > > > - Missed braces added > > > > > - Unnecessary debug removed > > > > > - Some typo fixed > > > > > > > > > > board/sunxi/board.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ > > > > > 1 file changed, 49 insertions(+) > > > > > > > > > > diff --git a/board/sunxi/board.c b/board/sunxi/board.c > > > > > index 4f5747c34a..5e2f6ae902 100644 > > > > > --- a/board/sunxi/board.c > > > > > +++ b/board/sunxi/board.c > > > > > @@ -1002,3 +1002,52 @@ int board_fit_config_name_match(const char *name) > > > > > return ret; > > > > > } > > > > > #endif > > > > > + > > > > > +#if defined(CONFIG_LED_STATUS) && defined(CONFIG_LED_STATUS_BOOT) && defined(CONFIG_LED_STATUS_BOARD_SPECIFIC) > > > > > + > > > > > +#define CUBIE2_LED_BOOT_GPIO "PH20" > > > > > +static int gpio_boot_led; > > > > > + > > > > > +void __led_init(led_id_t mask, int state) > > > > > +{ > > > > > + int ret; > > > > > + > > > > > + if (mask != CONFIG_LED_STATUS_BOOT) > > > > > + return; > > > > > + > > > > > + ret = gpio_lookup_name(CUBIE2_LED_BOOT_GPIO, NULL, NULL, &gpio_boot_led); > > > > > + > > > > > + if (ret) > > > > > + return; > > > > > + > > > > > + ret = gpio_request(gpio_boot_led, "boot_led"); > > > > > + if (ret == -1) { > > > > > + debug("[gpio_request] Error:%d\n", ret); > > > > > + return; > > > > > + } > > > > > + > > > > > + ret = gpio_direction_output(gpio_boot_led, 1); > > > > > + if (ret == -1) { > > > > > + debug("[gpio_direction_output] Error:%d\n", ret); > > > > > + return; > > > > > + } > > > > > + __led_set(mask, state); > > > > > +} > > > > > + > > > > > +void __led_set(led_id_t mask, int state) > > > > > +{ > > > > > + if (mask != CONFIG_LED_STATUS_BOOT) > > > > > + return; > > > > > + > > > > > + gpio_set_value(gpio_boot_led, state); > > > > > +} > > > > > + > > > > > +void __led_toggle(led_id_t mask) > > > > > +{ > > > > > + if (mask != CONFIG_LED_STATUS_BOOT) > > > > > + return; > > > > > + > > > > > + gpio_set_value(gpio_boot_led, !gpio_get_value(gpio_boot_led)); > > > > > +} > > > > > + > > > > > +#endif > > > > > -- > > > > > 2.25.1 > > > > > > > > > > > > > >

2 6

Pull request: u-boot-sunxi/master fixes for 2022.01
by Andre Przywara 09 Dec '21

09 Dec '21

Hi Tom, please pull those two fixes from the sunxi tree. This fixes two regressions: eMMC operation on boards with WiFi (so using three MMC devices), and a repeated wrong error message in USB gadget mode (fastboot, ums). Thanks, Andre =========================== The following changes since commit 558002a0f2230bedf6b38716f3ed86a92fc9010b: Merge https://source.denx.de/u-boot/custodians/u-boot-riscv (2021-12-03 09:02:49 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master for you to fetch changes up to fbd9207e7fe3712b372ca9889a2a82402161fd27: sunxi: Remove misleading USB-OTG charger message (2021-12-08 23:07:15 +0000) ---------------------------------------------------------------- Andre Przywara (2): sunxi: dts: Fix typoed eMMC check sunxi: Remove misleading USB-OTG charger message arch/arm/dts/sunxi-u-boot.dtsi | 2 +- board/sunxi/board.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-)

2 1

[PATCH 1/1] arm: dts: Aspeed: add Bletchley dts
by Potin Lai 09 Dec '21

09 Dec '21

Signed-off-by: Potin Lai <potin.lai(a)quantatw.com> --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/ast2600-bletchley.dts | 324 +++++++++++++++++++++++++++++ 2 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/ast2600-bletchley.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index df844065cd..a172a9f8c6 100755 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -685,7 +685,8 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ ast2600-rainier.dtb \ ast2600-slt.dtb \ ast2600-tacoma.dtb \ - ast2600-intel.dtb + ast2600-intel.dtb \ + ast2600-bletchley.dtb dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb diff --git a/arch/arm/dts/ast2600-bletchley.dts b/arch/arm/dts/ast2600-bletchley.dts new file mode 100644 index 0000000000..f7d8d0628f --- /dev/null +++ b/arch/arm/dts/ast2600-bletchley.dts @@ -0,0 +1,324 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright (c) 2021 Facebook Inc. +/dts-v1/; + +#include "ast2600-u-boot.dtsi" + +/ { + model = "Bletchley"; + compatible = "aspeed,ast2600-evb", "aspeed,ast2600"; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; + + chosen { + stdout-path = &uart5; + }; + + aliases { + mmc0 = &emmc_slot0; + mmc1 = &sdhci_slot0; + mmc2 = &sdhci_slot1; + spi0 = &fmc; + spi1 = &spi1; + spi2 = &spi2; + ethernet0 = &mac0; + ethernet1 = &mac1; + ethernet2 = &mac2; + ethernet3 = &mac3; + }; + + cpus { + cpu@0 { + clock-frequency = <800000000>; + }; + cpu@1 { + clock-frequency = <800000000>; + }; + }; +}; + +&uart5 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&sdrammc { + clock-frequency = <400000000>; +}; + +&wdt1 { + status = "okay"; +}; + +&wdt2 { + status = "okay"; +}; + +&wdt3 { + status = "okay"; +}; + +&mdio { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = < &pinctrl_mdio1_default &pinctrl_mdio2_default + &pinctrl_mdio3_default &pinctrl_mdio4_default>; + #address-cells = <1>; + #size-cells = <0>; + ethphy0: ethernet-phy@0 { + reg = <0>; + }; + + ethphy1: ethernet-phy@1 { + reg = <0>; + }; + + ethphy2: ethernet-phy@2 { + reg = <0>; + }; + + ethphy3: ethernet-phy@3 { + reg = <0>; + }; +}; + +&mac0 { + status = "disabled"; + phy-mode = "rgmii-rxid"; + phy-handle = <&ethphy0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii1_default>; +}; + +&mac1 { + status = "disabled"; + phy-mode = "rgmii-rxid"; + phy-handle = <&ethphy1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii2_default>; +}; + +&mac2 { + status = "disabled"; + phy-mode = "rgmii"; + phy-handle = <&ethphy2>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii3_default &pinctrl_mac3link_default>; +}; + +&mac3 { + status = "disabled"; + phy-mode = "rgmii"; + phy-handle = <&ethphy3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_rgmii4_default &pinctrl_mac4link_default>; +}; + +&fmc { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fmcquad_default>; + + flash@0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + }; + + flash@1 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + }; + + flash@2 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; + }; +}; + +&spi1 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default &pinctrl_spi1abr_default + &pinctrl_spi1cs1_default &pinctrl_spi1wp_default + &pinctrl_spi1wp_default &pinctrl_spi1quad_default>; + + flash@0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; + + flash@1 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&spi2 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi2_default &pinctrl_spi2cs1_default + &pinctrl_spi2cs2_default &pinctrl_spi2quad_default>; + + flash@0 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; + + flash@1 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; + + flash@2 { + compatible = "spi-flash", "sst,w25q256"; + status = "okay"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + }; +}; + +&emmc { + u-boot,dm-pre-reloc; + timing-phase = <0x700ff>; +}; + +&emmc_slot0 { + u-boot,dm-pre-reloc; + status = "okay"; + bus-width = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_emmc_default>; + sdhci-drive-type = <1>; +}; + +&sdhci { + timing-phase = <0xc6ffff>; +}; + +&sdhci_slot0 { + status = "okay"; + bus-width = <4>; + pwr-gpios = <&gpio0 ASPEED_GPIO(V, 0) GPIO_ACTIVE_HIGH>; + pwr-sw-gpios = <&gpio0 ASPEED_GPIO(V, 1) GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sd1_default>; + sdhci-drive-type = <1>; +}; + +&sdhci_slot1 { + status = "okay"; + bus-width = <4>; + pwr-gpios = <&gpio0 ASPEED_GPIO(V, 2) GPIO_ACTIVE_HIGH>; + pwr-sw-gpios = <&gpio0 ASPEED_GPIO(V, 3) GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sd2_default>; + sdhci-drive-type = <1>; +}; + +&i2c4 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c5_default>; +}; + +&i2c5 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c6_default>; +}; + +&i2c6 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c7_default>; +}; + +&i2c7 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c8_default>; +}; + +&i2c8 { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c9_default>; +}; + +&pcie_bridge1 { + status = "okay"; +}; + +&h2x { + status = "okay"; +}; + +#if 0 +&fsim0 { + status = "okay"; +}; + +&fsim1 { + status = "okay"; +}; +#endif + +&ehci1 { + status = "okay"; +}; + +&display_port { + status = "okay"; +}; + +&scu { + mac0-clk-delay = <0x10 0x0a + 0x10 0x10 + 0x10 0x10>; + mac1-clk-delay = <0x10 0x0a + 0x10 0x10 + 0x10 0x10>; + mac2-clk-delay = <0x08 0x04 + 0x08 0x04 + 0x08 0x04>; + mac3-clk-delay = <0x08 0x04 + 0x08 0x04 + 0x08 0x04>; +}; + +&hace { + status = "okay"; +}; -- 2.17.1

1 0