From 690ee0ee2bb8ec6144ed77d019d7e86184b16bde Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 15 Jun 2015 15:46:40 +0200
Subject: [PATCH 01/28] crypto: digest: provide static inline no-ops if digest
 is disabled

Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 include/digest.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/digest.h b/include/digest.h
index 7c6711b32..3a9d30596 100644
--- a/include/digest.h
+++ b/include/digest.h
@@ -59,6 +59,7 @@ struct digest {
 /*
  * digest functions
  */
+#ifdef CONFIG_DIGEST
 int digest_algo_register(struct digest_algo *d);
 void digest_algo_unregister(struct digest_algo *d);
 void digest_algo_prints(const char *prefix);
@@ -76,6 +77,16 @@ int digest_file(struct digest *d, const char *filename,
 int digest_file_by_name(const char *algo, const char *filename,
 			unsigned char *hash,
 			const unsigned char *sig);
+#else
+static inline struct digest *digest_alloc(const char *name)
+{
+	return NULL;
+}
+
+static inline void digest_free(struct digest *d)
+{
+}
+#endif
 
 static inline int digest_init(struct digest *d)
 {

From b7b0b348a5c9a52c9eb9cfb6f2af3f49aa55fdcb Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed, 17 Jun 2015 08:03:58 +0200
Subject: [PATCH 02/28] mtd: m25p80: Whitespace cleanup

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mtd/devices/m25p80.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index c941767de..231d13978 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -148,14 +148,14 @@ static int m25p80_erase(struct spi_nor *nor, loff_t offset)
 {
 	struct m25p *flash = nor->priv;
 
-        dev_dbg(nor->dev, "%dKiB at 0x%08x\n",
-                flash->mtd.erasesize / 1024, (u32)offset);
+	dev_dbg(nor->dev, "%dKiB at 0x%08x\n",
+			flash->mtd.erasesize / 1024, (u32)offset);
 
-        /* Set up command buffer. */
-        flash->command[0] = nor->erase_opcode;
-        m25p_addr2cmd(nor, offset, flash->command);
+	/* Set up command buffer. */
+	flash->command[0] = nor->erase_opcode;
+	m25p_addr2cmd(nor, offset, flash->command);
 
-        spi_write(flash->spi, flash->command, m25p_cmdsz(nor));
+	spi_write(flash->spi, flash->command, m25p_cmdsz(nor));
 
 	return 0;
 }
@@ -213,11 +213,11 @@ static const struct platform_device_id m25p_ids[] = {
 	{"w25q128"},    {"w25q256"},    {"cat25c11"},
 	{"cat25c03"},   {"cat25c09"},   {"cat25c17"},   {"cat25128"},
 
-        /*
-         * Generic support for SPI NOR that can be identified by the JEDEC READ
-         * ID opcode (0x9F). Use this, if possible.
-         */
-        {"nor-jedec"},
+	/*
+	 * Generic support for SPI NOR that can be identified by the JEDEC READ
+	 * ID opcode (0x9F). Use this, if possible.
+	 */
+	{"nor-jedec"},
 	{ },
 };
 

From f889ebacb25a1bddeb5dde44d59feca84f2757e9 Mon Sep 17 00:00:00 2001
From: Herve Codina <Herve.CODINA@celad.com>
Date: Tue, 16 Jun 2015 16:02:58 +0200
Subject: [PATCH 03/28] mach-clps711: call shutdown_barebox instead of
 arch_shutdown in reset_cpu

Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Tested-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-clps711x/reset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-clps711x/reset.c b/arch/arm/mach-clps711x/reset.c
index 67c9c8b8c..859d8ae57 100644
--- a/arch/arm/mach-clps711x/reset.c
+++ b/arch/arm/mach-clps711x/reset.c
@@ -11,7 +11,7 @@
 
 void __noreturn reset_cpu(unsigned long addr)
 {
-	arch_shutdown();
+	shutdown_barebox();
 
 	asm("mov pc, #0");
 

From 3b6a1db325bbb3bc89f38efe9527c41367e6e1f1 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 18 Jun 2015 08:46:36 +0200
Subject: [PATCH 04/28] device parameters: sort alphabetically

With many parameters on the global device it becomes increasingly
annoying to find a parameter in the list. Sort it alphabetically
to make this easier.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 lib/parameter.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/parameter.c b/lib/parameter.c
index 865ad9f43..4c261b1e3 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -122,6 +122,14 @@ static const char *param_get_generic(struct device_d *dev, struct param_d *p)
 	return p->value ? p->value : "";
 }
 
+static int compare(struct list_head *a, struct list_head *b)
+{
+	char *na = (char*)list_entry(a, struct param_d, list)->name;
+	char *nb = (char*)list_entry(b, struct param_d, list)->name;
+
+	return strcmp(na, nb);
+}
+
 static int __dev_add_param(struct param_d *param, struct device_d *dev, const char *name,
 		int (*set)(struct device_d *dev, struct param_d *p, const char *val),
 		const char *(*get)(struct device_d *dev, struct param_d *p),
@@ -145,7 +153,7 @@ static int __dev_add_param(struct param_d *param, struct device_d *dev, const ch
 
 	param->flags = flags;
 	param->dev = dev;
-	list_add_tail(&param->list, &dev->parameters);
+	list_add_sort(&param->list, &dev->parameters, compare);
 
 	return 0;
 }

From 1dd5262eb950210a77a01d79327d2fbadae65f86 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 26 Jun 2015 11:55:05 +0200
Subject: [PATCH 05/28] net: Make set_ethaddr argument const

The set_ethaddr callback should not modify the MAC address passed to it, so
make it const.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/net/altera_tse.c   | 2 +-
 drivers/net/ar231x.c       | 2 +-
 drivers/net/arc_emac.c     | 2 +-
 drivers/net/at91_ether.c   | 2 +-
 drivers/net/cpsw.c         | 2 +-
 drivers/net/cs8900.c       | 2 +-
 drivers/net/davinci_emac.c | 2 +-
 drivers/net/designware.c   | 2 +-
 drivers/net/dm9k.c         | 2 +-
 drivers/net/ep93xx.c       | 2 +-
 drivers/net/ethoc.c        | 2 +-
 drivers/net/fec_imx.c      | 2 +-
 drivers/net/fec_mpc5200.c  | 2 +-
 drivers/net/gianfar.c      | 2 +-
 drivers/net/ks8851_mll.c   | 2 +-
 drivers/net/macb.c         | 2 +-
 drivers/net/mvneta.c       | 2 +-
 drivers/net/netx_eth.c     | 2 +-
 drivers/net/orion-gbe.c    | 2 +-
 drivers/net/rtl8139.c      | 2 +-
 drivers/net/rtl8169.c      | 2 +-
 drivers/net/smc91111.c     | 2 +-
 drivers/net/smc911x.c      | 2 +-
 drivers/net/tap.c          | 2 +-
 drivers/net/usb/asix.c     | 2 +-
 drivers/net/usb/smsc95xx.c | 2 +-
 drivers/net/xgmac.c        | 2 +-
 include/net.h              | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 385a7150b..a1863655f 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -231,7 +231,7 @@ static int tse_get_ethaddr(struct eth_device *edev, unsigned char *m)
 	return 0;
 }
 
-static int tse_set_ethaddr(struct eth_device *edev, unsigned char *m)
+static int tse_set_ethaddr(struct eth_device *edev, const unsigned char *m)
 {
 	struct altera_tse_priv *priv = edev->priv;
 	struct alt_tse_mac *mac_dev = priv->tse_regs;
diff --git a/drivers/net/ar231x.c b/drivers/net/ar231x.c
index 48e4b30fd..7447c4484 100644
--- a/drivers/net/ar231x.c
+++ b/drivers/net/ar231x.c
@@ -70,7 +70,7 @@ static void ar231x_reset_bit_(struct ar231x_eth_priv *priv,
 		(*priv->reset_bit)(val, state);
 }
 
-static int ar231x_set_ethaddr(struct eth_device *edev, unsigned char *addr);
+static int ar231x_set_ethaddr(struct eth_device *edev, const unsigned char *addr);
 static void ar231x_reset_regs(struct eth_device *edev)
 {
 	struct ar231x_eth_priv *priv = edev->priv;
diff --git a/drivers/net/arc_emac.c b/drivers/net/arc_emac.c
index 84e2c75c5..3dc54cd22 100644
--- a/drivers/net/arc_emac.c
+++ b/drivers/net/arc_emac.c
@@ -332,7 +332,7 @@ static int arc_emac_get_ethaddr(struct eth_device *edev, unsigned char *mac)
 	return -1;
 }
 
-static int arc_emac_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int arc_emac_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct arc_emac_priv *priv = edev->priv;
 	unsigned int addr_low, addr_hi;
diff --git a/drivers/net/at91_ether.c b/drivers/net/at91_ether.c
index 5a74837f6..523e35590 100644
--- a/drivers/net/at91_ether.c
+++ b/drivers/net/at91_ether.c
@@ -261,7 +261,7 @@ static int at91_ether_get_ethaddr(struct eth_device *eth, unsigned char *adr)
 	return -1;
 }
 
-static int at91_ether_set_ethaddr(struct eth_device *eth, unsigned char *adr)
+static int at91_ether_set_ethaddr(struct eth_device *eth, const unsigned char *adr)
 {
 	int i;
 
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index c0db96bb5..4d6b7b2e7 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -547,7 +547,7 @@ static int cpsw_get_hwaddr(struct eth_device *edev, unsigned char *mac)
 	return -1;
 }
 
-static int cpsw_set_hwaddr(struct eth_device *edev, unsigned char *mac)
+static int cpsw_set_hwaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct cpsw_slave *slave = edev->priv;
 	struct cpsw_priv *priv = slave->cpsw;
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index dccb808f9..a4a5dcaf7 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -341,7 +341,7 @@ static int cs8900_get_ethaddr(struct eth_device *dev, unsigned char *mac)
 	return 0;
 }
 
-static int cs8900_set_ethaddr(struct eth_device *dev, unsigned char *mac)
+static int cs8900_set_ethaddr(struct eth_device *dev, const unsigned char *mac)
 {
 	struct cs8900_priv *priv = (struct cs8900_priv *)dev->priv;
 	int i;
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 056ffe28b..9f8f0e1fa 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -178,7 +178,7 @@ static int davinci_emac_get_ethaddr(struct eth_device *edev, unsigned char *adr)
  * This function must be called before emac_open() if you want to override
  * the default mac address.
  */
-static int davinci_emac_set_ethaddr(struct eth_device *edev, unsigned char *addr)
+static int davinci_emac_set_ethaddr(struct eth_device *edev, const unsigned char *addr)
 {
 	struct davinci_emac_priv *priv = edev->priv;
 	int i;
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 213fe4135..800652760 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -384,7 +384,7 @@ static int dwc_ether_get_ethaddr(struct eth_device *dev, u8 adr[6])
 	return -1;
 }
 
-static int dwc_ether_set_ethaddr(struct eth_device *dev, u8 adr[6])
+static int dwc_ether_set_ethaddr(struct eth_device *dev, const unsigned char *adr)
 {
 	struct dw_eth_dev *priv = dev->priv;
 	struct eth_mac_regs *mac_p = priv->mac_regs_p;
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c
index c3c2a8052..1f1938d97 100644
--- a/drivers/net/dm9k.c
+++ b/drivers/net/dm9k.c
@@ -711,7 +711,7 @@ static int dm9k_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return 0;
 }
 
-static int dm9k_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int dm9k_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct dm9k *priv = (struct dm9k *)edev->priv;
 	int i, oft;
diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c
index 4b73abff3..90c12fce7 100644
--- a/drivers/net/ep93xx.c
+++ b/drivers/net/ep93xx.c
@@ -466,7 +466,7 @@ static int ep93xx_eth_get_ethaddr(struct eth_device *edev,
 }
 
 static int ep93xx_eth_set_ethaddr(struct eth_device *edev,
-				unsigned char *mac_addr)
+				const unsigned char *mac_addr)
 {
 	struct mac_regs *regs = ep93xx_get_regs(edev);
 
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 7c52a09ea..6bae7d68a 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -435,7 +435,7 @@ static int ethoc_get_ethaddr(struct eth_device *edev, unsigned char *mac)
 	return 0;
 }
 
-static int ethoc_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int ethoc_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct ethoc *dev = edev->priv;
 
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 9a10c9f2e..78ccb8537 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -249,7 +249,7 @@ static int fec_get_hwaddr(struct eth_device *dev, unsigned char *mac)
 	return -1;
 }
 
-static int fec_set_hwaddr(struct eth_device *dev, unsigned char *mac)
+static int fec_set_hwaddr(struct eth_device *dev, const unsigned char *mac)
 {
 	struct fec_priv *fec = (struct fec_priv *)dev->priv;
 
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index f431d79d1..14ef87292 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -211,7 +211,7 @@ static int mpc5xxx_fec_get_ethaddr(struct eth_device *dev, unsigned char *mac)
 	return -1;
 }
 
-static int mpc5xxx_fec_set_ethaddr(struct eth_device *dev, unsigned char *mac)
+static int mpc5xxx_fec_set_ethaddr(struct eth_device *dev, const unsigned char *mac)
 {
 	mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv;
 	uint8_t currByte;			/* byte for which to compute the CRC */
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 5e47c64e0..ac698332c 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -233,7 +233,7 @@ static int gfar_get_ethaddr(struct eth_device *edev, unsigned char *mac)
 	return -ENODEV;
 }
 
-static int gfar_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int gfar_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct gfar_private *priv = edev->priv;
 	void __iomem *regs = priv->regs;
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index a8974cfcb..854a666bf 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -571,7 +571,7 @@ static int ks8851_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return 0;
 }
 
-static int ks8851_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int ks8851_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct ks_net *priv = (struct ks_net *)edev->priv;
 
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 2ac00f346..6d4973fa2 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -493,7 +493,7 @@ static int macb_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return -1;
 }
 
-static int macb_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int macb_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct macb_device *macb = edev->priv;
 
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 3be2ec531..aab52c45d 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -486,7 +486,7 @@ recv_err:
 	return ret;
 }
 
-static int mvneta_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int mvneta_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct mvneta_port *priv = edev->priv;
 	u32 mac_h = (mac[0] << 24) | (mac[1] << 16) | (mac[2] << 8) | mac[3];
diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c
index 96dbc7c5d..64e9886d6 100644
--- a/drivers/net/netx_eth.c
+++ b/drivers/net/netx_eth.c
@@ -210,7 +210,7 @@ static int netx_eth_get_ethaddr(struct eth_device *edev, unsigned char *adr)
         return -1;
 }
 
-static int netx_eth_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int netx_eth_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct netx_eth_priv *priv = (struct netx_eth_priv *)edev->priv;
 	int xcno = priv->xcno;
diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c
index 97ffff2b2..e6bd75768 100644
--- a/drivers/net/orion-gbe.c
+++ b/drivers/net/orion-gbe.c
@@ -322,7 +322,7 @@ recv_err:
 	return ret;
 }
 
-static int port_set_ethaddr(struct eth_device *edev, unsigned char *mac)
+static int port_set_ethaddr(struct eth_device *edev, const unsigned char *mac)
 {
 	struct port_priv *port = edev->priv;
 	u32 mac_h = (mac[0] << 24) | (mac[1] << 16) | (mac[2] << 8) | mac[3];
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index d57c706e5..a9eb86535 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -352,7 +352,7 @@ static int rtl8139_get_ethaddr(struct eth_device *edev, unsigned char *m)
 }
 
 static int rtl8139_set_ethaddr(struct eth_device *edev,
-					unsigned char *mac_addr)
+					const unsigned char *mac_addr)
 {
 	struct rtl8139_priv *priv = edev->priv;
 	int i;
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index d6a761087..47d5e4a89 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -456,7 +456,7 @@ static int rtl8169_get_ethaddr(struct eth_device *edev, unsigned char *m)
 	return 0;
 }
 
-static int rtl8169_set_ethaddr(struct eth_device *edev, unsigned char *mac_addr)
+static int rtl8169_set_ethaddr(struct eth_device *edev, const unsigned char *mac_addr)
 {
 	struct rtl8169_priv *priv = edev->priv;
 	int i;
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index c0cf42ad8..5ea1bc325 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -1378,7 +1378,7 @@ static int smc91c111_get_ethaddr(struct eth_device *edev, unsigned char *m)
 }
 
 static int smc91c111_set_ethaddr(struct eth_device *edev,
-					unsigned char *mac_addr)
+					const unsigned char *mac_addr)
 {
 	struct smc91c111_priv *priv = (struct smc91c111_priv *)edev->priv;
 	unsigned address;
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 9977ae3f3..dc46ef13d 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -182,7 +182,7 @@ static int smc911x_get_ethaddr(struct eth_device *edev, unsigned char *m)
 	return 0;
 }
 
-static int smc911x_set_ethaddr(struct eth_device *edev, unsigned char *m)
+static int smc911x_set_ethaddr(struct eth_device *edev, const unsigned char *m)
 {
 	unsigned long addrh, addrl;
 
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 2458fb52c..ca53f12d9 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -65,7 +65,7 @@ static int tap_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return -1;
 }
 
-static int tap_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int tap_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	return 0;
 }
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 7cce5b929..4c53a142f 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -403,7 +403,7 @@ static int asix_get_ethaddr(struct eth_device *edev, unsigned char *adr)
 	return 0;
 }
 
-static int asix_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int asix_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	/* not possible? */
 	return 0;
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 053da1822..6360e480f 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -363,7 +363,7 @@ static int smsc95xx_set_csums(struct usbnet *dev)
 	return 0;
 }
 
-static int smsc95xx_set_ethaddr(struct eth_device *edev, unsigned char *adr)
+static int smsc95xx_set_ethaddr(struct eth_device *edev, const unsigned char *adr)
 {
 	struct usbnet *udev = container_of(edev, struct usbnet, edev);
 
diff --git a/drivers/net/xgmac.c b/drivers/net/xgmac.c
index 3b2273fd7..7cc4d4888 100644
--- a/drivers/net/xgmac.c
+++ b/drivers/net/xgmac.c
@@ -674,7 +674,7 @@ static int xgmac_get_ethaddr(struct eth_device *edev, unsigned char *addr)
 	return 0;
 }
 
-static int xgmac_set_ethaddr(struct eth_device *dev, unsigned char *addr)
+static int xgmac_set_ethaddr(struct eth_device *dev, const unsigned char *addr)
 {
 	struct xgmac_priv *priv = dev->priv;
 	u32 data;
diff --git a/include/net.h b/include/net.h
index 364011b20..29559372a 100644
--- a/include/net.h
+++ b/include/net.h
@@ -42,7 +42,7 @@ struct eth_device {
 	int  (*recv) (struct eth_device*);
 	void (*halt) (struct eth_device*);
 	int  (*get_ethaddr) (struct eth_device*, u8 adr[6]);
-	int  (*set_ethaddr) (struct eth_device*, u8 adr[6]);
+	int  (*set_ethaddr) (struct eth_device*, const unsigned char *adr);
 
 	struct eth_device *next;
 	void *priv;

From d00db5548a4dd8decad44fe3718bd8dff3bacb80 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 15 Jun 2015 08:52:15 +0200
Subject: [PATCH 06/28] net: eth: Do not rely on CONFIG_PARAMETER to be enabled

register_preset_mac_address only works when CONFIG_PARAMETER
is enabled because otherwise dev_set_param is a no-op. Add a
function to set the MAC address explicitly without the need
of CONFIG_PARAMETER and use it where appropriate.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 include/net.h |  2 ++
 net/eth.c     | 27 +++++++++++++++++++--------
 net/net.c     |  2 +-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/include/net.h b/include/net.h
index 29559372a..b93e264f5 100644
--- a/include/net.h
+++ b/include/net.h
@@ -60,6 +60,7 @@ struct eth_device {
 	IPaddr_t serverip;
 	IPaddr_t netmask;
 	IPaddr_t gateway;
+	char ethaddr_param[6];
 	char ethaddr[6];
 };
 
@@ -67,6 +68,7 @@ struct eth_device {
 
 int eth_register(struct eth_device* dev);    /* Register network device		*/
 void eth_unregister(struct eth_device* dev); /* Unregister network device	*/
+int eth_set_ethaddr(struct eth_device *edev, const char *ethaddr);
 
 int eth_send(struct eth_device *edev, void *packet, int length);	   /* Send a packet		*/
 int eth_rx(void);			/* Check for received packets	*/
diff --git a/net/eth.c b/net/eth.c
index 0c1ff73e4..a090961bc 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -42,15 +42,27 @@ struct eth_ethaddr {
 
 static LIST_HEAD(ethaddr_list);
 
+int eth_set_ethaddr(struct eth_device *edev, const char *ethaddr)
+{
+	int ret;
+
+	ret = edev->set_ethaddr(edev, ethaddr);
+	if (ret)
+		return ret;
+
+	memcpy(edev->ethaddr, ethaddr, ETH_ALEN);
+
+	return 0;
+}
+
 static void register_preset_mac_address(struct eth_device *edev, const char *ethaddr)
 {
 	unsigned char ethaddr_str[sizeof("xx:xx:xx:xx:xx:xx")];
 
-	ethaddr_to_string(ethaddr, ethaddr_str);
-
 	if (is_valid_ether_addr(ethaddr)) {
+		ethaddr_to_string(ethaddr, ethaddr_str);
 		dev_info(&edev->dev, "got preset MAC address: %s\n", ethaddr_str);
-		dev_set_param(&edev->dev, "ethaddr", ethaddr_str);
+		eth_set_ethaddr(edev, ethaddr);
 	}
 }
 
@@ -261,13 +273,11 @@ int eth_rx(void)
 	return 0;
 }
 
-static int eth_set_ethaddr(struct param_d *param, void *priv)
+static int eth_param_set_ethaddr(struct param_d *param, void *priv)
 {
 	struct eth_device *edev = priv;
 
-	edev->set_ethaddr(edev, edev->ethaddr);
-
-	return 0;
+	return eth_set_ethaddr(edev, edev->ethaddr_param);
 }
 
 #ifdef CONFIG_OFTREE
@@ -350,7 +360,8 @@ int eth_register(struct eth_device *edev)
 	dev_add_param_ip(dev, "serverip", NULL, NULL, &edev->serverip, edev);
 	dev_add_param_ip(dev, "gateway", NULL, NULL, &edev->gateway, edev);
 	dev_add_param_ip(dev, "netmask", NULL, NULL, &edev->netmask, edev);
-	dev_add_param_mac(dev, "ethaddr", eth_set_ethaddr, NULL, edev->ethaddr, edev);
+	dev_add_param_mac(dev, "ethaddr", eth_param_set_ethaddr, NULL,
+			edev->ethaddr_param, edev);
 
 	if (edev->init)
 		edev->init(edev);
diff --git a/net/net.c b/net/net.c
index 07350ad8f..75292c736 100644
--- a/net/net.c
+++ b/net/net.c
@@ -348,7 +348,7 @@ static struct net_connection *net_new(IPaddr_t dest, rx_handler_f *handler,
 		random_ether_addr(edev->ethaddr);
 		ethaddr_to_string(edev->ethaddr, str);
 		printf("warning: No MAC address set. Using random address %s\n", str);
-		dev_set_param(&edev->dev, "ethaddr", str);
+		eth_set_ethaddr(edev, edev->ethaddr);
 	}
 
 	/* If we don't have an ip only broadcast is allowed */

From c5dc0bfc2c0d9b7c35670c367214586279f011d3 Mon Sep 17 00:00:00 2001
From: Juergen Borleis <jbe@pengutronix.de>
Date: Fri, 19 Jun 2015 14:23:49 +0200
Subject: [PATCH 07/28] arch/BCM47xx: remove bogus copy'n'paste comment

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/mips/mach-bcm47xx/reset.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/mips/mach-bcm47xx/reset.c b/arch/mips/mach-bcm47xx/reset.c
index f1dc68afb..00aee190f 100644
--- a/arch/mips/mach-bcm47xx/reset.c
+++ b/arch/mips/mach-bcm47xx/reset.c
@@ -15,11 +15,6 @@
  *
  */
 
-/**
- * @file
- * @brief Resetting an malta board
- */
-
 #include <common.h>
 #include <io.h>
 #include <mach/hardware.h>

From dc2abefb94a959ced75eba8cec29d00137881db3 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 19 Jun 2015 06:27:22 +0200
Subject: [PATCH 08/28] serial: ns16550: Fix reading clock-frequency property

The clock-frequency property is never read because the driver
bails out earlier when it is unable to clk_get the clk. Move
the clock-frequency read out to the dt setup code which is
executed before the driver bails out due to the missing clk.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/serial/serial_ns16550.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 4d636c14c..c186ad4d3 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -291,6 +291,7 @@ static void ns16550_probe_dt(struct device_d *dev, struct ns16550_priv *priv)
 	if (!IS_ENABLED(CONFIG_OFDEVICE))
 		return;
 
+	of_property_read_u32(np, "clock-frequency", &priv->plat.clock);
 	of_property_read_u32(np, "reg-shift", &priv->plat.shift);
 }
 
@@ -417,7 +418,7 @@ static int ns16550_probe(struct device_d *dev)
 	else
 		ns16550_probe_dt(dev, priv);
 
-	if (!plat || !plat->clock) {
+	if (!priv->plat.clock) {
 		priv->clk = clk_get(dev, NULL);
 		if (IS_ERR(priv->clk)) {
 			ret = PTR_ERR(priv->clk);
@@ -427,12 +428,6 @@ static int ns16550_probe(struct device_d *dev)
 		priv->plat.clock = clk_get_rate(priv->clk);
 	}
 
-	if (priv->plat.clock == 0 && IS_ENABLED(CONFIG_OFDEVICE)) {
-		struct device_node *np = dev->device_node;
-
-		of_property_read_u32(np, "clock-frequency", &priv->plat.clock);
-	}
-
 	if (priv->plat.clock == 0) {
 		dev_err(dev, "no valid clockrate\n");
 		ret = -EINVAL;

From 8163be9a12df14000c0180c82c5d2206f46afddc Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 19 Jun 2015 06:09:50 +0200
Subject: [PATCH 09/28] net: smc911x: Add device tree support

There should probably be more compatible entries, but this is what
the kernel driver matches for.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/net/smc911x.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index dc46ef13d..60cf36ea4 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -630,8 +630,14 @@ static int smc911x_probe(struct device_d *dev)
         return 0;
 }
 
+static const struct of_device_id smsc911x_dt_ids[] = {
+	{ .compatible = "smsc,lan9115", },
+	{ /* sentinel */ }
+};
+
 static struct driver_d smc911x_driver = {
         .name  = "smc911x",
         .probe = smc911x_probe,
+	.of_compatible = DRV_OF_COMPAT(smsc911x_dt_ids),
 };
 device_platform_driver(smc911x_driver);

From 24867bac8acee7f7c8bfd0c23a5951907fb0c242 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 25 Jun 2015 09:26:15 +0200
Subject: [PATCH 10/28] image_renderer: Use read_file_2

This returns a proper error code and allows us to print a proper
error message which might not always be -ENOMEM.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 lib/gui/image_renderer.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/gui/image_renderer.c b/lib/gui/image_renderer.c
index dd29389ba..9bef99a7b 100644
--- a/lib/gui/image_renderer.c
+++ b/lib/gui/image_renderer.c
@@ -37,10 +37,10 @@ struct image *image_renderer_open(const char* file)
 	struct image *img;
 	int ret;
 
-	data = read_file(file, &size);
-	if (!data) {
-		printf("unable to read %s\n", file);
-		return ERR_PTR(-ENOMEM);
+	ret = read_file_2(file, &size, &data, FILESIZE_MAX);
+	if (ret) {
+		printf("unable to read %s: %s\n", file, strerror(-ret));
+		return ERR_PTR(ret);
 	}
 
 	ir = get_renderer(data, size);

From 438dcfdb76de66683b5eda23dee69cdf4465caf9 Mon Sep 17 00:00:00 2001
From: Wadim Egorov <w.egorov@phytec.de>
Date: Thu, 25 Jun 2015 10:18:28 +0200
Subject: [PATCH 11/28] images: Add file size check for PBLX files

Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/Kconfig  | 10 ++++++++++
 images/Makefile |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/common/Kconfig b/common/Kconfig
index 3dfb5ac19..cebe08683 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -201,6 +201,16 @@ config BAREBOX_MAX_BARE_INIT_SIZE
 	  this will allow your bare_init to fit in SRAM as example
 	  ARCH can overwrite it via ARCH_BAREBOX_MAX_BARE_INIT_SIZE
 
+config BAREBOX_MAX_PBLX_SIZE
+	depends on PBL_MULTI_IMAGES
+	depends on IMAGE_COMPRESSION
+	prompt "Maximum PBLX size"
+	hex
+	default 0xffffffff
+	help
+	  Define the maximum size of the PBLX image.
+	  The pblx is a self extracting barebox binary.
+
 config HAVE_CONFIGURABLE_MEMORY_LAYOUT
 	bool
 
diff --git a/images/Makefile b/images/Makefile
index 587cb2651..6ee1dccac 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -75,6 +75,8 @@ quiet_cmd_pblx ?= PBLX    $@
 
 $(obj)/%.pblx: $(obj)/%.pblb $(obj)/barebox.z FORCE
 	$(call if_changed,pblx,$(@F))
+	$(call cmd,check_file_size,$@,$(CONFIG_BAREBOX_MAX_PBLX_SIZE))
+
 
 $(obj)/%.s: $(obj)/% FORCE
 	$(call if_changed,disasm)

From 6f47c9456e0e2d5759cf0c317ceaf6d2bdb88afe Mon Sep 17 00:00:00 2001
From: Wadim Egorov <w.egorov@phytec.de>
Date: Thu, 25 Jun 2015 10:18:29 +0200
Subject: [PATCH 12/28] ARM: OMAP: Add max file size for PBLX images

On AM335x SOCs the maximum size of a downloaded MLO/PBLX image is 109 KB.

Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/configs/am335x_mlo_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/am335x_mlo_defconfig b/arch/arm/configs/am335x_mlo_defconfig
index 1dd7567d0..b66a65368 100644
--- a/arch/arm/configs/am335x_mlo_defconfig
+++ b/arch/arm/configs/am335x_mlo_defconfig
@@ -9,6 +9,7 @@ CONFIG_THUMB2_BAREBOX=y
 # CONFIG_MEMINFO is not set
 CONFIG_MMU=y
 CONFIG_TEXT_BASE=0x0
+CONFIG_BAREBOX_MAX_PBLX_SIZE=0x1b400
 CONFIG_MALLOC_SIZE=0x0
 CONFIG_MALLOC_TLSF=y
 CONFIG_RELOCATABLE=y

From a04b87aad02b414d0134d548b85772857567a3a2 Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@pengutronix.de>
Date: Thu, 25 Jun 2015 20:29:10 +0200
Subject: [PATCH 13/28] usb: gadget: pxa27x: depend on right symbol

Now that we also have PXA3XX support the dependency on
ARCH_PXA is too broad for this driver.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/usb/gadget/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 5d9158ffa..13a3e7062 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -25,7 +25,7 @@ config USB_GADGET_DRIVER_AT91
 config USB_GADGET_DRIVER_PXA27X
 	bool
 	prompt "PXA27x gadget driver"
-	depends on ARCH_PXA
+	depends on ARCH_PXA27X
 	default y
 	select USB_GADGET_DUALSPEED
 

From 5f751d139796713e9be86cde7f268806008d7936 Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@pengutronix.de>
Date: Thu, 25 Jun 2015 20:29:11 +0200
Subject: [PATCH 14/28] MCI: pxa: depend on right symbol

Now that we also have PXA3XX support the dependency on
ARCH_PXA is too broad for this driver.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mci/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig
index 31f7d2d4e..ebd8da959 100644
--- a/drivers/mci/Kconfig
+++ b/drivers/mci/Kconfig
@@ -95,7 +95,7 @@ config MCI_OMAP_HSMMC
 
 config MCI_PXA
 	bool "PXA"
-	depends on ARCH_PXA
+	depends on ARCH_PXA2XX
 	help
 	  Enable this entry to add support to read and write SD cards on a
 	  XScale PXA25x / PXA27x based system.

From 8012bc199bce56a881aac8b9d21387d78506fe6e Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@pengutronix.de>
Date: Thu, 25 Jun 2015 20:29:12 +0200
Subject: [PATCH 15/28] ARM: socfpga: add default ARCH_TEXT_BASE

As SoCFPGA is multi-image enabled there is no real reason
to bother the user with asking for the text base. Fixes a
bunch of randcfg failures.

Regenerate defconfig to drop the explicit config there, which
unfortunately introduces quite a bit of churn.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/configs/socfpga_defconfig | 70 +++++++++++++++---------------
 arch/arm/mach-socfpga/Kconfig      |  4 ++
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index ca54a1a49..ec369ae42 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -1,70 +1,68 @@
 CONFIG_ARCH_SOCFPGA=y
-CONFIG_ARCH_SOCFPGA_FPGA=y
 CONFIG_MACH_SOCFPGA_EBV_SOCRATES=y
 CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_THUMB2_BAREBOX=y
-CONFIG_CMD_ARM_MMUINFO=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_UNWIND=y
 CONFIG_MMU=y
-CONFIG_TEXT_BASE=0x0
 CONFIG_MALLOC_SIZE=0x0
 CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
 CONFIG_RELOCATABLE=y
-CONFIG_LONGHELP=y
 CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_MENU=y
 # CONFIG_TIMESTAMP is not set
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_MSLEEP=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_LET=y
-CONFIG_CMD_MENU=y
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_LN=y
-CONFIG_CMD_FILETYPE=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_MEMINFO=y
+CONFIG_LONGHELP=y
 CONFIG_CMD_IOMEM=y
-CONFIG_CMD_MM=y
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_MD5SUM=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_ARM_MMUINFO=y
 CONFIG_CMD_BOOTM_SHOW_TYPE=y
 CONFIG_CMD_BOOTM_VERBOSE=y
 CONFIG_CMD_BOOTM_INITRD=y
 CONFIG_CMD_BOOTM_OFTREE=y
-CONFIG_CMD_RESET=y
 CONFIG_CMD_GO=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_OF_PROPERTY=y
-CONFIG_CMD_OF_NODE=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_BAREBOX_UPDATE=y
-CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_RESET=y
 CONFIG_CMD_PARTITION=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_PRINTENV=y
 CONFIG_CMD_MAGICVAR=y
 CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_GPIO=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_FILETYPE=y
+CONFIG_CMD_LN=y
+CONFIG_CMD_MD5SUM=y
 CONFIG_CMD_UNCOMPRESS=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_LED=y
-CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_LET=y
+CONFIG_CMD_MSLEEP=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_DHCP=y
 CONFIG_CMD_MIITOOL=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_MENU=y
+CONFIG_CMD_MENU_MANAGEMENT=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_CRC=y
+CONFIG_CMD_CRC_CMP=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MM=y
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DETECT=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_LED=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_BAREBOX_UPDATE=y
+CONFIG_CMD_OF_NODE=y
+CONFIG_CMD_OF_PROPERTY=y
+CONFIG_CMD_OFTREE=y
+CONFIG_CMD_TIME=y
 CONFIG_NET=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_PING=y
 CONFIG_NET_NETCONSOLE=y
 CONFIG_NET_RESOLV=y
 CONFIG_OFDEVICE=y
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 90b3533b1..73b26efd2 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -1,5 +1,9 @@
 if ARCH_SOCFPGA
 
+config ARCH_TEXT_BASE
+	hex
+	default 0x0
+
 config ARCH_SOCFPGA_XLOAD
 	bool
 	prompt "Build preloader image"

From dc3dfc7286b3b711d5c10e5ecfcb282d169e7663 Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@pengutronix.de>
Date: Thu, 25 Jun 2015 20:29:13 +0200
Subject: [PATCH 16/28] ARM: pxa: move lubbock TEXTBASE to Kconfig

So we can drop it from the defconfig and stop bothering
the user with this choice by default.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/configs/lubbock_defconfig | 1 -
 arch/arm/mach-pxa/Kconfig          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig
index bf04fa3b1..224854c7c 100644
--- a/arch/arm/configs/lubbock_defconfig
+++ b/arch/arm/configs/lubbock_defconfig
@@ -6,7 +6,6 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_BANNER is not set
 CONFIG_MMU=y
-CONFIG_TEXT_BASE=0xa3d00000
 CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0x80000
 CONFIG_MALLOC_SIZE=0x1000000
 CONFIG_EXPERIMENTAL=y
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 610fb1c80..2b7f63175 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -4,6 +4,7 @@ config ARCH_TEXT_BASE
 	hex
 	default 0xa0000000 if MACH_MIOA701
 	default 0xa3f00000 if MACH_PCM027
+	default 0xa3d00000 if MACH_LUBBOCK
 	default 0x83f00000 if MACH_ZYLONITE
 
 # ----------------------------------------------------------

From af5f49c2ae29dbd737ae3014dea79ba9b2bd2b17 Mon Sep 17 00:00:00 2001
From: Lucas Stach <dev@lynxeye.de>
Date: Wed, 24 Jun 2015 21:13:49 +0200
Subject: [PATCH 17/28] ARM: tegra: jump to maincluster earlier

There is no point in repeating the board setup on the main cluster.
It is done either in the AVP startup path or from a first stage loader.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-tegra/include/mach/lowlevel.h | 15 +++++++++------
 arch/arm/mach-tegra/tegra_avp_init.c        |  3 ---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-tegra/include/mach/lowlevel.h b/arch/arm/mach-tegra/include/mach/lowlevel.h
index 768b13d96..0c76b8883 100644
--- a/arch/arm/mach-tegra/include/mach/lowlevel.h
+++ b/arch/arm/mach-tegra/include/mach/lowlevel.h
@@ -243,11 +243,20 @@ void tegra_ll_delay_usec(int delay)
 	while ((int)readl(TEGRA_TMRUS_BASE + TIMER_CNTR_1US) - timeout < 0);
 }
 
+/* reset vector for the AVP, to be called from board reset vector */
+void tegra_avp_reset_vector(uint32_t boarddata);
+
+/* reset vector for the main CPU complex */
+void tegra_maincomplex_entry(void);
+
 static __always_inline
 void tegra_cpu_lowlevel_setup(void)
 {
 	uint32_t r;
 
+	if (tegra_cpu_is_maincomplex())
+		tegra_maincomplex_entry();
+
 	/* set the cpu to SVC32 mode */
 	__asm__ __volatile__("mrs %0, cpsr":"=r"(r));
 	r &= ~0x1f;
@@ -258,10 +267,4 @@ void tegra_cpu_lowlevel_setup(void)
 	tegra_ll_delay_setup();
 }
 
-/* reset vector for the AVP, to be called from board reset vector */
-void tegra_avp_reset_vector(uint32_t boarddata);
-
-/* reset vector for the main CPU complex */
-void tegra_maincomplex_entry(void);
-
 #endif /* __TEGRA_LOWLEVEL_H */
diff --git a/arch/arm/mach-tegra/tegra_avp_init.c b/arch/arm/mach-tegra/tegra_avp_init.c
index 91fd894dc..20fcf3f1d 100644
--- a/arch/arm/mach-tegra/tegra_avp_init.c
+++ b/arch/arm/mach-tegra/tegra_avp_init.c
@@ -265,9 +265,6 @@ void tegra_avp_reset_vector(uint32_t boarddata)
 	/* put boarddata in scratch reg, for main CPU to fetch after startup */
 	writel(boarddata, TEGRA_PMC_BASE + PMC_SCRATCH(10));
 
-	if (tegra_cpu_is_maincomplex())
-		tegra_maincomplex_entry();
-
 	/* we want to bring up the high performance CPU complex */
 	if (tegra_get_chiptype() >= TEGRA30)
 		tegra_cluster_switch_hp();

From 5f11e80670a7cf9acfca05b91b3ccf054b8457ae Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 29 Jun 2015 07:04:52 +0200
Subject: [PATCH 18/28] mtd: Make devname argument to add_mtd_device const

add_mtd_device duplicates the string where necessary, so make it
const.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mtd/core.c      | 2 +-
 drivers/mtd/mtd.h       | 2 +-
 drivers/mtd/mtdoob.c    | 2 +-
 drivers/mtd/mtdraw.c    | 2 +-
 include/linux/mtd/mtd.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index 681dc9313..8b8254c2d 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -542,7 +542,7 @@ static int of_mtd_fixup(struct device_node *root, void *ctx)
 	return 0;
 }
 
-int add_mtd_device(struct mtd_info *mtd, char *devname, int device_id)
+int add_mtd_device(struct mtd_info *mtd, const char *devname, int device_id)
 {
 	struct mtddev_hook *hook;
 	int ret;
diff --git a/drivers/mtd/mtd.h b/drivers/mtd/mtd.h
index 414bd6cdb..2a85265f9 100644
--- a/drivers/mtd/mtd.h
+++ b/drivers/mtd/mtd.h
@@ -25,7 +25,7 @@
  */
 struct mtddev_hook {
 	struct list_head hook;
-	int (*add_mtd_device)(struct mtd_info *mtd, char *devname, void **priv);
+	int (*add_mtd_device)(struct mtd_info *mtd, const char *devname, void **priv);
 	int (*del_mtd_device)(struct mtd_info *mtd, void **priv);
 	void *priv;
 };
diff --git a/drivers/mtd/mtdoob.c b/drivers/mtd/mtdoob.c
index 10d17e90d..6160ddba0 100644
--- a/drivers/mtd/mtdoob.c
+++ b/drivers/mtd/mtdoob.c
@@ -69,7 +69,7 @@ static struct file_operations mtd_ops_oob = {
 	.lseek  = dev_lseek_default,
 };
 
-static int add_mtdoob_device(struct mtd_info *mtd, char *devname, void **priv)
+static int add_mtdoob_device(struct mtd_info *mtd, const char *devname, void **priv)
 {
 	struct mtdoob *mtdoob;
 
diff --git a/drivers/mtd/mtdraw.c b/drivers/mtd/mtdraw.c
index c25e4062e..ae4bec2a4 100644
--- a/drivers/mtd/mtdraw.c
+++ b/drivers/mtd/mtdraw.c
@@ -281,7 +281,7 @@ static const struct file_operations mtd_raw_fops = {
 	.lseek		= dev_lseek_default,
 };
 
-static int add_mtdraw_device(struct mtd_info *mtd, char *devname, void **priv)
+static int add_mtdraw_device(struct mtd_info *mtd, const char *devname, void **priv)
 {
 	struct mtdraw *mtdraw;
 
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 33f1fd512..7e828bc98 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -270,7 +270,7 @@ static inline uint32_t mtd_div_by_wb(uint64_t sz, struct mtd_info *mtd)
 
 	/* Kernel-side ioctl definitions */
 
-extern int add_mtd_device(struct mtd_info *mtd, char *devname, int device_id);
+extern int add_mtd_device(struct mtd_info *mtd, const char *devname, int device_id);
 extern int del_mtd_device (struct mtd_info *mtd);
 
 extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num);

From 3fc17ce4c88d713d369fb255165f24c85aea81c1 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 29 Jun 2015 07:07:30 +0200
Subject: [PATCH 19/28] mtd: m25p80: make flash_name const

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mtd/devices/m25p80.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 231d13978..794c9dbd8 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -233,7 +233,7 @@ static int m25p_probe(struct device_d *dev)
 	struct m25p			*flash;
 	struct spi_nor			*nor;
 	enum read_mode mode =		SPI_NOR_NORMAL;
-	char				*flash_name = NULL;
+	const char			*flash_name = NULL;
 	int				device_id;
 	int ret;
 
@@ -277,13 +277,10 @@ static int m25p_probe(struct device_d *dev)
 		return ret;
 
 	device_id = DEVICE_ID_SINGLE;
-	if (dev->device_node) {
-		const char *alias = of_alias_get(dev->device_node);
-		if (alias)
-			flash_name = xstrdup(alias);
-	} else if (data && data->name) {
+	if (dev->device_node)
+		flash_name = of_alias_get(dev->device_node);
+	else if (data && data->name)
 		flash_name = data->name;
-	}
 
 	if (!flash_name) {
 		device_id = DEVICE_ID_DYNAMIC;

From f2d31f6f6dc01d1b438a12230a536606bfdc43fa Mon Sep 17 00:00:00 2001
From: Lucas Stach <dev@lynxeye.de>
Date: Fri, 26 Jun 2015 20:59:21 +0200
Subject: [PATCH 20/28] commands: digest: fix harmless warning

Fixes with !CONFIG_LONGHELP:
commands/digest.c:71:13: warning:
'prints_algo_help' defined but not used [-Wunused-function]

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/digest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/digest.c b/commands/digest.c
index 340c07a24..4cc615d77 100644
--- a/commands/digest.c
+++ b/commands/digest.c
@@ -68,7 +68,7 @@ err:
 	return ret;
 }
 
-static void prints_algo_help(void)
+static void __maybe_unused prints_algo_help(void)
 {
 	puts("\navailable algo:\n");
 	digest_algo_prints("\t");

From 566cac17c3b5cfd85eb5bb1764c6cd29347b390d Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 2 Jul 2015 08:36:08 +0200
Subject: [PATCH 21/28] net: Move library functions to net/lib.c

Some network related functions are also needed when networking
is disabled. Move these to a separate file which is always compiled.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 net/Makefile |   1 +
 net/lib.c    | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++
 net/net.c    |  78 ------------------------------------
 3 files changed, 110 insertions(+), 78 deletions(-)
 create mode 100644 net/lib.c

diff --git a/net/Makefile b/net/Makefile
index 58bf14367..8d564e729 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,3 +1,4 @@
+obj-y			+= lib.o
 obj-$(CONFIG_NET)	+= eth.o
 obj-$(CONFIG_NET)	+= net.o
 obj-$(CONFIG_NET_NFS)	+= nfs.o
diff --git a/net/lib.c b/net/lib.c
new file mode 100644
index 000000000..f1c60c9a7
--- /dev/null
+++ b/net/lib.c
@@ -0,0 +1,109 @@
+/*
+ * net.c - barebox networking support
+ *
+ * Copyright (c) 2015 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+ *
+ * based on U-Boot (LiMon) code
+ *
+ * Copyright 1994 - 2000 Neil Russell.
+ * Copyright 2000 Roland Borde
+ * Copyright 2000 Paolo Scaffardi
+ * Copyright 2000-2002 Wolfgang Denk, wd@denx.de
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <common.h>
+#include <net.h>
+#include <linux/ctype.h>
+
+int string_to_ethaddr(const char *str, u8 enetaddr[6])
+{
+	int reg;
+	char *e;
+
+	if (!str || strlen(str) != 17) {
+		memset(enetaddr, 0, 6);
+		return -EINVAL;
+	}
+
+	if (str[2] != ':' || str[5] != ':' || str[8] != ':' ||
+			str[11] != ':' || str[14] != ':')
+		return -EINVAL;
+
+	for (reg = 0; reg < 6; ++reg) {
+		enetaddr[reg] = simple_strtoul(str, &e, 16);
+		str = e + 1;
+	}
+
+	return 0;
+}
+
+void ethaddr_to_string(const u8 enetaddr[6], char *str)
+{
+	sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x",
+		 enetaddr[0], enetaddr[1], enetaddr[2], enetaddr[3],
+		 enetaddr[4], enetaddr[5]);
+}
+
+void print_IPaddr(IPaddr_t x)
+{
+	puts(ip_to_string(x));
+}
+
+char *ip_to_string(IPaddr_t x)
+{
+	static char s[sizeof("xxx.xxx.xxx.xxx")];
+
+	x = ntohl(x);
+	sprintf(s, "%d.%d.%d.%d",
+		 (int) ((x >> 24) & 0xff),
+		 (int) ((x >> 16) & 0xff),
+		 (int) ((x >> 8) & 0xff), (int) ((x >> 0) & 0xff)
+	);
+
+	return s;
+}
+
+int string_to_ip(const char *s, IPaddr_t *ip)
+{
+	IPaddr_t addr = 0;
+	char *e;
+	int i;
+
+	if (!s)
+		return -EINVAL;
+
+	for (i = 0; i < 4; i++) {
+		unsigned long val;
+
+		if (!isdigit(*s))
+			return -EINVAL;
+
+		val = simple_strtoul(s, &e, 10);
+		if (val > 255)
+			return -EINVAL;
+
+		addr = (addr << 8) | val;
+
+		if (*e != '.' && i != 3)
+			return -EINVAL;
+
+		s = e + 1;
+	}
+
+	*ip = htonl(addr);
+
+	return 0;
+}
diff --git a/net/net.c b/net/net.c
index 75292c736..9380664ef 100644
--- a/net/net.c
+++ b/net/net.c
@@ -62,50 +62,6 @@ uint16_t net_checksum(unsigned char *ptr, int len)
 	return xsum & 0xffff;
 }
 
-char *ip_to_string (IPaddr_t x)
-{
-	static char s[sizeof("xxx.xxx.xxx.xxx")];
-
-	x = ntohl (x);
-	sprintf (s, "%d.%d.%d.%d",
-		 (int) ((x >> 24) & 0xff),
-		 (int) ((x >> 16) & 0xff),
-		 (int) ((x >> 8) & 0xff), (int) ((x >> 0) & 0xff)
-	);
-	return s;
-}
-
-int string_to_ip(const char *s, IPaddr_t *ip)
-{
-	IPaddr_t addr = 0;
-	char *e;
-	int i;
-
-	if (!s)
-		return -EINVAL;
-
-	for (i = 0; i < 4; i++) {
-		unsigned long val;
-
-		if (!isdigit(*s))
-			return -EINVAL;
-
-		val = simple_strtoul(s, &e, 10);
-		if (val > 255)
-			return -EINVAL;
-
-		addr = (addr << 8) | val;
-
-		if (*e != '.' && i != 3)
-			return -EINVAL;
-
-		s = e + 1;
-	}
-
-	*ip = htonl(addr);
-	return 0;
-}
-
 IPaddr_t getenv_ip(const char *name)
 {
 	IPaddr_t ip;
@@ -131,40 +87,6 @@ int setenv_ip(const char *name, IPaddr_t ip)
 	return 0;
 }
 
-void print_IPaddr (IPaddr_t x)
-{
-	puts(ip_to_string(x));
-}
-
-int string_to_ethaddr(const char *str, u8 enetaddr[6])
-{
-	int reg;
-	char *e;
-
-        if (!str || strlen(str) != 17) {
-		memset(enetaddr, 0, 6);
-		return -EINVAL;
-	}
-
-        if (str[2] != ':' || str[5] != ':' || str[8] != ':' ||
-                        str[11] != ':' || str[14] != ':')
-                return -EINVAL;
-
-	for (reg = 0; reg < 6; ++reg) {
-		enetaddr[reg] = simple_strtoul (str, &e, 16);
-			str = e + 1;
-	}
-
-	return 0;
-}
-
-void ethaddr_to_string(const u8 enetaddr[6], char *str)
-{
-	sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x",
-		 enetaddr[0], enetaddr[1], enetaddr[2], enetaddr[3],
-		 enetaddr[4], enetaddr[5]);
-}
-
 static unsigned char *arp_ether;
 static IPaddr_t arp_wait_ip;
 

From e9ed1120821e2f79c5687663a2f3f1873a155f01 Mon Sep 17 00:00:00 2001
From: Lucas Stach <dev@lynxeye.de>
Date: Fri, 26 Jun 2015 20:59:22 +0200
Subject: [PATCH 22/28] parameter: always build MAC dev param functions

The MAC dev parameter functions would only be built when CONFIG_NET is
set. This was okay as long as only network devices were using MAC dev
params. This has changed with the merge of the state framework, so
always compile them in if CONFIG_PARAMETER is set.

Fixes:
common/built-in.o: In function `state_mac_create':
common/state.c:387: undefined reference to `dev_add_param_mac'

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 lib/parameter.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/parameter.c b/lib/parameter.c
index 4c261b1e3..60642f001 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -583,7 +583,6 @@ struct param_d *dev_add_param_llint_ro(struct device_d *dev, const char *name,
 	return &piro->param;
 }
 
-#ifdef CONFIG_NET
 struct param_ip {
 	struct param_d param;
 	IPaddr_t *ip;
@@ -747,7 +746,6 @@ struct param_d *dev_add_param_mac(struct device_d *dev, const char *name,
 
 	return &pm->param;
 }
-#endif
 
 /**
  * dev_remove_param - remove a parameter from a device and free its

From bcc6281e39c7f7e2ca0953ca20204141ce5dc64f Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <alllecs@yandex.ru>
Date: Mon, 29 Jun 2015 15:17:10 +0300
Subject: [PATCH 23/28] read_file_2(): drop unnecessary 'else'

Signed-off-by: Alexander Smirnov <alllecs@yandex.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 lib/libfile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libfile.c b/lib/libfile.c
index 8acff042c..ba03700ab 100644
--- a/lib/libfile.c
+++ b/lib/libfile.c
@@ -184,8 +184,8 @@ again:
 
 	if (read_size < s.st_size)
 		return -EFBIG;
-	else
-		return 0;
+
+	return 0;
 
 err_out1:
 	close(fd);

From 177cab00ced1038e7cece282b204d5d0d43d5f9c Mon Sep 17 00:00:00 2001
From: Antony Pavlov <antonynpavlov@gmail.com>
Date: Wed, 1 Jul 2015 00:32:24 +0300
Subject: [PATCH 24/28] treewide: fix 'new blank line at EOF' formatting error

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 commands/automount.c            | 1 -
 commands/export.c               | 1 -
 commands/false.c                | 1 -
 commands/help.c                 | 1 -
 commands/net.c                  | 1 -
 commands/readline.c             | 1 -
 commands/timeout.c              | 1 -
 commands/trigger.c              | 1 -
 commands/true.c                 | 1 -
 commands/ubi.c                  | 1 -
 commands/version.c              | 1 -
 common/complete.c               | 1 -
 common/kallsyms.c               | 1 -
 common/parser.c                 | 1 -
 fs/cramfs/cramfs.c              | 1 -
 fs/fat/fat.c                    | 1 -
 fs/ramfs.c                      | 1 -
 lib/fnmatch.c                   | 1 -
 lib/lzo/lzo1x_decompress_safe.c | 1 -
 lib/random.c                    | 1 -
 lib/strtox.c                    | 1 -
 net/net.c                       | 1 -
 net/nfs.c                       | 1 -
 23 files changed, 23 deletions(-)

diff --git a/commands/automount.c b/commands/automount.c
index a29f286b2..b491d203f 100644
--- a/commands/automount.c
+++ b/commands/automount.c
@@ -70,4 +70,3 @@ BAREBOX_CMD_START(automount)
 	BAREBOX_CMD_GROUP(CMD_GRP_PART)
 	BAREBOX_CMD_HELP(cmd_automount_help)
 BAREBOX_CMD_END
-
diff --git a/commands/export.c b/commands/export.c
index 2e8bb4967..4b4cf1e12 100644
--- a/commands/export.c
+++ b/commands/export.c
@@ -59,4 +59,3 @@ BAREBOX_CMD_START(export)
 	BAREBOX_CMD_GROUP(CMD_GRP_ENV)
 	BAREBOX_CMD_HELP(cmd_export_help)
 BAREBOX_CMD_END
-
diff --git a/commands/false.c b/commands/false.c
index 6ef9af315..90aa2cc9e 100644
--- a/commands/false.c
+++ b/commands/false.c
@@ -32,4 +32,3 @@ BAREBOX_CMD_START(false)
 	BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT)
 	BAREBOX_CMD_COMPLETE(empty_complete)
 BAREBOX_CMD_END
-
diff --git a/commands/help.c b/commands/help.c
index 6e61bde1a..3d36d9bf4 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -148,4 +148,3 @@ BAREBOX_CMD_START(help)
 	BAREBOX_CMD_HELP(cmd_help_help)
 	BAREBOX_CMD_COMPLETE(command_complete)
 BAREBOX_CMD_END
-
diff --git a/commands/net.c b/commands/net.c
index 7508c992f..219c7efcd 100644
--- a/commands/net.c
+++ b/commands/net.c
@@ -64,4 +64,3 @@ BAREBOX_CMD_START(ethact)
 	BAREBOX_CMD_GROUP(CMD_GRP_NET)
 	BAREBOX_CMD_COMPLETE(eth_complete)
 BAREBOX_CMD_END
-
diff --git a/commands/readline.c b/commands/readline.c
index e53749887..b6e0e3e09 100644
--- a/commands/readline.c
+++ b/commands/readline.c
@@ -53,4 +53,3 @@ BAREBOX_CMD_START(readline)
 	BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE)
 	BAREBOX_CMD_HELP(cmd_readline_help)
 BAREBOX_CMD_END
-
diff --git a/commands/timeout.c b/commands/timeout.c
index 2b99d4f74..ef1a037c1 100644
--- a/commands/timeout.c
+++ b/commands/timeout.c
@@ -84,4 +84,3 @@ BAREBOX_CMD_START(timeout)
 	BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE)
 	BAREBOX_CMD_HELP(cmd_timeout_help)
 BAREBOX_CMD_END
-
diff --git a/commands/trigger.c b/commands/trigger.c
index b605448a9..2758ce74e 100644
--- a/commands/trigger.c
+++ b/commands/trigger.c
@@ -105,4 +105,3 @@ BAREBOX_CMD_START(trigger)
 	BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP)
 	BAREBOX_CMD_HELP(cmd_trigger_help)
 BAREBOX_CMD_END
-
diff --git a/commands/true.c b/commands/true.c
index fbb34e769..24dea4692 100644
--- a/commands/true.c
+++ b/commands/true.c
@@ -32,4 +32,3 @@ BAREBOX_CMD_START(true)
 	BAREBOX_CMD_GROUP(CMD_GRP_SCRIPT)
 	BAREBOX_CMD_COMPLETE(empty_complete)
 BAREBOX_CMD_END
-
diff --git a/commands/ubi.c b/commands/ubi.c
index 94da799b8..946312715 100644
--- a/commands/ubi.c
+++ b/commands/ubi.c
@@ -179,4 +179,3 @@ BAREBOX_CMD_START(ubirmvol)
 	BAREBOX_CMD_GROUP(CMD_GRP_PART)
 	BAREBOX_CMD_HELP(cmd_ubirmvol_help)
 BAREBOX_CMD_END
-
diff --git a/commands/version.c b/commands/version.c
index 898c71943..090f2dd13 100644
--- a/commands/version.c
+++ b/commands/version.c
@@ -33,4 +33,3 @@ BAREBOX_CMD_START(version)
 	BAREBOX_CMD_GROUP(CMD_GRP_INFO)
 	BAREBOX_CMD_COMPLETE(empty_complete)
 BAREBOX_CMD_END
-
diff --git a/common/complete.c b/common/complete.c
index 5b71f03cf..f0ef57640 100644
--- a/common/complete.c
+++ b/common/complete.c
@@ -466,4 +466,3 @@ int complete(char *instr, char **outstr)
 
 	return reprint;
 }
-
diff --git a/common/kallsyms.c b/common/kallsyms.c
index 53e22cdc7..e15dec5df 100644
--- a/common/kallsyms.c
+++ b/common/kallsyms.c
@@ -212,4 +212,3 @@ int sprint_symbol(char *buffer, unsigned long address)
 	return len;
 }
 EXPORT_SYMBOL_GPL(sprint_symbol);
-
diff --git a/common/parser.c b/common/parser.c
index 4a48210c4..207599f42 100644
--- a/common/parser.c
+++ b/common/parser.c
@@ -284,4 +284,3 @@ int run_shell(void)
 	}
 	return 0;
 }
-
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index fb927149e..97f028a3e 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -481,4 +481,3 @@ static int cramfs_init(void)
 }
 
 device_initcall(cramfs_init);
-
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 6d7d262f3..ece937d44 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -434,4 +434,3 @@ static int fat_init(void)
 }
 
 coredevice_initcall(fat_init);
-
diff --git a/fs/ramfs.c b/fs/ramfs.c
index fe5eb8982..716f40f5b 100644
--- a/fs/ramfs.c
+++ b/fs/ramfs.c
@@ -644,4 +644,3 @@ static int ramfs_init(void)
 }
 
 coredevice_initcall(ramfs_init);
-
diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 1a5e8d0d3..0ab530d3b 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -218,4 +218,3 @@ int fnmatch(const char *pattern, const char *string, int flags)
 
 # undef FOLD
 }
-
diff --git a/lib/lzo/lzo1x_decompress_safe.c b/lib/lzo/lzo1x_decompress_safe.c
index 3c0f51263..6e8c822b3 100644
--- a/lib/lzo/lzo1x_decompress_safe.c
+++ b/lib/lzo/lzo1x_decompress_safe.c
@@ -258,4 +258,3 @@ lookbehind_overrun:
 }
 
 EXPORT_SYMBOL(lzo1x_decompress_safe);
-
diff --git a/lib/random.c b/lib/random.c
index 14c7da119..210fea994 100644
--- a/lib/random.c
+++ b/lib/random.c
@@ -25,4 +25,3 @@ void get_random_bytes(void *_buf, int len)
 	while (len--)
 		*buf++ = rand() % 256;
 }
-
diff --git a/lib/strtox.c b/lib/strtox.c
index 882865b45..cfe61240c 100644
--- a/lib/strtox.c
+++ b/lib/strtox.c
@@ -65,4 +65,3 @@ unsigned long long simple_strtoull (const char *cp, char **endp, unsigned int ba
 	return result;
 }
 EXPORT_SYMBOL(simple_strtoull);
-
diff --git a/net/net.c b/net/net.c
index 9380664ef..e5bd9bbc7 100644
--- a/net/net.c
+++ b/net/net.c
@@ -589,4 +589,3 @@ static int net_init(void)
 }
 
 postcore_initcall(net_init);
-
diff --git a/net/nfs.c b/net/nfs.c
index 27533304e..0a3021994 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -731,4 +731,3 @@ BAREBOX_CMD_START(nfs)
 	BAREBOX_CMD_OPTS("FILE [LOCALFILE]")
 	BAREBOX_CMD_GROUP(CMD_GRP_NET)
 BAREBOX_CMD_END
-

From 00e4fd727bff16992b781b013a096da7993d888e Mon Sep 17 00:00:00 2001
From: Antony Pavlov <antonynpavlov@gmail.com>
Date: Wed, 1 Jul 2015 07:28:24 +0300
Subject: [PATCH 25/28] sandbox: asm/byteorder.h: fix guard macro name

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/sandbox/include/asm/byteorder.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/sandbox/include/asm/byteorder.h b/arch/sandbox/include/asm/byteorder.h
index 37316f237..3d82bcba6 100644
--- a/arch/sandbox/include/asm/byteorder.h
+++ b/arch/sandbox/include/asm/byteorder.h
@@ -1,8 +1,8 @@
-#ifndef _I386_BYTEORDER_H
-#define _I386_BYTEORDER_H
+#ifndef _SANDBOX_BYTEORDER_H
+#define _SANDBOX_BYTEORDER_H
 
 #include <asm/types.h>
 
 #include <linux/byteorder/little_endian.h>
 
-#endif /* _I386_BYTEORDER_H */
+#endif /* _SANDBOX_BYTEORDER_H */

From af8709c1820de536e790d212d8c5c9be98557946 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 2 Jul 2015 08:40:38 +0200
Subject: [PATCH 26/28] ppc: replace extern inline with static inline

Replaced in the kernel a long time ago, not compatible with gcc5.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/ppc/include/asm/atomic.h |  8 ++++----
 arch/ppc/include/asm/bitops.h | 18 +++++++++---------
 arch/ppc/include/asm/io.h     | 20 ++++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/arch/ppc/include/asm/atomic.h b/arch/ppc/include/asm/atomic.h
index 23f22df1b..a98d892ea 100644
--- a/arch/ppc/include/asm/atomic.h
+++ b/arch/ppc/include/asm/atomic.h
@@ -21,7 +21,7 @@ typedef struct { int counter; } atomic_t;
 extern void atomic_clear_mask(unsigned long mask, unsigned long *addr);
 extern void atomic_set_mask(unsigned long mask, unsigned long *addr);
 
-extern __inline__ int atomic_add_return(int a, atomic_t *v)
+static inline int atomic_add_return(int a, atomic_t *v)
 {
 	int t;
 
@@ -37,7 +37,7 @@ extern __inline__ int atomic_add_return(int a, atomic_t *v)
 	return t;
 }
 
-extern __inline__ int atomic_sub_return(int a, atomic_t *v)
+static inline int atomic_sub_return(int a, atomic_t *v)
 {
 	int t;
 
@@ -53,7 +53,7 @@ extern __inline__ int atomic_sub_return(int a, atomic_t *v)
 	return t;
 }
 
-extern __inline__ int atomic_inc_return(atomic_t *v)
+static inline int atomic_inc_return(atomic_t *v)
 {
 	int t;
 
@@ -69,7 +69,7 @@ extern __inline__ int atomic_inc_return(atomic_t *v)
 	return t;
 }
 
-extern __inline__ int atomic_dec_return(atomic_t *v)
+static inline int atomic_dec_return(atomic_t *v)
 {
 	int t;
 
diff --git a/arch/ppc/include/asm/bitops.h b/arch/ppc/include/asm/bitops.h
index e4572bcd4..f126b4802 100644
--- a/arch/ppc/include/asm/bitops.h
+++ b/arch/ppc/include/asm/bitops.h
@@ -28,7 +28,7 @@
  * These used to be if'd out here because using : "cc" as a constraint
  * resulted in errors from egcs.  Things may be OK with gcc-2.95.
  */
-extern __inline__ void set_bit(int nr, volatile void * addr)
+static inline void set_bit(int nr, volatile void * addr)
 {
 	unsigned long old;
 	unsigned long mask = 1 << (nr & 0x1f);
@@ -45,7 +45,7 @@ extern __inline__ void set_bit(int nr, volatile void * addr)
 	: "cc" );
 }
 
-extern __inline__ void clear_bit(int nr, volatile void *addr)
+static inline void clear_bit(int nr, volatile void *addr)
 {
 	unsigned long old;
 	unsigned long mask = 1 << (nr & 0x1f);
@@ -62,7 +62,7 @@ extern __inline__ void clear_bit(int nr, volatile void *addr)
 	: "cc");
 }
 
-extern __inline__ void change_bit(int nr, volatile void *addr)
+static inline void change_bit(int nr, volatile void *addr)
 {
 	unsigned long old;
 	unsigned long mask = 1 << (nr & 0x1f);
@@ -79,7 +79,7 @@ extern __inline__ void change_bit(int nr, volatile void *addr)
 	: "cc");
 }
 
-extern __inline__ int test_and_set_bit(int nr, volatile void *addr)
+static inline int test_and_set_bit(int nr, volatile void *addr)
 {
 	unsigned int old, t;
 	unsigned int mask = 1 << (nr & 0x1f);
@@ -98,7 +98,7 @@ extern __inline__ int test_and_set_bit(int nr, volatile void *addr)
 	return (old & mask) != 0;
 }
 
-extern __inline__ int test_and_clear_bit(int nr, volatile void *addr)
+static inline int test_and_clear_bit(int nr, volatile void *addr)
 {
 	unsigned int old, t;
 	unsigned int mask = 1 << (nr & 0x1f);
@@ -117,7 +117,7 @@ extern __inline__ int test_and_clear_bit(int nr, volatile void *addr)
 	return (old & mask) != 0;
 }
 
-extern __inline__ int test_and_change_bit(int nr, volatile void *addr)
+static inline int test_and_change_bit(int nr, volatile void *addr)
 {
 	unsigned int old, t;
 	unsigned int mask = 1 << (nr & 0x1f);
@@ -138,7 +138,7 @@ extern __inline__ int test_and_change_bit(int nr, volatile void *addr)
 #endif /* __INLINE_BITOPS */
 
 /* Return the bit position of the most significant 1 bit in a word */
-extern __inline__ int __ilog2(unsigned int x)
+static inline int __ilog2(unsigned int x)
 {
 	int lz;
 
@@ -146,7 +146,7 @@ extern __inline__ int __ilog2(unsigned int x)
 	return 31 - lz;
 }
 
-extern __inline__ int ffz(unsigned int x)
+static inline int ffz(unsigned int x)
 {
 	if ((x = ~x) == 0)
 		return 32;
@@ -177,7 +177,7 @@ static inline int fls(unsigned int x)
  * the libc and compiler builtin ffs routines, therefore
  * differs in spirit from the above ffz (man ffs).
  */
-extern __inline__ int ffs(int x)
+static inline int ffs(int x)
 {
 	return __ilog2(x & -x) + 1;
 }
diff --git a/arch/ppc/include/asm/io.h b/arch/ppc/include/asm/io.h
index 98bf5132c..f83ab6ee0 100644
--- a/arch/ppc/include/asm/io.h
+++ b/arch/ppc/include/asm/io.h
@@ -136,7 +136,7 @@ static inline void __raw_writel(unsigned int v, volatile void __iomem *addr)
 /*
  * 8, 16 and 32 bit, big and little endian I/O operations, with barrier.
  */
-extern inline u8 in_8(const volatile u8 __iomem *addr)
+static inline u8 in_8(const volatile u8 __iomem *addr)
 {
 	u8 ret;
 
@@ -145,12 +145,12 @@ extern inline u8 in_8(const volatile u8 __iomem *addr)
 	return ret;
 }
 
-extern inline void out_8(volatile u8 __iomem *addr, u8 val)
+static inline void out_8(volatile u8 __iomem *addr, u8 val)
 {
 	__asm__ __volatile__("sync;stb%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
 }
 
-extern inline u16 in_le16(const volatile u16 __iomem *addr)
+static inline u16 in_le16(const volatile u16 __iomem *addr)
 {
 	u16 ret;
 
@@ -159,7 +159,7 @@ extern inline u16 in_le16(const volatile u16 __iomem *addr)
 	return ret;
 }
 
-extern inline u16 in_be16(const volatile u16 __iomem *addr)
+static inline u16 in_be16(const volatile u16 __iomem *addr)
 {
 	u16 ret;
 
@@ -168,18 +168,18 @@ extern inline u16 in_be16(const volatile u16 __iomem *addr)
 	return ret;
 }
 
-extern inline void out_le16(volatile u16 __iomem *addr, u16 val)
+static inline void out_le16(volatile u16 __iomem *addr, u16 val)
 {
 	__asm__ __volatile__("sync; sthbrx %1,0,%2"
 			: "=m" (*addr) : "r" (val), "r" (addr));
 }
 
-extern inline void out_be16(volatile u16 __iomem *addr, u16 val)
+static inline void out_be16(volatile u16 __iomem *addr, u16 val)
 {
 	__asm__ __volatile__("sync;sth%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
 }
 
-extern inline u32 in_le32(const volatile u32 __iomem *addr)
+static inline u32 in_le32(const volatile u32 __iomem *addr)
 {
 	u32 ret;
 
@@ -188,7 +188,7 @@ extern inline u32 in_le32(const volatile u32 __iomem *addr)
 	return ret;
 }
 
-extern inline u32 in_be32(const volatile u32 __iomem *addr)
+static inline u32 in_be32(const volatile u32 __iomem *addr)
 {
 	u32 ret;
 
@@ -197,13 +197,13 @@ extern inline u32 in_be32(const volatile u32 __iomem *addr)
 	return ret;
 }
 
-extern inline void out_le32(volatile u32 __iomem *addr, u32 val)
+static inline void out_le32(volatile u32 __iomem *addr, u32 val)
 {
 	__asm__ __volatile__("sync; stwbrx %1,0,%2"
 			: "=m" (*addr) : "r" (val), "r" (addr));
 }
 
-extern inline void out_be32(volatile u32 __iomem *addr, u32 val)
+static inline void out_be32(volatile u32 __iomem *addr, u32 val)
 {
 	__asm__ __volatile__("sync;stw%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
 }

From 84130449b89099e32199f86d547f9f1584601c40 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 2 Jul 2015 08:41:23 +0200
Subject: [PATCH 27/28] blackfin: replace extern inline with static inline

Replaced in the kernel a long time ago, not compatible with gcc5.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/blackfin/include/asm/io.h        | 8 ++++----
 arch/blackfin/include/asm/processor.h | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h
index 2837b6a1a..703104e1b 100644
--- a/arch/blackfin/include/asm/io.h
+++ b/arch/blackfin/include/asm/io.h
@@ -90,21 +90,21 @@ extern void *__ioremap(unsigned long physaddr, unsigned long size,
 		       int cacheflag);
 extern void __iounmap(void *addr, unsigned long size);
 
-extern inline void *ioremap(unsigned long physaddr, unsigned long size)
+static inline void *ioremap(unsigned long physaddr, unsigned long size)
 {
 	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
 }
-extern inline void *ioremap_nocache(unsigned long physaddr,
+static inline void *ioremap_nocache(unsigned long physaddr,
 				    unsigned long size)
 {
 	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
 }
-extern inline void *ioremap_writethrough(unsigned long physaddr,
+static inline void *ioremap_writethrough(unsigned long physaddr,
 					 unsigned long size)
 {
 	return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
 }
-extern inline void *ioremap_fullcache(unsigned long physaddr,
+static inline void *ioremap_fullcache(unsigned long physaddr,
 				      unsigned long size)
 {
 	return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
diff --git a/arch/blackfin/include/asm/processor.h b/arch/blackfin/include/asm/processor.h
index eaa1e4a03..f46363732 100644
--- a/arch/blackfin/include/asm/processor.h
+++ b/arch/blackfin/include/asm/processor.h
@@ -36,7 +36,7 @@
 #include <asm/ptrace.h>
 #include <asm/current.h>
 
-extern inline unsigned long rdusp(void)
+static inline unsigned long rdusp(void)
 {
 	unsigned long usp;
 
@@ -44,7 +44,7 @@ extern inline unsigned long rdusp(void)
 	return usp;
 }
 
-extern inline void wrusp(unsigned long usp)
+static inline void wrusp(unsigned long usp)
 {
 	__asm__ __volatile__("usp = %0;\n\t"::"da"(usp));
 }
@@ -130,7 +130,7 @@ static inline void exit_thread(void)
 /*
  * Return saved PC of a blocked thread.
  */
-extern inline unsigned long thread_saved_pc(struct thread_struct *t)
+static inline unsigned long thread_saved_pc(struct thread_struct *t)
 {
 	extern void scheduling_functions_start_here(void);
 	extern void scheduling_functions_end_here(void);

From 7f1195c63d30ae24f5575336264d74bf39ab06f9 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 2 Jul 2015 08:45:02 +0200
Subject: [PATCH 28/28] treewide: replace __inline__ with inline

inline is preferred over __inline__

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/blackfin/include/asm/swab.h | 8 ++++----
 arch/ppc/include/asm/bitops.h    | 2 +-
 arch/ppc/include/asm/swab.h      | 8 ++++----
 include/linux/bitops.h           | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/blackfin/include/asm/swab.h b/arch/blackfin/include/asm/swab.h
index 89de6507c..1f645db37 100644
--- a/arch/blackfin/include/asm/swab.h
+++ b/arch/blackfin/include/asm/swab.h
@@ -12,7 +12,7 @@
 
 #ifdef __GNUC__
 
-static __inline__ __attribute_const__ __u32 __arch_swahb32(__u32 xx)
+static inline __attribute_const__ __u32 __arch_swahb32(__u32 xx)
 {
 	__u32 tmp;
 	__asm__("%1 = %0 >> 8 (V);\n\t"
@@ -23,7 +23,7 @@ static __inline__ __attribute_const__ __u32 __arch_swahb32(__u32 xx)
 }
 #define __arch_swahb32 __arch_swahb32
 
-static __inline__ __attribute_const__ __u32 __arch_swahw32(__u32 xx)
+static inline __attribute_const__ __u32 __arch_swahw32(__u32 xx)
 {
 	__u32 rv;
 	__asm__("%0 = PACK(%1.L, %1.H);\n\t": "=d"(rv): "d"(xx));
@@ -31,13 +31,13 @@ static __inline__ __attribute_const__ __u32 __arch_swahw32(__u32 xx)
 }
 #define __arch_swahw32 __arch_swahw32
 
-static __inline__ __attribute_const__ __u32 __arch_swab32(__u32 xx)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 xx)
 {
 	return __arch_swahb32(__arch_swahw32(xx));
 }
 #define __arch_swab32 __arch_swab32
 
-static __inline__ __attribute_const__ __u16 __arch_swab16(__u16 xx)
+static inline __attribute_const__ __u16 __arch_swab16(__u16 xx)
 {
 	__u32 xw = xx;
 	__asm__("%0 <<= 8;\n	%0.L = %0.L + %0.H (NS);\n": "+d"(xw));
diff --git a/arch/ppc/include/asm/bitops.h b/arch/ppc/include/asm/bitops.h
index f126b4802..2fdd57eff 100644
--- a/arch/ppc/include/asm/bitops.h
+++ b/arch/ppc/include/asm/bitops.h
@@ -153,7 +153,7 @@ static inline int ffz(unsigned int x)
 	return __ilog2(x & -x);
 }
 
-static __inline__ int __ffs(unsigned long x)
+static inline int __ffs(unsigned long x)
 {
 	return __ilog2(x & -x);
 }
diff --git a/arch/ppc/include/asm/swab.h b/arch/ppc/include/asm/swab.h
index c581e3ef7..110488e64 100644
--- a/arch/ppc/include/asm/swab.h
+++ b/arch/ppc/include/asm/swab.h
@@ -19,7 +19,7 @@
 
 #ifdef __KERNEL__
 
-static __inline__ __u16 ld_le16(const volatile __u16 *addr)
+static inline __u16 ld_le16(const volatile __u16 *addr)
 {
 	__u16 val;
 
@@ -28,7 +28,7 @@ static __inline__ __u16 ld_le16(const volatile __u16 *addr)
 }
 #define __arch_swab16p ld_le16
 
-static __inline__ void st_le16(volatile __u16 *addr, const __u16 val)
+static inline void st_le16(volatile __u16 *addr, const __u16 val)
 {
 	__asm__ __volatile__ ("sthbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
 }
@@ -39,7 +39,7 @@ static inline void __arch_swab16s(__u16 *addr)
 }
 #define __arch_swab16s __arch_swab16s
 
-static __inline__ __u32 ld_le32(const volatile __u32 *addr)
+static inline __u32 ld_le32(const volatile __u32 *addr)
 {
 	__u32 val;
 
@@ -48,7 +48,7 @@ static __inline__ __u32 ld_le32(const volatile __u32 *addr)
 }
 #define __arch_swab32p ld_le32
 
-static __inline__ void st_le32(volatile __u32 *addr, const __u32 val)
+static inline void st_le32(volatile __u32 *addr, const __u32 val)
 {
 	__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
 }
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index be5fd38bd..f3a740c46 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -54,7 +54,7 @@ extern unsigned long __sw_hweight64(__u64 w);
 	     (bit) < (size);					\
 	     (bit) = find_next_zero_bit((addr), (size), (bit) + 1))
 
-static __inline__ int get_bitmask_order(unsigned int count)
+static inline int get_bitmask_order(unsigned int count)
 {
 	int order;
 
@@ -62,7 +62,7 @@ static __inline__ int get_bitmask_order(unsigned int count)
 	return order;	/* We could be slightly more clever with -1 here... */
 }
 
-static __inline__ int get_count_order(unsigned int count)
+static inline int get_count_order(unsigned int count)
 {
 	int order;