diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2025-04-04 22:59:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2025-04-04 22:59:31 +0200 |
| commit | 60abc54cfd549cfaa6f543799943ca3b4fb2938d (patch) | |
| tree | 884cb49e0eec90f37b72ae2e14fac70603fd12b0 | |
| parent | 3a3931b139c7c95c4c85967de7e1a091def62cb8 (diff) | |
Revert "u-boot-h8300: switch to github"
This reverts commit 3a3931b139c7c95c4c85967de7e1a091def62cb8.
| -rw-r--r-- | package/u-boot-h8300/Makefile | 12 | ||||
| -rw-r--r-- | package/u-boot-h8300/patches/dtc.patch | 11 | ||||
| -rw-r--r-- | package/u-boot-h8300/patches/patch-include_image_h | 13 |
3 files changed, 31 insertions, 5 deletions
diff --git a/package/u-boot-h8300/Makefile b/package/u-boot-h8300/Makefile index b90f9db41..bfd0824df 100644 --- a/package/u-boot-h8300/Makefile +++ b/package/u-boot-h8300/Makefile @@ -4,20 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot +# last working hash fa0e8426833edc1be3c2ea3acaf248157048a15a PKG_VERSION:= h8300 -PKG_HASH:= a7dff2049fdadd3f247f0f952a3c4531a31313b7ccfa6e1c99b69ecdc904e84b PKG_GIT:= branch PKG_RELEASE:= 1 PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= openssl-host dtc-host +HOST_BUILDDEP:= libressl-host dtc-host PKG_BUILDDEP:= u-boot-h8300-host -PKG_SITES:= https://github.com/ysat0/u-boot.git +PKG_SITES:= git://git.pf.osdn.jp/gitroot/y/ys/ysato/uboot.git PKG_SYSTEM_DEPENDS:= hitachi-edosk2674 -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -26,6 +24,8 @@ $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP UBOOT:= u-boot.bin +HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ + HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" HOST_STYLE:= manual CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -33,6 +33,8 @@ INSTALL_STYLE:= manual host-build: (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ + $(HOST_MAKE_FLAGS) sandbox_defconfig ) + (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) ) u-boot-hostinstall: diff --git a/package/u-boot-h8300/patches/dtc.patch b/package/u-boot-h8300/patches/dtc.patch new file mode 100644 index 000000000..725c3af2f --- /dev/null +++ b/package/u-boot-h8300/patches/dtc.patch @@ -0,0 +1,11 @@ +diff -Nur u-boot-h8300.orig/scripts/dtc/dtc-lexer.l u-boot-h8300/scripts/dtc/dtc-lexer.l +--- u-boot-h8300.orig/scripts/dtc/dtc-lexer.l 2022-02-11 13:17:30.000000000 +0100 ++++ u-boot-h8300/scripts/dtc/dtc-lexer.l 2022-02-11 13:42:14.302389873 +0100 +@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ diff --git a/package/u-boot-h8300/patches/patch-include_image_h b/package/u-boot-h8300/patches/patch-include_image_h new file mode 100644 index 000000000..e087a033d --- /dev/null +++ b/package/u-boot-h8300/patches/patch-include_image_h @@ -0,0 +1,13 @@ +--- u-boot-h8300.orig/include/image.h 2022-02-11 13:17:30.000000000 +0100 ++++ u-boot-h8300/include/image.h 2022-02-13 01:58:23.457168935 +0100 +@@ -194,9 +194,9 @@ enum { + IH_ARCH_ARM64, /* ARM64 */ + IH_ARCH_ARC, /* Synopsys DesignWare ARC */ + IH_ARCH_X86_64, /* AMD x86_64, Intel and Via */ ++ IH_ARCH_H8300, /* H8/300 */ + IH_ARCH_XTENSA, /* Xtensa */ + IH_ARCH_RISCV, /* RISC-V */ +- IH_ARCH_H8300, /* H8/300 */ + IH_ARCH_COUNT, + }; + |