diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2022-02-14 02:27:04 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2022-02-14 07:22:33 +0100 |
commit | 4f5f3a6903299c0fae3d2715ce25c59a7764909c (patch) | |
tree | b02deb47fae881c82d2842ddfb62dd51a2dee1bb | |
parent | 9bf8f29805479cdff42da3c7d0dd9b2fc4236553 (diff) |
mkimage fix for my hitachi edosk 2674
-rw-r--r-- | package/u-boot-h8300/Makefile | 3 | ||||
-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, 25 insertions, 2 deletions
diff --git a/package/u-boot-h8300/Makefile b/package/u-boot-h8300/Makefile index e26b4fd59..bfd0824df 100644 --- a/package/u-boot-h8300/Makefile +++ b/package/u-boot-h8300/Makefile @@ -4,6 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot +# last working hash fa0e8426833edc1be3c2ea3acaf248157048a15a PKG_VERSION:= h8300 PKG_GIT:= branch PKG_RELEASE:= 1 @@ -13,7 +14,6 @@ HOST_BUILDDEP:= libressl-host dtc-host PKG_BUILDDEP:= u-boot-h8300-host PKG_SITES:= git://git.pf.osdn.jp/gitroot/y/ys/ysato/uboot.git - PKG_SYSTEM_DEPENDS:= hitachi-edosk2674 include $(ADK_TOPDIR)/mk/host.mk @@ -23,7 +23,6 @@ $(eval $(call HOST_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) UBOOT:= u-boot.bin -CONFIG:= clearfog_defconfig HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" 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, + }; + |