diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2018-12-31 15:06:44 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2018-12-31 15:06:44 +0000 |
| commit | 24463cf1e5d13a69a0ee8dfa764de4bb92d7cc29 (patch) | |
| tree | 6c9ed34551d5d9034358474ff82e3f96a2163268 /sysutils/u-boot | |
| parent | d52d0dd7d6372b377dd6d1d44a94336c2db6c21e (diff) | |
| download | pkgsrc-24463cf1e5d13a69a0ee8dfa764de4bb92d7cc29.tar.gz | |
U-Boot 2018.11 broke compatibility of U-Boot image type IDs. Restore IDs
used in previous (and subsequent) U-Boot versions to fix booting GENERIC
armv7 NetBSD kernels.
Diffstat (limited to 'sysutils/u-boot')
| -rw-r--r-- | sysutils/u-boot/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/u-boot/patches/patch-include_image.h | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/sysutils/u-boot/distinfo b/sysutils/u-boot/distinfo index 57c8b2f4cd4..b1d0d446e45 100644 --- a/sysutils/u-boot/distinfo +++ b/sysutils/u-boot/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2018/12/19 12:03:01 ryoon Exp $ +$NetBSD: distinfo,v 1.19 2018/12/31 15:06:44 jmcneill Exp $ SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6 RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453 @@ -11,5 +11,6 @@ SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55 SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6 SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4 SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8 +SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47 SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042 diff --git a/sysutils/u-boot/patches/patch-include_image.h b/sysutils/u-boot/patches/patch-include_image.h new file mode 100644 index 00000000000..47479792ad8 --- /dev/null +++ b/sysutils/u-boot/patches/patch-include_image.h @@ -0,0 +1,26 @@ +$NetBSD: patch-include_image.h,v 1.1 2018/12/31 15:06:44 jmcneill Exp $ + +IH_TYPE_* image type value compatibility was broken in 2018.11. Restore +compatibility with previous and future releases. This has since been fixed +upstream with commit 24431adc366c67c7755c0c6a956978f3b66ad550 + +--- include/image.h.orig 2018-11-14 16:10:06.000000000 +0000 ++++ include/image.h +@@ -251,7 +251,6 @@ enum { + IH_TYPE_FLATDT, /* Binary Flat Device Tree Blob */ + IH_TYPE_KWBIMAGE, /* Kirkwood Boot Image */ + IH_TYPE_IMXIMAGE, /* Freescale IMXBoot Image */ +- IH_TYPE_IMX8IMAGE, /* Freescale IMX8Boot Image */ + IH_TYPE_UBLIMAGE, /* Davinci UBL Image */ + IH_TYPE_OMAPIMAGE, /* TI OMAP Config Header Image */ + IH_TYPE_AISIMAGE, /* TI Davinci AIS Image */ +@@ -278,6 +277,9 @@ enum { + IH_TYPE_PMMC, /* TI Power Management Micro-Controller Firmware */ + IH_TYPE_STM32IMAGE, /* STMicroelectronics STM32 Image */ + IH_TYPE_SOCFPGAIMAGE_V1, /* Altera SOCFPGA A10 Preloader */ ++ IH_TYPE_MTKIMAGE, /* MediaTek BootRO loadable Image */ ++ IH_TYPE_IMX8MIMAGE, /* Freescale IMX8MBoot Image */ ++ IH_TYPE_IMX8IMAGE, /* Freescale IMX8Boot Image */ + + IH_TYPE_COUNT, /* Number of image types */ + }; |