March 2023 - U-Boot

[PATCH v2 1/2] lmb: Fix LMB_MEMORY_REGIONS flag usage
by Patrick Delaunay 07 Apr '23

07 Apr '23

Remove test on CONFIG_LMB_MEMORY_REGIONS introduced by commit 7c1860fce4e3 ("lmb: Fix lmb property's defination under struct lmb"). This code in lmb_init() is strange, because if CONFIG_LMB_USE_MAX_REGIONS and CONFIG_LMB_MEMORY_REGIONS are not defined, the implicit #else is empty and the required initialization is not done: lmb->memory.max = ? lmb->reserved.max = ? But this setting is not possible: - CONFIG_LMB_USE_MAX_REGIONS not defined - CONFIG_LMB_MEMORY_REGIONS not defined because CONFIG_LMB_MEMORY_REGIONS and CONFIG_LMB_RESERVED_REGIONS are defined as soon as the CONFIG_LMB_USE_MAX_REGIONS is not defined. This patch removes this impossible case #elif and I add some explanation in lmb.h to explain why in the struct lmb {} the lmb property is defined if CONFIG_LMB_MEMORY_REGIONS is NOT defined. This patch also removes CONFIG_LMB_XXX dependency on CONFIG_LMB as these defines are used in API file lmb.h and not only in library file. Fixes: 5e2548c1d6e03 ("lmb: Fix LMB_MEMORY_REGIONS flag usage") Reported-by: Mark Millard <marklmi(a)yahoo.com> Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- Changes in v2: - Remove CONFIG_LMB_XXX dependency on CONFIG_LMB as these defines are used in lmb.h file, include by default to export the LMB API and not only in LMB libary code. This modification is required to avoid issue in API definition when CONFIG_LMB is not set. - Fix some typo in commit message and in comment include/lmb.h | 20 +++++++++++++++++++- lib/Kconfig | 7 +++---- lib/lmb.c | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/include/lmb.h b/include/lmb.h index 7298c2ccc403..07bf22144eac 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -35,6 +35,24 @@ struct lmb_property { enum lmb_flags flags; }; +/* + * For regions size management, see LMB configuration in KConfig + * all the #if test are done with CONFIG_LMB_USE_MAX_REGIONS (boolean) + * + * case 1. CONFIG_LMB_USE_MAX_REGIONS is defined (legacy mode) + * => CONFIG_LMB_MAX_REGIONS is used to configure the region size, + * directly in the array lmb_region.region[], with the same + * configuration for memory and reserved regions. + * + * case 2. CONFIG_LMB_USE_MAX_REGIONS is not defined, the size of each + * region is configurated *independently* with + * => CONFIG_LMB_MEMORY_REGIONS: struct lmb.memory_regions + * => CONFIG_LMB_RESERVED_REGIONS: struct lmb.reserved_regions + * lmb_region.region is only a pointer to the correct buffer, + * initialized in lmb_init(). This configuration is useful to manage + * more reserved memory regions with CONFIG_LMB_RESERVED_REGIONS. + */ + /** * struct lmb_region - Description of a set of region. * @@ -68,7 +86,7 @@ struct lmb_region { struct lmb { struct lmb_region memory; struct lmb_region reserved; -#ifdef CONFIG_LMB_MEMORY_REGIONS +#if !IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) struct lmb_property memory_regions[CONFIG_LMB_MEMORY_REGIONS]; struct lmb_property reserved_regions[CONFIG_LMB_RESERVED_REGIONS]; #endif diff --git a/lib/Kconfig b/lib/Kconfig index 83e5edd73b0e..da6c7cd5f628 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -1027,7 +1027,6 @@ config LMB config LMB_USE_MAX_REGIONS bool "Use a common number of memory and reserved regions in lmb lib" - depends on LMB default y help Define the number of supported memory regions in the library logical @@ -1037,7 +1036,7 @@ config LMB_USE_MAX_REGIONS config LMB_MAX_REGIONS int "Number of memory and reserved regions in lmb lib" - depends on LMB && LMB_USE_MAX_REGIONS + depends on LMB_USE_MAX_REGIONS default 16 help Define the number of supported regions, memory and reserved, in the @@ -1045,7 +1044,7 @@ config LMB_MAX_REGIONS config LMB_MEMORY_REGIONS int "Number of memory regions in lmb lib" - depends on LMB && !LMB_USE_MAX_REGIONS + depends on !LMB_USE_MAX_REGIONS default 8 help Define the number of supported memory regions in the library logical @@ -1054,7 +1053,7 @@ config LMB_MEMORY_REGIONS config LMB_RESERVED_REGIONS int "Number of reserved regions in lmb lib" - depends on LMB && !LMB_USE_MAX_REGIONS + depends on !LMB_USE_MAX_REGIONS default 8 help Define the number of supported reserved regions in the library logical diff --git a/lib/lmb.c b/lib/lmb.c index 2444b2a62121..8fbe453dfa9d 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -110,7 +110,7 @@ void lmb_init(struct lmb *lmb) #if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) lmb->memory.max = CONFIG_LMB_MAX_REGIONS; lmb->reserved.max = CONFIG_LMB_MAX_REGIONS; -#elif defined(CONFIG_LMB_MEMORY_REGIONS) +#else lmb->memory.max = CONFIG_LMB_MEMORY_REGIONS; lmb->reserved.max = CONFIG_LMB_RESERVED_REGIONS; lmb->memory.region = lmb->memory_regions; -- 2.25.1

3 4

[PATCH 1/1] cmd: CONFIG_CMD_SCSI depends on CONFIG_SCSI
by Heinrich Schuchardt 07 Apr '23

07 Apr '23

Compiling with CONFIG_CMD_SCSI=y, CONFIG_SCSI results in cmd/scsi.c:46: undefined reference to `scsi_scan' Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 2caa4af71c..5c1b353c90 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1436,7 +1436,8 @@ config CMD_SATA config CMD_SCSI bool "scsi - Access to SCSI devices" - default y if SCSI + depends on SCSI + default y help This provides a 'scsi' command which provides access to SCSI (Small Computer System Interface) devices. The command provides a way to -- 2.39.2

3 2

[PATCH 0/2] ata: fix build failures for SATA w/o SCSI
by Heinrich Schuchardt 07 Apr '23

07 Apr '23

Trying to compile U-Boot for SATA but wo/o SCSI leads to multiple build failures. Gitlab CI showed no problems for these patches: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/15763 Heinrich Schuchardt (2): ata: fix requirements for CONFIG_AHCI_PCI ata: don't use SYS_SCSI_MAX_SCSI_ID for SATA configs/controlcenterdc_defconfig | 1 + configs/highbank_defconfig | 1 + drivers/ata/Kconfig | 9 +++++++++ drivers/ata/ahci.c | 4 ++-- 4 files changed, 13 insertions(+), 2 deletions(-) -- 2.39.2

3 6

[PATCH] spi: Kconfig: add dependency on CONFIG_MPC85xx for FSL_ESPI entry
by Corentin Guillevic 07 Apr '23

07 Apr '23

The Freescale ESPI driver (CONFIG_FSL_ESPI) relies to the MPC85xx platform (PowerPC) through arch/powerpc/include/asm/immap_85xx.h. The driver can't compile on another architecture/platform. Signed-off-by: Corentin Guillevic <corentin.guillevic(a)smile.fr> --- drivers/spi/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git drivers/spi/Kconfig drivers/spi/Kconfig index c6900f449d..2dd610ae69 100644 --- drivers/spi/Kconfig +++ drivers/spi/Kconfig @@ -555,6 +555,7 @@ endif # if DM_SPI config FSL_ESPI bool "Freescale eSPI driver" + depends on MPC85xx imply SPI_FLASH_BAR help Enable the Freescale eSPI driver. This driver can be used to -- 2.39.2

2 1

[PATCH v1 1/1] tools: env: use /run to store lockfile
by Tim Lee 07 Apr '23

07 Apr '23

According this issue https://github.com/ppp-project/ppp/issues/339. Eventually, the dt-utils changed lock directory to fix missing /var/lock directory error then make dt-utils can run normally. We also have a similar issue with these two utilities fw_printenv and fw_setenv will failed when the directory /var/lock is non-existent. We have a custom linux distribution built with yocto (OpenBMC) that use systemd and it deprecated the /var/lock directory. More discussion in systemd/systemd#15668. Thus, we sync with community's solution for uboot/tools/env utilities: The current location /var/lock is considered legacy (at least by systemd). Just use /run to store the lockfile and append the usual .lock suffix. Tested: Verified /run/lock is now present and fw_printenv can work in OpenBMC. Signed-off-by: Tim Lee <timlee660101(a)gmail.com> --- tools/env/fw_env_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index 1d193bd437..0b201b9e62 100644 --- a/tools/env/fw_env_main.c +++ b/tools/env/fw_env_main.c @@ -73,7 +73,7 @@ void usage_printenv(void) " -c, --config configuration file, default:" CONFIG_FILE "\n" #endif " -n, --noheader do not repeat variable name in output\n" - " -l, --lock lock node, default:/var/lock\n" + " -l, --lock lock node, default:/run\n" "\n"); } @@ -88,7 +88,7 @@ void usage_env_set(void) #ifdef CONFIG_FILE " -c, --config configuration file, default:" CONFIG_FILE "\n" #endif - " -l, --lock lock node, default:/var/lock\n" + " -l, --lock lock node, default:/run\n" " -s, --script batch mode to minimize writes\n" "\n" "Examples:\n" @@ -206,7 +206,7 @@ int parse_setenv_args(int argc, char *argv[]) int main(int argc, char *argv[]) { - char *lockname = "/var/lock/" CMD_PRINTENV ".lock"; + char *lockname = "/run/" CMD_PRINTENV ".lock"; int lockfd = -1; int retval = EXIT_SUCCESS; char *_cmdname; -- 2.17.1

3 4

[PATCH] cmd: Add 2048 game
by Simon Glass 07 Apr '23

07 Apr '23

Add the 2048 game, a good demo of ANSI sequences and a way to waste a little time. Bring it it from Barebox, modified for code style. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- cmd/2048.c | 397 ++++++++++++++++++++++++++++++++++++++ cmd/Kconfig | 11 ++ cmd/Makefile | 1 + configs/sandbox_defconfig | 1 + 4 files changed, 410 insertions(+) create mode 100644 cmd/2048.c diff --git a/cmd/2048.c b/cmd/2048.c new file mode 100644 index 00000000000..fa60aa94aad --- /dev/null +++ b/cmd/2048.c @@ -0,0 +1,397 @@ +// SPDX-License-Identifier: MIT +// SPDX-FileCopyrightText: © 2014 Maurits van der Schee + +/* Console version of the game "2048" for GNU/Linux */ + +#include <common.h> +#include <cli.h> +#include <command.h> +#include <rand.h> +#include <linux/delay.h> + +#define SIZE 4 +static uint score; + +static void getColor(uint value, char *color, size_t length) +{ + u8 original[] = { + 8, 255, 1, 255, 2, 255, 3, 255, + 4, 255, 5, 255, 6, 255, 7, 255, + 9, 0, 10, 0, 11, 0, 12, 0, 13, + 0, 14, 0, 255, 0, 255, 0}; + u8 *scheme = original; + u8 *background = scheme + 0; + u8 *foreground = scheme + 1; + + if (value > 0) { + while (value >>= 1) { + if (background + 2 < scheme + sizeof(original)) { + background += 2; + foreground += 2; + } + } + } + snprintf(color, length, "\033[38;5;%d;48;5;%dm", *foreground, + *background); +} + +static void drawBoard(u16 board[SIZE][SIZE]) +{ + int x, y; + char color[40], reset[] = "\033[0m"; + + printf("\033[H"); + printf("2048.c %17d pts\n\n", score); + + for (y = 0; y < SIZE; y++) { + for (x = 0; x < SIZE; x++) { + getColor(board[x][y], color, 40); + printf("%s", color); + printf(" "); + printf("%s", reset); + } + printf("\n"); + for (x = 0; x < SIZE; x++) { + getColor(board[x][y], color, 40); + printf("%s", color); + if (board[x][y] != 0) { + char s[8]; + s8 t; + + snprintf(s, 8, "%u", board[x][y]); + t = 7 - strlen(s); + printf("%*s%s%*s", t - t / 2, "", s, t / 2, ""); + } else { + printf(" · "); + } + printf("%s", reset); + } + printf("\n"); + for (x = 0; x < SIZE; x++) { + getColor(board[x][y], color, 40); + printf("%s", color); + printf(" "); + printf("%s", reset); + } + printf("\n"); + } + printf("\n"); + printf(" ←, ↑, →, ↓ or q \n"); + printf("\033[A"); +} + +static int8_t findTarget(u16 array[SIZE], int x, int stop) +{ + int t; + + /* if the position is already on the first, don't evaluate */ + if (x == 0) + return x; + for (t = x - 1; t >= 0; t--) { + if (array[t]) { + if (array[t] != array[x]) { + /* merge is not possible, take next position */ + return t + 1; + } + return t; + } + + /* we should not slide further, return this one */ + if (t == stop) + return t; + } + /* we did not find a */ + return x; +} + +static bool slideArray(u16 array[SIZE]) +{ + bool success = false; + int x, t, stop = 0; + + for (x = 0; x < SIZE; x++) { + if (array[x] != 0) { + t = findTarget(array, x, stop); + /* + * if target is not original position, then move or + * merge + */ + if (t != x) { + /* + * if target is not zero, set stop to avoid + * double merge + */ + if (array[t]) { + score += array[t] + array[x]; + stop = t + 1; + } + array[t] += array[x]; + array[x] = 0; + success = true; + } + } + } + return success; +} + +static void rotateBoard(u16 board[SIZE][SIZE]) +{ + s8 i, j, n = SIZE; + int tmp; + + for (i = 0; i < n / 2; i++) { + for (j = i; j < n - i - 1; j++) { + tmp = board[i][j]; + board[i][j] = board[j][n - i - 1]; + board[j][n - i - 1] = board[n - i - 1][n - j - 1]; + board[n - i - 1][n - j - 1] = board[n - j - 1][i]; + board[n - j - 1][i] = tmp; + } + } +} + +static bool moveUp(u16 board[SIZE][SIZE]) +{ + bool success = false; + int x; + + for (x = 0; x < SIZE; x++) + success |= slideArray(board[x]); + + return success; +} + +static bool moveLeft(u16 board[SIZE][SIZE]) +{ + bool success; + + rotateBoard(board); + success = moveUp(board); + rotateBoard(board); + rotateBoard(board); + rotateBoard(board); + return success; +} + +static bool moveDown(u16 board[SIZE][SIZE]) +{ + bool success; + + rotateBoard(board); + rotateBoard(board); + success = moveUp(board); + rotateBoard(board); + rotateBoard(board); + return success; +} + +static bool moveRight(u16 board[SIZE][SIZE]) +{ + bool success; + + rotateBoard(board); + rotateBoard(board); + rotateBoard(board); + success = moveUp(board); + rotateBoard(board); + return success; +} + +static bool findPairDown(u16 board[SIZE][SIZE]) +{ + bool success = false; + int x, y; + + for (x = 0; x < SIZE; x++) { + for (y = 0; y < SIZE - 1; y++) { + if (board[x][y] == board[x][y + 1]) + return true; + } + } + + return success; +} + +static int16_t countEmpty(u16 board[SIZE][SIZE]) +{ + int x, y; + int count = 0; + + for (x = 0; x < SIZE; x++) { + for (y = 0; y < SIZE; y++) { + if (board[x][y] == 0) + count++; + } + } + return count; +} + +static bool gameEnded(u16 board[SIZE][SIZE]) +{ + bool ended = true; + + if (countEmpty(board) > 0) + return false; + if (findPairDown(board)) + return false; + rotateBoard(board); + if (findPairDown(board)) + ended = false; + rotateBoard(board); + rotateBoard(board); + rotateBoard(board); + + return ended; +} + +static void addRandom(u16 board[SIZE][SIZE]) +{ + int x, y; + int r, len = 0; + u16 n, list[SIZE * SIZE][2]; + + for (x = 0; x < SIZE; x++) { + for (y = 0; y < SIZE; y++) { + if (board[x][y] == 0) { + list[len][0] = x; + list[len][1] = y; + len++; + } + } + } + + if (len > 0) { + r = rand() % len; + x = list[r][0]; + y = list[r][1]; + n = ((rand() % 10) / 9 + 1) * 2; + board[x][y] = n; + } +} + +static int test(void) +{ + u16 array[SIZE]; + u16 data[] = { + 0, 0, 0, 2, 2, 0, 0, 0, + 0, 0, 2, 2, 4, 0, 0, 0, + 0, 2, 0, 2, 4, 0, 0, 0, + 2, 0, 0, 2, 4, 0, 0, 0, + 2, 0, 2, 0, 4, 0, 0, 0, + 2, 2, 2, 0, 4, 2, 0, 0, + 2, 0, 2, 2, 4, 2, 0, 0, + 2, 2, 0, 2, 4, 2, 0, 0, + 2, 2, 2, 2, 4, 4, 0, 0, + 4, 4, 2, 2, 8, 4, 0, 0, + 2, 2, 4, 4, 4, 8, 0, 0, + 8, 0, 2, 2, 8, 4, 0, 0, + 4, 0, 2, 2, 4, 4, 0, 0 + }; + u16 *in, *out; + u16 t, tests; + int i; + bool success = true; + + tests = (sizeof(data) / sizeof(data[0])) / (2 * SIZE); + for (t = 0; t < tests; t++) { + in = data + t * 2 * SIZE; + out = in + SIZE; + for (i = 0; i < SIZE; i++) + array[i] = in[i]; + slideArray(array); + for (i = 0; i < SIZE; i++) { + if (array[i] != out[i]) + success = false; + } + if (!success) { + for (i = 0; i < SIZE; i++) + printf("%d ", in[i]); + printf(" = > "); + for (i = 0; i < SIZE; i++) + printf("%d ", array[i]); + printf("expected "); + for (i = 0; i < SIZE; i++) + printf("%d ", in[i]); + printf(" = > "); + for (i = 0; i < SIZE; i++) + printf("%d ", out[i]); + printf("\n"); + break; + } + } + if (success) + printf("All %u tests executed successfully\n", tests); + + return !success; +} + +static int do_2048(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct cli_ch_state cch_s, *cch = &cch_s; + u16 board[SIZE][SIZE]; + bool success; + + if (argc == 2 && strcmp(argv[1], "test") == 0) + return test(); + + score = 0; + + printf("\033[?25l\033[2J\033[H"); + + memset(board, 0, sizeof(board)); + addRandom(board); + addRandom(board); + drawBoard(board); + cli_ch_init(cch); + while (true) { + int c; + + c = cli_ch_process(cch, 0); + if (!c) { + c = getchar(); + c = cli_ch_process(cch, c); + } + switch (c) { + case CTL_CH('b'): /* left arrow */ + success = moveLeft(board); + break; + case CTL_CH('f'): /* right arrow */ + success = moveRight(board); + break; + case CTL_CH('p'):/* up arrow */ + success = moveUp(board); + break; + case CTL_CH('n'): /* down arrow */ + success = moveDown(board); + break; + default: + success = false; + } + if (success) { + drawBoard(board); + mdelay(150); + addRandom(board); + drawBoard(board); + if (gameEnded(board)) { + printf(" GAME OVER \n"); + break; + } + } + if (c == 'q') { + printf(" QUIT \n"); + break; + } + } + + printf("\033[?25h"); + + return 0; +} + +U_BOOT_CMD( + 2048, 2, 1, do_2048, + "The 2048 game", + "Use your arrow keys to move the tiles. When two tiles with " + "the same number touch, they merge into one!" +); diff --git a/cmd/Kconfig b/cmd/Kconfig index dc0446e02e8..b67cf141a58 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1913,6 +1913,17 @@ endif menu "Misc commands" +config CMD_2048 + bool "Play 2048" + help + This is a simple sliding block puzzle game designed by Italian web + developer Gabriele Cirulli. The game's objective is to slide numbered + tiles on a grid to combine them to create a tile with the number + 2048. + + This needs ANSI support on your terminal to work. It is not fully + functional on a video device. + config CMD_BMP bool "Enable 'bmp' command" depends on VIDEO diff --git a/cmd/Makefile b/cmd/Makefile index 7b6ff731865..57d5741b4c6 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -12,6 +12,7 @@ obj-y += panic.o obj-y += version.o # command +obj-$(CONFIG_CMD_2048) += 2048.o obj-$(CONFIG_CMD_ACPI) += acpi.o obj-$(CONFIG_CMD_ADDRMAP) += addrmap.o obj-$(CONFIG_CMD_AES) += aes.o diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 34c342b6f58..f7e22402675 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -337,3 +337,4 @@ CONFIG_TEST_FDTDEC=y CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y +CONFIG_CMD_2048=y -- 2.39.1.519.gcb327c4b5f-goog

2 1

[PATCH v3 00/19] Support android boot image v3/v4
by Safae Ouajih 07 Apr '23

07 Apr '23

Hello everyone, * This is based on Roman Stratiienko's work to support boot image header version 3 and 4. * This supports the new boot image headers v3, v4 and bootconfig feature. https://source.android.com/docs/core/architecture/bootloader/boot-image-hea… https://source.android.com/docs/core/architecture/bootloader/implementing-b… - Tested on Amlogic Khadas vim3l, a reference board for Android Open Source Project https://www.khadas.com/vim3l And on AM625 Texas Instruments board with 5.10 linux kernel Main changes : - New partition : vendor boot, with a specific vendor ramdisk - DTB is stored in the vendor boot partition - The generic ramdisk is placed after the vendor ramdisk - Bootconfig feature support Here is a link to see the related android boot flow changes on KHADAS vim3l as an example: https://gitlab.baylibre.com/baylibre/amlogic/atv/u-boot/-/commits/souajih/B… Changes in v3: - Ddd documentation for v3,v4 boot image header - Add mkbootimg tool to Dockerfile - Add full comments for functions/structs in include/image.h and include/android_image.h - Add map_sysmem() to make the boot work on Sandbox - Rename andr_vendor_img_hdr -> andr_vnd_boot_img_hdr Changes in v2: - Rework parts of the code to fix the abootimg test: test_abootimg - Update test_abootimg to support boot image header v4 - Remove LIBXBC library, import and adapt the functions to support bootconfig feature - Rename the used structures : andr_boot_img_hdr_v0_v1_v2 -> andr_boot_img_hdr_v0 andr_boot_img_hdr_v3_v4 -> andr_boot_img_hdr_v3 andr_vendor_boot_img_hdr_v3_v4 -> andr_vendor_img_hdr Safae Ouajih (19): android: boot: rename andr_img_hdr -> andr_boot_img_hdr_v0 android: boot: support vendor boot image in abootimg android: boot: replace android_image_check_header android: boot: add boot image header v3 and v4 structures android: boot: kcomp: support andr_image_data android: boot: move to andr_image_data structure android: boot: content print is not supported for v3,v4 header version android: boot: boot image header v3,v4 do not support recovery DTBO android: boot: add vendor boot image to prepare for v3,v4 support android: boot: update android_image_get_data to support v3,v4 android: boot: ramdisk: support vendor ramdisk android: boot: support extra command line android: boot: update android_image_get_dtb_img_addr to support v3,v4 drivers: fastboot: zImage flashing is not supported for v3,v4 android: boot: support boot image header version 3 and 4 android: boot: support bootconfig doc: android: add documentation for v3,v4 boot image header test/py: android: extend abootimg test Dockerfile: add mkbootimg tool boot/bootm.c | 37 +- boot/image-android.c | 461 ++++++++++++++++---- boot/image-board.c | 19 +- boot/image-fdt.c | 5 +- cmd/abootimg.c | 75 +++- doc/android/boot-image.rst | 13 +- drivers/fastboot/fb_mmc.c | 19 +- include/android_image.h | 228 +++++++++- include/image.h | 173 +++++++- test/py/tests/test_android/test_abootimg.py | 136 +++++- tools/docker/Dockerfile | 4 + 11 files changed, 1009 insertions(+), 161 deletions(-) -- 2.34.1

5 43

[PATCH v2 0/4] rockchip: Fixes for RK3568 and RK3588
by Jonas Karlman 07 Apr '23

07 Apr '23

This series contains fixes for RK3568 and RK3588. Patch 1 imply use of ROCKCHIP_TPL for RK3588 to generate bootable firmware image. Patch 2 fixes sdmmc boot on rk3588-rock-5b. Patch 3 fixes boot of rk3568-rock-3a, an issue introduced in v1. Patch 4 add fdtoverlay and compressed kernel addresses to env. The last patch is not a fix but some parts of it was included in v1, so I kept it in v2. Please consider these patches for v2023.04. Changes in v2: - Drop applied patches - Add the pre-req patch from [1] - Add patch to fix an issue introduced in v1 - Collect r-b tags This series can also be found at [2] [1] https://patchwork.ozlabs.org/project/uboot/patch/20230228213822.3583989-1-j… [2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk35xx-fixes-v2 Jonas Karlman (4): rockchip: Use an external TPL binary on RK3588 rockchip: rk3588-rock-5b: Fix sdmmc boot rockchip: rk35xx: Fix boot with a large fdt blob rockchip: rk35xx: Enable fdtoverlay and kernel compression arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 3 ++- arch/arm/mach-rockchip/Kconfig | 6 +++++- configs/neu6a-io-rk3588_defconfig | 1 - configs/rock-3a-rk3568_defconfig | 1 - configs/rock5b-rk3588_defconfig | 2 -- doc/board/rockchip/rockchip.rst | 9 +++++++++ include/configs/rk3568_common.h | 7 ++++++- include/configs/rk3588_common.h | 7 ++++++- 8 files changed, 28 insertions(+), 8 deletions(-) -- 2.40.0

2 6

[PATCH v3 0/3] Add StarFive JH7110 PCIe drvier support
by Minda Chen 07 Apr '23

07 Apr '23

This patchset needs to apply after patchset in [1]. These PCIe series patches are based on the JH7110 RISC-V SoC and VisionFive V2 board. [1] https://patchwork.ozlabs.org/project/uboot/cover/20230329034224.26545-1-yan… The PCIe driver depends on gpio, pinctrl, clk and reset driver to do init. The PCIe dts configuation includes all these setting. The PCIe drivers codes has been tested on the VisionFive V2 boards. The test devices includes M.2 NVMe SSD and Realtek 8169 Ethernet adapter. previous patch version v1: https://patchwork.ozlabs.org/project/uboot/cover/20230223105240.15180-1-min… v2: https://patchwork.ozlabs.org/project/uboot/cover/20230308054833.95730-1-min… changes v2 1. remove clock commit. The pcie clocks change has been includeded in [1]. 2. Using GENMASK marco1 in patch1. 3. remove the syscon dts node in patch3. The syscon dts dts node has been included in [1]. v3 patch 1 1. remove the read vendor ID delay 2. remove starfive_pcie_hide_rc_bar function. do not hide host bridge BAR write. 3. Using PCIE_ECAM_OFFSET and PCI_CLASS_BRIDGE_PCI_NORMAL macros. 4. Add comments for bus and address limitation reason in function starfive_pcie_addr_valid 5. Change the multiple line comments in Line 373 6. Using gpio_request_by_name to get PCIe reset gpio,and using dm_gpio_set_value set GPIO value. patch 2 1. support PCIeboth 12a and 13b vf2 board. patch 3 1. reset dts change to reset-gpio. --- The JH7110 minimal system patchset upstream is in progress. PCIe driver patches is based on this patchset. The JH7110 minimal system patchset details are listed in [1]. For more JH7110 and visionFive v2 information and support, you can visit RVspace wiki[2]. [2] https://wiki.rvspace.org/ Mason Huo (3): starfive: pci: Add StarFive JH7110 pcie driver configs: starfive-jh7110: Add support for PCIe host driver riscv: dts: starfive: Enable PCIe host controller .../dts/jh7110-starfive-visionfive-2.dtsi | 11 + arch/riscv/dts/jh7110.dtsi | 74 +++ configs/starfive_visionfive2_12a_defconfig | 9 + configs/starfive_visionfive2_13b_defconfig | 9 + drivers/pci/Kconfig | 11 + drivers/pci/Makefile | 1 + drivers/pci/pcie_starfive_jh7110.c | 463 ++++++++++++++++++ 7 files changed, 578 insertions(+) create mode 100644 drivers/pci/pcie_starfive_jh7110.c base-commit: 41a88ad529b3943b1e465846eb24fe2c29203e35 prerequisite-patch-id: a84452ba131408ff842b65ae19a3a05f64b3ff60 prerequisite-patch-id: 4abb46d56dbaf36017b2866688f31a73c2cacd0d prerequisite-patch-id: ef5e9d61f7392c7d2e5321aa8a10996ca8eae5fc prerequisite-patch-id: 26dfdb401d680ecd9449acf09131cf4790e987b7 prerequisite-patch-id: a0cfa5d8cdb49bbe9d4739afa90991f882950881 prerequisite-patch-id: 61ceecb41cfd9029bfb267f7b7c5330a2d7e5edc prerequisite-patch-id: d834ece14ffb525b8c3e661e78736692f33fca9b prerequisite-patch-id: 88c9f9637335fdc4107d42db67b9110c9b73ead3 prerequisite-patch-id: ebc26ed3f97f7babc0fc805152acb578f5eff922 prerequisite-patch-id: e85a9ca22facac4d5b5562a2708b7332478d6db4 prerequisite-patch-id: ff5bd799e4cb905fef6cf1cd0ce757980e1d34b7 prerequisite-patch-id: a341d4e8a8e25cb711309123939235fcb3c10c1a prerequisite-patch-id: 749e4eafb431857ee2bec4ac8e78a682f6a57588 prerequisite-patch-id: d4a3666ce2e7135402537cea60e9e6f0435230bf prerequisite-patch-id: fa8ad1bfce7d6ab74ad63ff8d31dff3c2ccb5e43 prerequisite-patch-id: cc352634b8dfaf2d4243819362326a579e010c94 prerequisite-patch-id: 8e0fa3d987020ca06e22401bc4c69f834c38c3dc -- 2.17.1

2 7

[PATCH 1/8] riscv: Optimize source end address calculation in start.S
by Bin Meng 07 Apr '23

07 Apr '23

The __bss_start is the source end address hence load its address directly into register 't2' for optimization. Signed-off-by: Bin Meng <bmeng(a)tinylab.org> --- arch/riscv/cpu/start.S | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index 4687bca3c9..3c8344c345 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -283,9 +283,7 @@ stack_setup: beq t0, s4, clear_bss /* skip relocation */ mv t1, s4 /* t1 <- scratch for copy_loop */ - la t3, __bss_start - sub t3, t3, t0 /* t3 <- __bss_start_ofs */ - add t2, t0, t3 /* t2 <- source end address */ + la t2, __bss_start /* t2 <- source end address */ copy_loop: LREG t5, 0(t0) -- 2.34.1

3 9