Skip to content
Snippets Groups Projects
Verified Commit fa1a4374 authored by Richard Muzik's avatar Richard Muzik
Browse files

uboot-mpc85xx: squash patches and correct PKG_MIRROR_HASH

Since we created the package it makes sense to squash all the patches
regarding the package for easier maintenance. Also fixes the hash to
correct one.
parent f6364ee4
Branches crashlab
No related merge requests found
Pipeline #134128 passed with stages
in 11 minutes and 11 seconds
......@@ -5,9 +5,9 @@ Subject: [PATCH] uboot-mpc85xx: add Turris 1.x versions for SD and NOR
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---
package/boot/uboot-mpc85xx/Makefile | 49 +++++++++++++++++++
.../uboot-mpc85xx/patches/force-libfdt.patch | 32 ++++++++++++
2 files changed, 81 insertions(+)
package/boot/uboot-mpc85xx/Makefile | 51 +++++++++++++++++++
.../uboot-mpc85xx/patches/force-libfdt.patch | 48 ++++++++++++
2 files changed, 99 insertions(+)
create mode 100644 package/boot/uboot-mpc85xx/Makefile
create mode 100644 package/boot/uboot-mpc85xx/patches/force-libfdt.patch
......@@ -16,7 +16,7 @@ new file mode 100644
index 0000000000..db057bfba2
--- /dev/null
+++ b/package/boot/uboot-mpc85xx/Makefile
@@ -0,0 +1,49 @@
@@ -0,0 +1,51 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
......@@ -27,9 +27,11 @@ index 0000000000..db057bfba2
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/u-boot.git
+PKG_MIRROR_HASH:=760e620d9d452a46428b539a9a7bc95aa0bae9c42e2c97f1af2f9eae0e668933
+PKG_MIRROR_HASH:=895cbc86f7e94b33488a3a850d6142ba7dae89bcf505fc7aa1103ec6642e771c
+PKG_SOURCE_DATE:=2024-05-10
+PKG_SOURCE_VERSION:=cf50dc0956a2b99dff735ca08a6b72446950ea7f
+PKG_BUILD_DEPENDS:=swig/host python-poetry-core/host
+HOST_BUILD_DEPENDS:=swig/host python-poetry-core/host
+
+include $(INCLUDE_DIR)/u-boot.mk
+include $(INCLUDE_DIR)/package.mk
......@@ -53,7 +55,7 @@ index 0000000000..db057bfba2
+ BUILD_DEVICES:=cznic_turris1x
+ BUILD_SUBTARGET:=p2020
+ UBOOT_CONFIG:=turris_1x_nor
+ UBOOT_IMAGE:=u-boot-with-dtb.bin
+ UBOOT_IMAGE:=u-boot-dtb.bin
+endef
+
+UBOOT_TARGETS:= \
......@@ -71,11 +73,13 @@ new file mode 100644
index 0000000000..a21020baca
--- /dev/null
+++ b/package/boot/uboot-mpc85xx/patches/force-libfdt.patch
@@ -0,0 +1,32 @@
@@ -0,0 +1,48 @@
+Taken from https://github.com/openwrt/openwrt/commit/e760f065c6fd17005c5458e54d6cc0fb8356b4df#commitcomment-78364865
+
+--- a/Makefile
++++ b/Makefile
+Index: u-boot-2022-09-27-turris1x/Makefile
+===================================================================
+--- u-boot-2022-09-27-turris1x.orig/Makefile
++++ u-boot-2022-09-27-turris1x/Makefile
+@@ -2051,26 +2051,7 @@ endif
+ # Check dtc and pylibfdt, if DTC is provided, else build them
+ PHONY += scripts_dtc
......@@ -104,6 +108,20 @@ index 0000000000..a21020baca
+
+ # ---------------------------------------------------------------------------
+ quiet_cmd_cpp_lds = LDS $@
+Index: u-boot-2022-09-27-turris1x/scripts/dtc/pylibfdt/setup.py
+===================================================================
+--- u-boot-2022-09-27-turris1x.orig/scripts/dtc/pylibfdt/setup.py
++++ u-boot-2022-09-27-turris1x/scripts/dtc/pylibfdt/setup.py
+@@ -81,8 +81,7 @@ def GetEnvFromMakefiles():
+ basedir = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+ swig_opts = ['-I%s' % basedir]
+ makevars = ParseMakefile(os.path.join(basedir, 'Makefile'))
+- version = '%s.%s.%s' % (makevars['VERSION'], makevars['PATCHLEVEL'],
+- makevars['SUBLEVEL'])
++ version = '1.1.1'
+ makevars = ParseMakefile(os.path.join(basedir, 'libfdt', 'Makefile.libfdt'))
+ files = makevars['LIBFDT_SRCS'].split()
+ files = [os.path.join(basedir, 'libfdt', fname) for fname in files]
--
2.34.1
From a3dc419ebc5682f01208a647c484296a78b26d93 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@turris.com>
Date: Tue, 29 Aug 2023 11:34:52 +0200
Subject: [PATCH] uboot-mpc85xx: Fix building Turris 1.X U-Boot
Add missing dependency on swig/host and force bogus version of pylibftdi
library that is used during build. Originally it used the same version
as U-Boot it was embedded in, but that version is not valid Python
version and as it is not installed anywhere, let's just fill-in some
random number to make build succeed.
---
package/boot/uboot-mpc85xx/Makefile | 1 +
.../uboot-mpc85xx/patches/force-libfdt.patch | 29 +++++++++++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/package/boot/uboot-mpc85xx/Makefile b/package/boot/uboot-mpc85xx/Makefile
index a3a0c5183c..2ac7268fee 100644
--- a/package/boot/uboot-mpc85xx/Makefile
+++ b/package/boot/uboot-mpc85xx/Makefile
@@ -11,6 +11,8 @@ PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/u-boot.git
PKG_MIRROR_HASH:=760e620d9d452a46428b539a9a7bc95aa0bae9c42e2c97f1af2f9eae0e668933
PKG_SOURCE_DATE:=2024-05-10
PKG_SOURCE_VERSION:=cf50dc0956a2b99dff735ca08a6b72446950ea7f
+PKG_BUILD_DEPENDS:=swig/host
+HOST_BUILD_DEPENDS:=swig/host
include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk
diff --git a/package/boot/uboot-mpc85xx/patches/force-libfdt.patch b/package/boot/uboot-mpc85xx/patches/force-libfdt.patch
index a21020baca..b516d320e0 100644
--- a/package/boot/uboot-mpc85xx/patches/force-libfdt.patch
+++ b/package/boot/uboot-mpc85xx/patches/force-libfdt.patch
@@ -1,7 +1,9 @@
Taken from https://github.com/openwrt/openwrt/commit/e760f065c6fd17005c5458e54d6cc0fb8356b4df#commitcomment-78364865
---- a/Makefile
-+++ b/Makefile
+Index: u-boot-2022-09-27-turris1x/Makefile
+===================================================================
+--- u-boot-2022-09-27-turris1x.orig/Makefile
++++ u-boot-2022-09-27-turris1x/Makefile
@@ -2051,26 +2051,7 @@ endif
# Check dtc and pylibfdt, if DTC is provided, else build them
PHONY += scripts_dtc
@@ -30,3 +32,17 @@ Taken from https://github.com/openwrt/openwrt/commit/e760f065c6fd17005c5458e54d6
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds = LDS $@
+Index: u-boot-2022-09-27-turris1x/scripts/dtc/pylibfdt/setup.py
+===================================================================
+--- u-boot-2022-09-27-turris1x.orig/scripts/dtc/pylibfdt/setup.py
++++ u-boot-2022-09-27-turris1x/scripts/dtc/pylibfdt/setup.py
+@@ -81,8 +81,7 @@ def GetEnvFromMakefiles():
+ basedir = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+ swig_opts = ['-I%s' % basedir]
+ makevars = ParseMakefile(os.path.join(basedir, 'Makefile'))
+- version = '%s.%s.%s' % (makevars['VERSION'], makevars['PATCHLEVEL'],
+- makevars['SUBLEVEL'])
++ version = '1.1.1'
+ makevars = ParseMakefile(os.path.join(basedir, 'libfdt', 'Makefile.libfdt'))
+ files = makevars['LIBFDT_SRCS'].split()
+ files = [os.path.join(basedir, 'libfdt', fname) for fname in files]
--
2.41.0
From fc760c52ea7877b60ba57c16a3697e9ca524b828 Mon Sep 17 00:00:00 2001
From: Tomas Zak <tomas.zak@turris.com>
Date: Thu, 24 Oct 2024 20:09:59 +0200
Subject: [PATCH] uboot-mpc85xx: Fix compiling with new u-boot version
Added missing dependency on python-poetry and fix correct name for nor version
of bin file of u-boot.
---
package/boot/uboot-mpc85xx/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/boot/uboot-mpc85xx/Makefile b/package/boot/uboot-mpc85xx/Makefile
index 916d4ae1cd..d85aafcf75 100644
--- a/package/boot/uboot-mpc85xx/Makefile
+++ b/package/boot/uboot-mpc85xx/Makefile
@@ -8,11 +8,11 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.nic.cz/turris/u-boot.git
-PKG_MIRROR_HASH:=760e620d9d452a46428b539a9a7bc95aa0bae9c42e2c97f1af2f9eae0e668933
+PKG_MIRROR_HASH:=6d3e818b83e932a8e23b8a2fb17482a9c9cdd834350e9688fae5bb29bc356b6f
PKG_SOURCE_DATE:=2024-05-10
PKG_SOURCE_VERSION:=cf50dc0956a2b99dff735ca08a6b72446950ea7f
-PKG_BUILD_DEPENDS:=swig/host
-HOST_BUILD_DEPENDS:=swig/host
+PKG_BUILD_DEPENDS:=swig/host python-poetry-core/host
+HOST_BUILD_DEPENDS:=swig/host python-poetry-core/host
include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk
@@ -36,7 +36,7 @@ define U-Boot/turris1x-nor
BUILD_DEVICES:=cznic_turris1x
BUILD_SUBTARGET:=p2020
UBOOT_CONFIG:=turris_1x_nor
- UBOOT_IMAGE:=u-boot-with-dtb.bin
+ UBOOT_IMAGE:=u-boot-dtb.bin
endef
UBOOT_TARGETS:= \
--
2.47.0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment