[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-92-g4d97118c2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-92-g4d97118c2
|
From: Sébastien S. <ss...@us...> - 2019-06-26 13:29:44
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4d97118c2565e92f4f674fed33c3978659eec3ea (commit)
via 8458119191ae90ec67495c6032a23cf99f6a75e9 (commit)
from 1e568f4c55b230c123333fbf1686a650d73af48c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4d97118c2565e92f4f674fed33c3978659eec3ea
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jun 26 15:27:47 2019 +0200
[U-BOOT] 2014.07: fix freeze when using network
commit 8458119191ae90ec67495c6032a23cf99f6a75e9
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jun 26 15:27:14 2019 +0200
[U-BOOT] 2014.07: fix compilation on host with DTC installed
-----------------------------------------------------------------------
Summary of changes:
.../2014.07/609-use-local-libfdt-headers.patch | 136 +++++++++++++++++++++
.../2014.07/610-net-use-packed-structures.patch | 106 ++++++++++++++++
2 files changed, 242 insertions(+)
create mode 100644 patches/u-boot/2014.07/609-use-local-libfdt-headers.patch
create mode 100644 patches/u-boot/2014.07/610-net-use-packed-structures.patch
diff --git a/patches/u-boot/2014.07/609-use-local-libfdt-headers.patch b/patches/u-boot/2014.07/609-use-local-libfdt-headers.patch
new file mode 100644
index 000000000..44fe81d12
--- /dev/null
+++ b/patches/u-boot/2014.07/609-use-local-libfdt-headers.patch
@@ -0,0 +1,136 @@
+Index: uboot-2014.07/include/libfdt.h
+===================================================================
+--- uboot-2014.07.orig/include/libfdt.h
++++ uboot-2014.07/include/libfdt.h
+@@ -51,8 +51,8 @@
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-#include <libfdt_env.h>
+-#include <fdt.h>
++#include "libfdt_env.h"
++#include "fdt.h"
+
+ #define FDT_FIRST_SUPPORTED_VERSION 0x10
+ #define FDT_LAST_SUPPORTED_VERSION 0x11
+Index: uboot-2014.07/include/image.h
+===================================================================
+--- uboot-2014.07.orig/include/image.h
++++ uboot-2014.07/include/image.h
+@@ -46,8 +46,8 @@ struct lmb;
+
+ #if defined(CONFIG_FIT)
+ #include <hash.h>
+-#include <libfdt.h>
+-#include <fdt_support.h>
++#include "libfdt.h"
++#include "fdt_support.h"
+ # ifdef CONFIG_SPL_BUILD
+ # ifdef CONFIG_SPL_CRC32_SUPPORT
+ # define IMAGE_ENABLE_CRC32 1
+Index: uboot-2014.07/include/fdt_support.h
+===================================================================
+--- uboot-2014.07.orig/include/fdt_support.h
++++ uboot-2014.07/include/fdt_support.h
+@@ -10,7 +10,7 @@
+
+ #ifdef CONFIG_OF_LIBFDT
+
+-#include <libfdt.h>
++#include "libfdt.h"
+
+ u32 fdt_getprop_u32_default_node(const void *fdt, int off, int cell,
+ const char *prop, const u32 dflt);
+Index: uboot-2014.07/lib/libfdt/fdt_ro.c
+===================================================================
+--- uboot-2014.07.orig/lib/libfdt/fdt_ro.c
++++ uboot-2014.07/lib/libfdt/fdt_ro.c
+@@ -3,7 +3,7 @@
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
+ */
+-#include "libfdt_env.h"
++#include "../../include/libfdt_env.h"
+
+ #ifndef USE_HOSTCC
+ #include <fdt.h>
+Index: uboot-2014.07/lib/libfdt/fdt.c
+===================================================================
+--- uboot-2014.07.orig/lib/libfdt/fdt.c
++++ uboot-2014.07/lib/libfdt/fdt.c
+@@ -3,7 +3,7 @@
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
+ */
+-#include "libfdt_env.h"
++#include "../../include/libfdt_env.h"
+
+ #ifndef USE_HOSTCC
+ #include <fdt.h>
+Index: uboot-2014.07/lib/libfdt/fdt_strerror.c
+===================================================================
+--- uboot-2014.07.orig/lib/libfdt/fdt_strerror.c
++++ uboot-2014.07/lib/libfdt/fdt_strerror.c
+@@ -3,7 +3,7 @@
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
+ */
+-#include "libfdt_env.h"
++#include "../../include/libfdt_env.h"
+
+ #ifndef USE_HOSTCC
+ #include <fdt.h>
+Index: uboot-2014.07/lib/fdtdec_common.c
+===================================================================
+--- uboot-2014.07.orig/lib/fdtdec_common.c
++++ uboot-2014.07/lib/fdtdec_common.c
+@@ -13,8 +13,8 @@
+ #include <libfdt.h>
+ #include <fdtdec.h>
+ #else
+-#include "libfdt.h"
+-#include "fdt_support.h"
++#include "../include/libfdt.h"
++#include "../include/fdt_support.h"
+
+ #define debug(...)
+ #endif
+Index: uboot-2014.07/lib/libfdt/libfdt_internal.h
+===================================================================
+--- uboot-2014.07.orig/lib/libfdt/libfdt_internal.h
++++ uboot-2014.07/lib/libfdt/libfdt_internal.h
+@@ -5,7 +5,7 @@
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
+ */
+-#include <fdt.h>
++#include "../../include/fdt.h"
+
+ #define FDT_ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
+ #define FDT_TAGALIGN(x) (FDT_ALIGN((x), FDT_TAGSIZE))
+Index: uboot-2014.07/lib/libfdt/fdt_wip.c
+===================================================================
+--- uboot-2014.07.orig/lib/libfdt/fdt_wip.c
++++ uboot-2014.07/lib/libfdt/fdt_wip.c
+@@ -3,7 +3,7 @@
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
+ */
+-#include "libfdt_env.h"
++#include "../../include/libfdt_env.h"
+
+ #ifndef USE_HOSTCC
+ #include <fdt.h>
+Index: uboot-2014.07/lib/libfdt/fdt_rw.c
+===================================================================
+--- uboot-2014.07.orig/lib/libfdt/fdt_rw.c
++++ uboot-2014.07/lib/libfdt/fdt_rw.c
+@@ -3,7 +3,7 @@
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
+ */
+-#include "libfdt_env.h"
++#include "../../include/libfdt_env.h"
+
+ #ifndef USE_HOSTCC
+ #include <fdt.h>
diff --git a/patches/u-boot/2014.07/610-net-use-packed-structures.patch b/patches/u-boot/2014.07/610-net-use-packed-structures.patch
new file mode 100644
index 000000000..1b8dbffc1
--- /dev/null
+++ b/patches/u-boot/2014.07/610-net-use-packed-structures.patch
@@ -0,0 +1,106 @@
+Index: uboot-2014.07/include/net.h
+===================================================================
+--- uboot-2014.07.orig/include/net.h
++++ uboot-2014.07/include/net.h
+@@ -186,7 +186,7 @@ struct ethernet_hdr {
+ uchar et_dest[6]; /* Destination node */
+ uchar et_src[6]; /* Source node */
+ ushort et_protlen; /* Protocol or length */
+-};
++} __attribute__((packed));
+
+ /* Ethernet header size */
+ #define ETHER_HDR_SIZE (sizeof(struct ethernet_hdr))
+@@ -202,7 +202,7 @@ struct e802_hdr {
+ uchar et_snap2;
+ uchar et_snap3;
+ ushort et_prot; /* 802 protocol */
+-};
++} __attribute__((packed));
+
+ /* 802 + SNAP + ethernet header size */
+ #define E802_HDR_SIZE (sizeof(struct e802_hdr))
+@@ -216,7 +216,7 @@ struct vlan_ethernet_hdr {
+ ushort vet_vlan_type; /* PROT_VLAN */
+ ushort vet_tag; /* TAG of VLAN */
+ ushort vet_type; /* protocol type */
+-};
++} __attribute__((packed));
+
+ /* VLAN Ethernet header size */
+ #define VLAN_ETHER_HDR_SIZE (sizeof(struct vlan_ethernet_hdr))
+@@ -243,7 +243,7 @@ struct ip_hdr {
+ ushort ip_sum; /* checksum */
+ IPaddr_t ip_src; /* Source IP address */
+ IPaddr_t ip_dst; /* Destination IP address */
+-};
++} __attribute__((packed));
+
+ #define IP_OFFS 0x1fff /* ip offset *= 8 */
+ #define IP_FLAGS 0xe000 /* first 3 bits */
+@@ -271,7 +271,7 @@ struct ip_udp_hdr {
+ ushort udp_dst; /* UDP destination port */
+ ushort udp_len; /* Length of UDP packet */
+ ushort udp_xsum; /* Checksum */
+-};
++} __attribute__((packed));
+
+ #define IP_UDP_HDR_SIZE (sizeof(struct ip_udp_hdr))
+ #define UDP_HDR_SIZE (IP_UDP_HDR_SIZE - IP_HDR_SIZE)
+@@ -310,7 +310,7 @@ struct arp_hdr {
+ uchar ar_tha[]; /* Target hardware address */
+ uchar ar_tpa[]; /* Target protocol address */
+ #endif /* 0 */
+-};
++} __attribute__((packed));
+
+ #define ARP_HDR_SIZE (8+20) /* Size assuming ethernet */
+
+@@ -345,7 +345,7 @@ struct icmp_hdr {
+ } frag;
+ uchar data[0];
+ } un;
+-};
++} __attribute__((packed));
+
+ #define ICMP_HDR_SIZE (sizeof(struct icmp_hdr))
+ #define IP_ICMP_HDR_SIZE (IP_HDR_SIZE + ICMP_HDR_SIZE)
+Index: uboot-2014.07/net/bootp.h
+===================================================================
+--- uboot-2014.07.orig/net/bootp.h
++++ uboot-2014.07/net/bootp.h
+@@ -49,7 +49,7 @@ struct Bootp_t {
+ char bp_sname[64]; /* Server host name */
+ char bp_file[128]; /* Boot file name */
+ char bp_vend[OPT_FIELD_SIZE]; /* Vendor information */
+-};
++} __attribute__((packed));
+
+ #define BOOTP_HDR_SIZE sizeof(struct Bootp_t)
+
+Index: uboot-2014.07/net/nfs.h
+===================================================================
+--- uboot-2014.07.orig/net/nfs.h
++++ uboot-2014.07/net/nfs.h
+@@ -68,7 +68,7 @@ struct rpc_t {
+ uint32_t data[19];
+ } reply;
+ } u;
+-};
++} __attribute__((packed));
+ extern void NfsStart(void); /* Begin NFS */
+
+
+Index: uboot-2014.07/net/sntp.h
+===================================================================
+--- uboot-2014.07.orig/net/sntp.h
++++ uboot-2014.07/net/sntp.h
+@@ -51,7 +51,7 @@ struct sntp_pkt_t {
+ unsigned long long originate_timestamp;
+ unsigned long long receive_timestamp;
+ unsigned long long transmit_timestamp;
+-};
++} __attribute__((packed));
+
+ extern void SntpStart(void); /* Begin SNTP */
+
hooks/post-receive
--
armadeus
|