From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 34b59fe263523d7c8a5a5300c8bef36f68de927d
Date: Sun, 14 Apr 2013 20:39:37 +0200 [thread overview]
Message-ID: <20130414183938.1417320141@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 8945 bytes --]
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 "IPFire 3.x development tree".
The branch, master has been updated
via 34b59fe263523d7c8a5a5300c8bef36f68de927d (commit)
via 90e71f0c361ede017b66412d5615dc4c8ecb26da (commit)
via 9d4be168c9d2ff834108fff25f3edcbae3308bad (commit)
from 1efc7351a29d2727123266a62f0de63330fb0956 (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 34b59fe263523d7c8a5a5300c8bef36f68de927d
Merge: 90e71f0 1efc735
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 14 18:39:29 2013 +0000
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 90e71f0c361ede017b66412d5615dc4c8ecb26da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 14 18:38:56 2013 +0000
u-boot: Update to 2013.04-rc2.
commit 9d4be168c9d2ff834108fff25f3edcbae3308bad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 14 18:37:44 2013 +0000
kernel: Ship DTB files on ARM.
Remove patch for SMSC95xx to read the MAC address from
the device tree.
-----------------------------------------------------------------------
Summary of changes:
kernel/kernel.nm | 18 ++++-
...port-reading-mac-address-from-device-tree.patch | 92 ----------------------
u-boot/patches/u-boot-fat.patch | 12 +++
u-boot/patches/uboot-omap-fit.patch | 9 +++
u-boot/u-boot.nm | 10 ++-
5 files changed, 46 insertions(+), 95 deletions(-)
delete mode 100644 kernel/patches/arm-smsc-support-reading-mac-address-from-device-tree.patch
create mode 100644 u-boot/patches/u-boot-fat.patch
create mode 100644 u-boot/patches/uboot-omap-fit.patch
Difference in files:
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index ab2e1df..5a1099b 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name = kernel
version = 3.8.6
-release = 1
+release = 2
thisapp = linux-%{version}
maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
@@ -219,6 +219,21 @@ build
make ARCH=%{kernel_arch} CC="gcc -fno-PIE" %{kernel_target} modules \
%{kernel_build_flags} %{PARALLELISMFLAGS}
+ # Compile Flattened Device Tree database
+ case "${DISTRO_ARCH}" in
+ arm*)
+ make ARCH=%{kernel_arch} dtbs
+
+ mkdir -pv %{BUILDROOT}/boot/dtb-${fullversion}
+ for file in arch/arm/boot/dts/*.dtb; do
+ [ -e "${file}" ] || continue
+
+ install -m 644 ${file} %{BUILDROOT}/boot/dtb-${fullversion} || exit 1
+ rm -f ${file}
+ done
+ ;;
+ esac
+
# Install the results.
mkdir -pv %{BUILDROOT}/boot %{BUILDROOT}/usr/lib/modules/${fullversion}
install -m 755 %{kernel_image} %{BUILDROOT}/boot/vmlinuz-${fullversion}
@@ -387,6 +402,7 @@ packages
files
/boot/System.map-%{kernel_release}
+ /boot/dtb-%{kernel_release}
/boot/vmlinuz-%{kernel_release}
/boot/initramfs-%{kernel_release}.img
/etc/ld.so.conf.d/kernel-%{kernel_release}.conf
diff --git a/kernel/patches/arm-smsc-support-reading-mac-address-from-device-tree.patch b/kernel/patches/arm-smsc-support-reading-mac-address-from-device-tree.patch
deleted file mode 100644
index a36c683..0000000
--- a/kernel/patches/arm-smsc-support-reading-mac-address-from-device-tree.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 0b608345e114681f66ca0a3cf9d9434728da62ce Mon Sep 17 00:00:00 2001
-From: Ken Cox <ken(a)coxcampers.net>
-Date: Thu, 23 Jun 2011 10:36:43 -0500
-Subject: [PATCH] Support reading mac address from device tree.
-
-If CONFIG_OF is enabled, we will try to read the mac address from the device tree. This enables us the ability to have a "static" mac address on arm boards such as the pandaboard and beagleboard which generate random mac addresses.
----
- drivers/net/usb/smsc75xx.c | 17 +++++++++++++++++
- drivers/net/usb/smsc95xx.c | 18 +++++++++++++++++-
- 2 files changed, 34 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
-index 753ee6e..ac0a200 100644
---- a/drivers/net/usb/smsc75xx.c
-+++ b/drivers/net/usb/smsc75xx.c
-@@ -29,6 +29,7 @@
- #include <linux/crc32.h>
- #include <linux/usb/usbnet.h>
- #include <linux/slab.h>
-+#include <linux/of_device.h>
- #include "smsc75xx.h"
-
- #define SMSC_CHIPNAME "smsc75xx"
-@@ -658,6 +659,22 @@ static int smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
-
- static void smsc75xx_init_mac_address(struct usbnet *dev)
- {
-+ void *address;
-+#ifdef CONFIG_OF
-+ struct device_node *np;
-+
-+ /* try the device tree */
-+ np = of_find_node_by_name(NULL, "smsc75xx");
-+ if (np) {
-+ address = of_get_property(np, "local-mac-address", NULL);
-+ if (address) {
-+ memcpy(dev->net->dev_addr, address, ETH_ALEN);
-+ netif_dbg(dev, ifup, dev->net, "MAC address read from device tree\n");
-+ return;
-+ }
-+ }
-+#endif
-+
- /* try reading mac address from EEPROM */
- if (smsc75xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
- dev->net->dev_addr) == 0) {
-diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index bc86f4b..c83942d 100644
---- a/drivers/net/usb/smsc95xx.c
-+++ b/drivers/net/usb/smsc95xx.c
-@@ -29,6 +29,7 @@
- #include <linux/crc32.h>
- #include <linux/usb/usbnet.h>
- #include <linux/slab.h>
-+#include <linux/of_device.h>
- #include "smsc95xx.h"
-
- #define SMSC_CHIPNAME "smsc95xx"
-@@ -639,6 +640,22 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
-
- static void smsc95xx_init_mac_address(struct usbnet *dev)
- {
-+ void *address;
-+#ifdef CONFIG_OF
-+ struct device_node *np;
-+
-+ /* try the device tree */
-+ np = of_find_node_by_name(NULL, "smsc95xx");
-+ if (np) {
-+ address = of_get_property(np, "local-mac-address", NULL);
-+ if (address) {
-+ memcpy(dev->net->dev_addr, address, ETH_ALEN);
-+ netif_dbg(dev, ifup, dev->net, "MAC address read from device tree\n");
-+ return;
-+ }
-+ }
-+#endif
-+
- /* try reading mac address from EEPROM */
- if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
- dev->net->dev_addr) == 0) {
-@@ -648,7 +665,6 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
- return;
- }
- }
--
- /* no eeprom, or eeprom values are invalid. generate random MAC */
- random_ether_addr(dev->net->dev_addr);
- netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n");
---
-1.7.2.3
-
diff --git a/u-boot/patches/u-boot-fat.patch b/u-boot/patches/u-boot-fat.patch
new file mode 100644
index 0000000..1aa90bd
--- /dev/null
+++ b/u-boot/patches/u-boot-fat.patch
@@ -0,0 +1,12 @@
+diff -uNr u-boot-2012.04.01.orig/fs/fat/fat.c u-boot-2012.04.01/fs/fat/fat.c
+--- u-boot-2012.04.01.orig/fs/fat/fat.c 2012-04-25 08:22:50.000000000 -0500
++++ u-boot-2012.04.01/fs/fat/fat.c 2012-06-19 14:06:16.605337811 -0500
+@@ -90,7 +90,7 @@
+ /* Check for FAT12/FAT16/FAT32 filesystem */
+ if (!memcmp(buffer + DOS_FS_TYPE_OFFSET, "FAT", 3))
+ return 0;
+- if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT32", 5))
++ if (!memcmp(buffer + DOS_FS32_TYPE_OFFSET, "FAT", 3))
+ return 0;
+
+ cur_dev = NULL;
diff --git a/u-boot/patches/uboot-omap-fit.patch b/u-boot/patches/uboot-omap-fit.patch
new file mode 100644
index 0000000..cdcc79b
--- /dev/null
+++ b/u-boot/patches/uboot-omap-fit.patch
@@ -0,0 +1,9 @@
+--- u-boot-2012.07/include/configs/omap4_common.h.orig 2013-01-24 00:20:40.334731642 -0600
++++ u-boot-2012.07/include/configs/omap4_common.h 2013-01-24 00:21:08.708953803 -0600
+@@ -280,4 +280,6 @@
+
+ #define CONFIG_SYS_THUMB_BUILD
+
++#define CONFIG_FIT
++
+ #endif /* __CONFIG_OMAP4_COMMON_H */
diff --git a/u-boot/u-boot.nm b/u-boot/u-boot.nm
index fc04ab9..4099778 100644
--- a/u-boot/u-boot.nm
+++ b/u-boot/u-boot.nm
@@ -4,8 +4,10 @@
###############################################################################
name = u-boot
-version = 2012.10
-release = 1
+version = 2013.04
+rc = 2
+release = 0.1.rc%{rc}
+thisapp = %{name}-%{version}-rc%{rc}
sup_arches = armv5tel armv7hl
groups = Development/Tools
@@ -22,6 +24,10 @@ source_dl = ftp://ftp.denx.de/pub/u-boot/
sources = %{thisapp}.tar.bz2
build
+ requires
+ dtc
+ end
+
build
while read arch platform targets; do
# Skip all other architectures.
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2013-04-14 18:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130414183938.1417320141@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox