diff options
| author | Herman Rimm <herman@rimm.ee> | 2023-11-27 09:33:47 +0100 |
|---|---|---|
| committer | Vagrant Cascadian <vagrant@debian.org> | 2023-12-22 16:05:50 -0800 |
| commit | fad93748cd2d44f7f68d2d973a22ed0b438e657b (patch) | |
| tree | 652b1fcf89b6af92f1bd5a17a4f9da4b33b8c4ad | |
| parent | 892ec53b7eedf998afa149b9cdd169f0cab8f41d (diff) | |
gnu: u-boot: Update to 2023.10.
* gnu/local.mk: De-register patches.
* gnu/packages/bootloaders.scm (u-boot): Update to 2023.10.
[source]: Remove patches.
(u-boot-documentation)[inputs]: Add python-sphinx-prompt.
* gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Refresh.
* gnu/packages/patches/u-boot-fix-build-python-3.10.patch: Delete file.
* gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch: Delete file.
* gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch: Delete file.
* gnu/packages/patches/u-boot-rockchip-inno-usb.patch: Refresh.
* gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch:
Delete file.
Modifed-by: Vagrant Cascadian <vagrant@debian.org>
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
| -rw-r--r-- | gnu/local.mk | 5 | ||||
| -rw-r--r-- | gnu/packages/bootloaders.scm | 21 | ||||
| -rw-r--r-- | gnu/packages/patches/u-boot-allow-disabling-openssl.patch | 56 | ||||
| -rw-r--r-- | gnu/packages/patches/u-boot-fix-build-python-3.10.patch | 37 | ||||
| -rw-r--r-- | gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch | 24 | ||||
| -rw-r--r-- | gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch | 26 | ||||
| -rw-r--r-- | gnu/packages/patches/u-boot-rockchip-inno-usb.patch | 16 | ||||
| -rw-r--r-- | gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch | 16 |
8 files changed, 43 insertions, 158 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 0d0258d8d4e..4497804e074 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -61,6 +61,7 @@ | |||
| 61 | # Copyright © 2023 Andy Tai <atai@atai.org> | 61 | # Copyright © 2023 Andy Tai <atai@atai.org> |
| 62 | # Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com> | 62 | # Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com> |
| 63 | # Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> | 63 | # Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> |
| 64 | # Copyright © 2023 Herman Rimm <herman@rimm.ee> | ||
| 64 | # | 65 | # |
| 65 | # This file is part of GNU Guix. | 66 | # This file is part of GNU Guix. |
| 66 | # | 67 | # |
| @@ -2071,13 +2072,9 @@ dist_patch_DATA = \ | |||
| 2071 | %D%/packages/patches/tuxpaint-stamps-path.patch \ | 2072 | %D%/packages/patches/tuxpaint-stamps-path.patch \ |
| 2072 | %D%/packages/patches/twinkle-bcg729.patch \ | 2073 | %D%/packages/patches/twinkle-bcg729.patch \ |
| 2073 | %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ | 2074 | %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ |
| 2074 | %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ | ||
| 2075 | %D%/packages/patches/u-boot-fix-u-boot-lib-build.patch \ | ||
| 2076 | %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ | 2075 | %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ |
| 2077 | %D%/packages/patches/u-boot-patman-change-id.patch \ | 2076 | %D%/packages/patches/u-boot-patman-change-id.patch \ |
| 2078 | %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ | 2077 | %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ |
| 2079 | %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \ | ||
| 2080 | %D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \ | ||
| 2081 | %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ | 2078 | %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ |
| 2082 | %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ | 2079 | %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ |
| 2083 | %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ | 2080 | %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ |
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e7086416239..d0df4f62c26 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | ;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 18 | ;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> |
| 19 | ;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de> | 19 | ;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de> |
| 20 | ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> | 20 | ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> |
| 21 | ;;; Copyright © 2023 Herman Rimm <herman@rimm.ee> | ||
| 21 | ;;; | 22 | ;;; |
| 22 | ;;; This file is part of GNU Guix. | 23 | ;;; This file is part of GNU Guix. |
| 23 | ;;; | 24 | ;;; |
| @@ -692,34 +693,19 @@ tree binary files. These are board description files used by Linux and BSD.") | |||
| 692 | ;; and https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1187379-1-icenowy@aosc.io | 693 | ;; and https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1187379-1-icenowy@aosc.io |
| 693 | (search-patch "u-boot-rockchip-inno-usb.patch")) | 694 | (search-patch "u-boot-rockchip-inno-usb.patch")) |
| 694 | 695 | ||
| 695 | (define %u-boot-sifive-prevent-relocating-initrd-fdt | ||
| 696 | ;; Fix boot in 2021.07 on Hifive unmatched, see | ||
| 697 | ;; https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246 | ||
| 698 | (search-patch "u-boot-sifive-prevent-reloc-initrd-fdt.patch")) | ||
| 699 | |||
| 700 | (define %u-boot-allow-disabling-openssl-patch | 696 | (define %u-boot-allow-disabling-openssl-patch |
| 701 | ;; Fixes build of u-boot 2021.10 without openssl | 697 | ;; Fixes build of u-boot 2021.10 without openssl |
| 702 | ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html | 698 | ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html |
| 703 | (search-patch "u-boot-allow-disabling-openssl.patch")) | 699 | (search-patch "u-boot-allow-disabling-openssl.patch")) |
| 704 | 700 | ||
| 705 | (define %u-boot-rk3399-enable-emmc-phy-patch | ||
| 706 | ;; Fix emmc boot on rockpro64 and pinebook-pro, this was a regression | ||
| 707 | ;; therefore should hopefully be fixed when updating u-boot. | ||
| 708 | ;; https://lists.denx.de/pipermail/u-boot/2021-November/466329.html | ||
| 709 | (search-patch "u-boot-rk3399-enable-emmc-phy.patch")) | ||
| 710 | |||
| 711 | (define u-boot | 701 | (define u-boot |
| 712 | (package | 702 | (package |
| 713 | (name "u-boot") | 703 | (name "u-boot") |
| 714 | (version "2023.07.02") | 704 | (version "2023.10") |
| 715 | (source (origin | 705 | (source (origin |
| 716 | (patches | 706 | (patches |
| 717 | (list %u-boot-rockchip-inno-usb-patch | 707 | (list %u-boot-rockchip-inno-usb-patch |
| 718 | %u-boot-allow-disabling-openssl-patch | 708 | %u-boot-allow-disabling-openssl-patch |
| 719 | %u-boot-sifive-prevent-relocating-initrd-fdt | ||
| 720 | %u-boot-rk3399-enable-emmc-phy-patch | ||
| 721 | (search-patch "u-boot-fix-build-python-3.10.patch") | ||
| 722 | (search-patch "u-boot-fix-u-boot-lib-build.patch") | ||
| 723 | (search-patch "u-boot-patman-change-id.patch"))) | 709 | (search-patch "u-boot-patman-change-id.patch"))) |
| 724 | (method url-fetch) | 710 | (method url-fetch) |
| 725 | (uri (string-append | 711 | (uri (string-append |
| @@ -727,7 +713,7 @@ tree binary files. These are board description files used by Linux and BSD.") | |||
| 727 | "u-boot-" version ".tar.bz2")) | 713 | "u-boot-" version ".tar.bz2")) |
| 728 | (sha256 | 714 | (sha256 |
| 729 | (base32 | 715 | (base32 |
| 730 | "1m91w3fpywllkwm000dqsw3294j0szs1lz6qbgwv1aql3ic4hskb")))) | 716 | "0039rravvjq9yi41645fynycw4c869px024xfc0n212f05pnq3p0")))) |
| 731 | (build-system gnu-build-system) | 717 | (build-system gnu-build-system) |
| 732 | (native-inputs | 718 | (native-inputs |
| 733 | (list bison | 719 | (list bison |
| @@ -778,6 +764,7 @@ also initializes the boards (RAM etc).") | |||
| 778 | (modify-inputs (package-native-inputs u-boot) | 764 | (modify-inputs (package-native-inputs u-boot) |
| 779 | (append fontconfig | 765 | (append fontconfig |
| 780 | python-sphinx | 766 | python-sphinx |
| 767 | python-sphinx-prompt | ||
| 781 | texinfo | 768 | texinfo |
| 782 | which))) | 769 | which))) |
| 783 | (synopsis "U-Boot documentation") | 770 | (synopsis "U-Boot documentation") |
diff --git a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch index 5195a7a6f8f..708ed81e93f 100644 --- a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch +++ b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch | |||
| @@ -8,8 +8,10 @@ This reverts commit b4f3cc2c42d97967a3a3c8796c340f6b07ecccac. | |||
| 8 | Addendum 2022-12-08, Ricardo Wurmus: This patch has been updated to introduce | 8 | Addendum 2022-12-08, Ricardo Wurmus: This patch has been updated to introduce |
| 9 | CONFIG_FIT_PRELOAD to remove fit_pre_load_data, which depends on openssl. | 9 | CONFIG_FIT_PRELOAD to remove fit_pre_load_data, which depends on openssl. |
| 10 | 10 | ||
| 11 | Addendum 2023-10-17, Herman Rimm: Update patch for u-boot v2023.10. | ||
| 12 | |||
| 11 | diff --git a/tools/kwbimage.c b/tools/kwbimage.c | 13 | diff --git a/tools/kwbimage.c b/tools/kwbimage.c |
| 12 | index 94b7685392..eec599b0ee 100644 | 14 | index 4dce495ff0..976174ae77 100644 |
| 13 | --- a/tools/kwbimage.c | 15 | --- a/tools/kwbimage.c |
| 14 | +++ b/tools/kwbimage.c | 16 | +++ b/tools/kwbimage.c |
| 15 | @@ -19,6 +19,7 @@ | 17 | @@ -19,6 +19,7 @@ |
| @@ -38,7 +40,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 38 | 40 | ||
| 39 | struct boot_mode { | 41 | struct boot_mode { |
| 40 | unsigned int id; | 42 | unsigned int id; |
| 41 | @@ -278,6 +282,8 @@ image_count_options(unsigned int optiontype) | 43 | @@ -281,6 +285,8 @@ image_count_options(unsigned int optiontype) |
| 42 | return count; | 44 | return count; |
| 43 | } | 45 | } |
| 44 | 46 | ||
| @@ -47,7 +49,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 47 | static int image_get_csk_index(void) | 49 | static int image_get_csk_index(void) |
| 48 | { | 50 | { |
| 49 | struct image_cfg_element *e; | 51 | struct image_cfg_element *e; |
| 50 | @@ -288,6 +294,7 @@ static int image_get_csk_index(void) | 52 | @@ -291,6 +297,7 @@ static int image_get_csk_index(void) |
| 51 | 53 | ||
| 52 | return e->csk_idx; | 54 | return e->csk_idx; |
| 53 | } | 55 | } |
| @@ -55,7 +57,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 55 | 57 | ||
| 56 | static bool image_get_spezialized_img(void) | 58 | static bool image_get_spezialized_img(void) |
| 57 | { | 59 | { |
| 58 | @@ -432,6 +439,7 @@ static uint8_t baudrate_to_option(unsigned int baudrate) | 60 | @@ -435,6 +442,7 @@ static uint8_t baudrate_to_option(unsigned int baudrate) |
| 59 | } | 61 | } |
| 60 | } | 62 | } |
| 61 | 63 | ||
| @@ -63,29 +65,31 @@ index 94b7685392..eec599b0ee 100644 | |||
| 63 | static void kwb_msg(const char *fmt, ...) | 65 | static void kwb_msg(const char *fmt, ...) |
| 64 | { | 66 | { |
| 65 | if (verbose_mode) { | 67 | if (verbose_mode) { |
| 66 | @@ -926,6 +934,7 @@ static int kwb_dump_fuse_cmds(struct secure_hdr_v1 *sec_hdr) | 68 | @@ -929,6 +937,7 @@ static int kwb_dump_fuse_cmds(struct secure_hdr_v1 *sec_hdr) |
| 67 | done: | 69 | done: |
| 68 | return ret; | 70 | return ret; |
| 69 | } | 71 | } |
| 70 | +#endif | 72 | +#endif |
| 71 | 73 | ||
| 72 | static size_t image_headersz_align(size_t headersz, uint8_t blockid) | 74 | static int image_fill_xip_header(void *image, struct image_tool_params *params) |
| 73 | { | 75 | { |
| 74 | @@ -1079,11 +1088,13 @@ static size_t image_headersz_v1(int *hasext) | 76 | @@ -1149,13 +1158,13 @@ static size_t image_headersz_v1(int *hasext) |
| 75 | */ | 77 | int ret; |
| 76 | headersz = sizeof(struct main_hdr_v1); | ||
| 77 | 78 | ||
| 79 | headersz = sizeof(struct main_hdr_v1); | ||
| 80 | - | ||
| 78 | +#if defined(CONFIG_KWB_SECURE) | 81 | +#if defined(CONFIG_KWB_SECURE) |
| 79 | if (image_get_csk_index() >= 0) { | 82 | if (image_get_csk_index() >= 0) { |
| 80 | headersz += sizeof(struct secure_hdr_v1); | 83 | headersz += sizeof(struct secure_hdr_v1); |
| 81 | if (hasext) | 84 | if (hasext) |
| 82 | *hasext = 1; | 85 | *hasext = 1; |
| 83 | } | 86 | } |
| 87 | - | ||
| 84 | +#endif | 88 | +#endif |
| 85 | |||
| 86 | cpu_sheeva = image_is_cpu_sheeva(); | 89 | cpu_sheeva = image_is_cpu_sheeva(); |
| 87 | 90 | ||
| 88 | @@ -1270,6 +1281,7 @@ err_close: | 91 | count = 0; |
| 92 | @@ -1351,6 +1360,7 @@ err_close: | ||
| 89 | return -1; | 93 | return -1; |
| 90 | } | 94 | } |
| 91 | 95 | ||
| @@ -93,7 +97,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 93 | static int export_pub_kak_hash(RSA *kak, struct secure_hdr_v1 *secure_hdr) | 97 | static int export_pub_kak_hash(RSA *kak, struct secure_hdr_v1 *secure_hdr) |
| 94 | { | 98 | { |
| 95 | FILE *hashf; | 99 | FILE *hashf; |
| 96 | @@ -1382,6 +1394,7 @@ static int add_secure_header_v1(struct image_tool_params *params, uint8_t *ptr, | 100 | @@ -1458,6 +1468,7 @@ static int add_secure_header_v1(struct image_tool_params *params, uint8_t *image |
| 97 | 101 | ||
| 98 | return 0; | 102 | return 0; |
| 99 | } | 103 | } |
| @@ -101,9 +105,9 @@ index 94b7685392..eec599b0ee 100644 | |||
| 101 | 105 | ||
| 102 | static void finish_register_set_header_v1(uint8_t **cur, uint8_t **next_ext, | 106 | static void finish_register_set_header_v1(uint8_t **cur, uint8_t **next_ext, |
| 103 | struct register_set_hdr_v1 *register_set_hdr, | 107 | struct register_set_hdr_v1 *register_set_hdr, |
| 104 | @@ -1406,7 +1419,9 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params, | 108 | @@ -1481,7 +1492,9 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params, |
| 109 | struct image_cfg_element *e; | ||
| 105 | struct main_hdr_v1 *main_hdr; | 110 | struct main_hdr_v1 *main_hdr; |
| 106 | struct opt_hdr_v1 *ohdr; | ||
| 107 | struct register_set_hdr_v1 *register_set_hdr; | 111 | struct register_set_hdr_v1 *register_set_hdr; |
| 108 | +#if defined(CONFIG_KWB_SECURE) | 112 | +#if defined(CONFIG_KWB_SECURE) |
| 109 | struct secure_hdr_v1 *secure_hdr = NULL; | 113 | struct secure_hdr_v1 *secure_hdr = NULL; |
| @@ -111,15 +115,16 @@ index 94b7685392..eec599b0ee 100644 | |||
| 111 | size_t headersz; | 115 | size_t headersz; |
| 112 | uint8_t *image, *cur; | 116 | uint8_t *image, *cur; |
| 113 | int hasext = 0; | 117 | int hasext = 0; |
| 114 | @@ -1491,6 +1506,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params, | 118 | @@ -1562,7 +1575,7 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params, |
| 115 | if (main_hdr->blockid == IBR_HDR_PEX_ID) | 119 | } |
| 116 | main_hdr->srcaddr = cpu_to_le32(0xFFFFFFFF); | 120 | *dataoff = le32_to_cpu(main_hdr->srcaddr); |
| 117 | 121 | } | |
| 122 | - | ||
| 118 | +#if defined(CONFIG_KWB_SECURE) | 123 | +#if defined(CONFIG_KWB_SECURE) |
| 119 | if (image_get_csk_index() >= 0) { | 124 | if (image_get_csk_index() >= 0) { |
| 120 | /* | 125 | /* |
| 121 | * only reserve the space here; we fill the header later since | 126 | * only reserve the space here; we fill the header later since |
| 122 | @@ -1501,7 +1517,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params, | 127 | @@ -1573,7 +1586,7 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params, |
| 123 | *next_ext = 1; | 128 | *next_ext = 1; |
| 124 | next_ext = &secure_hdr->next; | 129 | next_ext = &secure_hdr->next; |
| 125 | } | 130 | } |
| @@ -128,7 +133,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 128 | datai = 0; | 133 | datai = 0; |
| 129 | for (cfgi = 0; cfgi < cfgn; cfgi++) { | 134 | for (cfgi = 0; cfgi < cfgn; cfgi++) { |
| 130 | e = &image_cfg[cfgi]; | 135 | e = &image_cfg[cfgi]; |
| 131 | @@ -1624,10 +1640,12 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params, | 136 | @@ -1624,9 +1637,11 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params, |
| 132 | &datai, delay); | 137 | &datai, delay); |
| 133 | } | 138 | } |
| 134 | 139 | ||
| @@ -140,7 +145,6 @@ index 94b7685392..eec599b0ee 100644 | |||
| 140 | 145 | ||
| 141 | /* Calculate and set the header checksum */ | 146 | /* Calculate and set the header checksum */ |
| 142 | main_hdr->checksum = image_checksum8(main_hdr, headersz); | 147 | main_hdr->checksum = image_checksum8(main_hdr, headersz); |
| 143 | |||
| 144 | --- a/tools/image-host.c | 148 | --- a/tools/image-host.c |
| 145 | +++ b/tools/image-host.c | 149 | +++ b/tools/image-host.c |
| 146 | @@ -14,8 +14,10 @@ | 150 | @@ -14,8 +14,10 @@ |
| @@ -154,7 +158,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 154 | 158 | ||
| 155 | /** | 159 | /** |
| 156 | * fit_set_hash_value - set hash value in requested has node | 160 | * fit_set_hash_value - set hash value in requested has node |
| 157 | @@ -1116,6 +1118,7 @@ | 161 | @@ -1119,6 +1121,7 @@ static int fit_config_add_verification_data(const char *keydir, |
| 158 | return 0; | 162 | return 0; |
| 159 | } | 163 | } |
| 160 | 164 | ||
| @@ -162,7 +166,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 162 | /* | 166 | /* |
| 163 | * 0) open file (open) | 167 | * 0) open file (open) |
| 164 | * 1) read certificate (PEM_read_X509) | 168 | * 1) read certificate (PEM_read_X509) |
| 165 | @@ -1224,6 +1227,7 @@ | 169 | @@ -1227,6 +1230,7 @@ int fit_pre_load_data(const char *keydir, void *keydest, void *fit) |
| 166 | out: | 170 | out: |
| 167 | return ret; | 171 | return ret; |
| 168 | } | 172 | } |
| @@ -172,7 +176,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 172 | const char *comment, int require_keys, | 176 | const char *comment, int require_keys, |
| 173 | --- a/tools/fit_image.c | 177 | --- a/tools/fit_image.c |
| 174 | +++ b/tools/fit_image.c | 178 | +++ b/tools/fit_image.c |
| 175 | @@ -59,9 +59,10 @@ | 179 | @@ -61,9 +61,10 @@ static int fit_add_file_data(struct image_tool_params *params, size_t size_inc, |
| 176 | ret = fit_set_timestamp(ptr, 0, time); | 180 | ret = fit_set_timestamp(ptr, 0, time); |
| 177 | } | 181 | } |
| 178 | 182 | ||
| @@ -186,7 +190,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 186 | params->comment, | 190 | params->comment, |
| 187 | --- a/include/image.h | 191 | --- a/include/image.h |
| 188 | +++ b/include/image.h | 192 | +++ b/include/image.h |
| 189 | @@ -1090,6 +1090,7 @@ | 193 | @@ -1182,6 +1182,7 @@ int fit_image_hash_get_value(const void *fit, int noffset, uint8_t **value, |
| 190 | 194 | ||
| 191 | int fit_set_timestamp(void *fit, int noffset, time_t timestamp); | 195 | int fit_set_timestamp(void *fit, int noffset, time_t timestamp); |
| 192 | 196 | ||
| @@ -194,7 +198,7 @@ index 94b7685392..eec599b0ee 100644 | |||
| 194 | /** | 198 | /** |
| 195 | * fit_pre_load_data() - add public key to fdt blob | 199 | * fit_pre_load_data() - add public key to fdt blob |
| 196 | * | 200 | * |
| 197 | @@ -1104,6 +1105,7 @@ | 201 | @@ -1196,6 +1197,7 @@ int fit_set_timestamp(void *fit, int noffset, time_t timestamp); |
| 198 | * < 0, on failure | 202 | * < 0, on failure |
| 199 | */ | 203 | */ |
| 200 | int fit_pre_load_data(const char *keydir, void *keydest, void *fit); | 204 | int fit_pre_load_data(const char *keydir, void *keydest, void *fit); |
diff --git a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch deleted file mode 100644 index 7e5d6ba6561..00000000000 --- a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | This patch is backported from U-Boot 2023.01; remove when updating. | ||
| 2 | |||
| 3 | From 7d01bb1c5a1daef0187c9ea276bde19a8d0e7fde Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Michal Suchanek <msuchanek@suse.de> | ||
| 5 | Date: Thu, 13 Oct 2022 22:43:41 +0200 | ||
| 6 | Subject: [PATCH] libfdt: Fix build with python 3.10 | ||
| 7 | |||
| 8 | Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in | ||
| 9 | swig 4.10 but it is not clear when it will be released. There was a | ||
| 10 | warning since python 3.8. | ||
| 11 | |||
| 12 | Link: https://github.com/swig/swig/pull/2277 | ||
| 13 | |||
| 14 | Signed-off-by: Michal Suchanek <msuchanek@suse.de> | ||
| 15 | Reviewed-by: Simon Glass <sjg@chromium.org> | ||
| 16 | --- | ||
| 17 | scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++ | ||
| 18 | 1 file changed, 4 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped | ||
| 21 | index 27c29ea260..56cc5d48f4 100644 | ||
| 22 | --- a/scripts/dtc/pylibfdt/libfdt.i_shipped | ||
| 23 | +++ b/scripts/dtc/pylibfdt/libfdt.i_shipped | ||
| 24 | @@ -7,6 +7,10 @@ | ||
| 25 | |||
| 26 | %module libfdt | ||
| 27 | |||
| 28 | +%begin %{ | ||
| 29 | +#define PY_SSIZE_T_CLEAN | ||
| 30 | +%} | ||
| 31 | + | ||
| 32 | %include <stdint.i> | ||
| 33 | |||
| 34 | %{ | ||
| 35 | -- | ||
| 36 | GitLab | ||
| 37 | |||
diff --git a/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch b/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch deleted file mode 100644 index 233c437de67..00000000000 --- a/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | Submitted upstream (see: | ||
| 2 | https://lists.denx.de/pipermail/u-boot/2023-July/521984.html) | ||
| 3 | |||
| 4 | diff --git a/tools/u_boot_pylib/pyproject.toml b/tools/u_boot_pylib/pyproject.toml | ||
| 5 | index 3f33caf6f8..037c5d629e 100644 | ||
| 6 | --- a/tools/u_boot_pylib/pyproject.toml | ||
| 7 | +++ b/tools/u_boot_pylib/pyproject.toml | ||
| 8 | @@ -9,7 +9,7 @@ authors = [ | ||
| 9 | { name="Simon Glass", email="sjg@chromium.org" }, | ||
| 10 | ] | ||
| 11 | description = "U-Boot python library" | ||
| 12 | -readme = "README.md" | ||
| 13 | +readme = "README.rst" | ||
| 14 | requires-python = ">=3.7" | ||
| 15 | classifiers = [ | ||
| 16 | "Programming Language :: Python :: 3", | ||
| 17 | @@ -20,3 +20,7 @@ classifiers = [ | ||
| 18 | [project.urls] | ||
| 19 | "Homepage" = "https://u-boot.readthedocs.io" | ||
| 20 | "Bug Tracker" = "https://source.denx.de/groups/u-boot/-/issues" | ||
| 21 | + | ||
| 22 | +[tool.setuptools.packages.find] | ||
| 23 | +where = [".."] | ||
| 24 | +include = ["u_boot_pylib*"] | ||
diff --git a/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch b/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch deleted file mode 100644 index f14a9ce1048..00000000000 --- a/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | adapting commit ac804143cf ("mmc: rockchip_sdhci: add phy and clock | ||
| 2 | config for rk3399") to fix the issue "Not found emmc phy device". | ||
| 3 | |||
| 4 | Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com> | ||
| 5 | --- | ||
| 6 | |||
| 7 | arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++ | ||
| 8 | 1 file changed, 4 insertions(+) | ||
| 9 | |||
| 10 | diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi | ||
| 11 | index 73922c328a..716b9a433a 100644 | ||
| 12 | --- a/arch/arm/dts/rk3399-u-boot.dtsi | ||
| 13 | +++ b/arch/arm/dts/rk3399-u-boot.dtsi | ||
| 14 | @@ -88,6 +88,10 @@ | ||
| 15 | u-boot,dm-pre-reloc; | ||
| 16 | }; | ||
| 17 | |||
| 18 | +&emmc_phy { | ||
| 19 | + u-boot,dm-pre-reloc; | ||
| 20 | +}; | ||
| 21 | + | ||
| 22 | &grf { | ||
| 23 | u-boot,dm-pre-reloc; | ||
| 24 | }; | ||
| 25 | -- | ||
| 26 | 2.17.1 | ||
diff --git a/gnu/packages/patches/u-boot-rockchip-inno-usb.patch b/gnu/packages/patches/u-boot-rockchip-inno-usb.patch index 58f04b2c782..eeb25f4b893 100644 --- a/gnu/packages/patches/u-boot-rockchip-inno-usb.patch +++ b/gnu/packages/patches/u-boot-rockchip-inno-usb.patch | |||
| @@ -170,10 +170,10 @@ Tested-by: Peter Robinson <pbrobinson@gmail.com> | |||
| 170 | 1 file changed, 21 insertions(+) | 170 | 1 file changed, 21 insertions(+) |
| 171 | 171 | ||
| 172 | diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 172 | diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c |
| 173 | index 62b8ba3a4a..be9cc99d90 100644 | 173 | index 70e61eccb7..ce36db94a7 100644 |
| 174 | --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 174 | --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c |
| 175 | +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 175 | +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c |
| 176 | @@ -62,6 +62,8 @@ struct rockchip_usb2phy { | 176 | @@ -64,6 +64,8 @@ struct rockchip_usb2phy { |
| 177 | void *reg_base; | 177 | void *reg_base; |
| 178 | struct clk phyclk; | 178 | struct clk phyclk; |
| 179 | const struct rockchip_usb2phy_cfg *phy_cfg; | 179 | const struct rockchip_usb2phy_cfg *phy_cfg; |
| @@ -182,7 +182,7 @@ index 62b8ba3a4a..be9cc99d90 100644 | |||
| 182 | }; | 182 | }; |
| 183 | 183 | ||
| 184 | static inline int property_enable(void *reg_base, | 184 | static inline int property_enable(void *reg_base, |
| 185 | @@ -92,6 +94,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy) | 185 | @@ -106,6 +108,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy) |
| 186 | struct rockchip_usb2phy *priv = dev_get_priv(parent); | 186 | struct rockchip_usb2phy *priv = dev_get_priv(parent); |
| 187 | const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); | 187 | const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); |
| 188 | 188 | ||
| @@ -193,7 +193,7 @@ index 62b8ba3a4a..be9cc99d90 100644 | |||
| 193 | property_enable(priv->reg_base, &port_cfg->phy_sus, false); | 193 | property_enable(priv->reg_base, &port_cfg->phy_sus, false); |
| 194 | 194 | ||
| 195 | /* waiting for the utmi_clk to become stable */ | 195 | /* waiting for the utmi_clk to become stable */ |
| 196 | @@ -106,6 +112,10 @@ static int rockchip_usb2phy_power_off(struct phy *phy) | 196 | @@ -120,6 +126,10 @@ static int rockchip_usb2phy_power_off(struct phy *phy) |
| 197 | struct rockchip_usb2phy *priv = dev_get_priv(parent); | 197 | struct rockchip_usb2phy *priv = dev_get_priv(parent); |
| 198 | const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); | 198 | const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); |
| 199 | 199 | ||
| @@ -204,7 +204,7 @@ index 62b8ba3a4a..be9cc99d90 100644 | |||
| 204 | property_enable(priv->reg_base, &port_cfg->phy_sus, true); | 204 | property_enable(priv->reg_base, &port_cfg->phy_sus, true); |
| 205 | 205 | ||
| 206 | return 0; | 206 | return 0; |
| 207 | @@ -118,6 +128,10 @@ static int rockchip_usb2phy_init(struct phy *phy) | 207 | @@ -132,6 +142,10 @@ static int rockchip_usb2phy_init(struct phy *phy) |
| 208 | const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); | 208 | const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); |
| 209 | int ret; | 209 | int ret; |
| 210 | 210 | ||
| @@ -213,9 +213,9 @@ index 62b8ba3a4a..be9cc99d90 100644 | |||
| 213 | + return 0; | 213 | + return 0; |
| 214 | + | 214 | + |
| 215 | ret = clk_enable(&priv->phyclk); | 215 | ret = clk_enable(&priv->phyclk); |
| 216 | if (ret) { | 216 | if (ret && ret != -ENOSYS) { |
| 217 | dev_err(phy->dev, "failed to enable phyclk (ret=%d)\n", ret); | 217 | dev_err(phy->dev, "failed to enable phyclk (ret=%d)\n", ret); |
| 218 | @@ -140,6 +154,10 @@ static int rockchip_usb2phy_exit(struct phy *phy) | 218 | @@ -154,6 +168,10 @@ static int rockchip_usb2phy_exit(struct phy *phy) |
| 219 | struct udevice *parent = dev_get_parent(phy->dev); | 219 | struct udevice *parent = dev_get_parent(phy->dev); |
| 220 | struct rockchip_usb2phy *priv = dev_get_priv(parent); | 220 | struct rockchip_usb2phy *priv = dev_get_priv(parent); |
| 221 | 221 | ||
| @@ -226,7 +226,7 @@ index 62b8ba3a4a..be9cc99d90 100644 | |||
| 226 | clk_disable(&priv->phyclk); | 226 | clk_disable(&priv->phyclk); |
| 227 | 227 | ||
| 228 | return 0; | 228 | return 0; |
| 229 | @@ -212,6 +230,9 @@ static int rockchip_usb2phy_probe(struct udevice *dev) | 229 | @@ -294,6 +312,9 @@ static int rockchip_usb2phy_probe(struct udevice *dev) |
| 230 | return ret; | 230 | return ret; |
| 231 | } | 231 | } |
| 232 | 232 | ||
diff --git a/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch b/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch deleted file mode 100644 index 858f42efe75..00000000000 --- a/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | Description: prevent relocating initrd & fdt, that results in failure to boot | ||
| 2 | Author: Heinrich Schuchardt (xypron) | ||
| 3 | Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246 | ||
| 4 | Index: u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h | ||
| 5 | =================================================================== | ||
| 6 | --- u-boot-2021.07~rc4+dfsg.orig/include/configs/sifive-unmatched.h | ||
| 7 | +++ u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h | ||
| 8 | @@ -55,6 +55,8 @@ | ||
| 9 | "name=system,size=-,bootable,type=${type_guid_gpt_system};" | ||
| 10 | |||
| 11 | #define CFG_EXTRA_ENV_SETTINGS \ | ||
| 12 | + "fdt_high=0xffffffffffffffff\0" \ | ||
| 13 | + "initrd_high=0xffffffffffffffff\0" \ | ||
| 14 | "kernel_addr_r=0x84000000\0" \ | ||
| 15 | "kernel_comp_addr_r=0x88000000\0" \ | ||
| 16 | "kernel_comp_size=0x4000000\0" \ | ||
