Merge branch 'for-next/misc'

arch/arm/boards/a9m2410/Makefile

@@ -1,4 +1,3 @@
 
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o
+lwl-y += lowlevel_init.o
 obj-y += a9m2410.o

arch/arm/boards/a9m2440/Makefile

@@ -1,5 +1,4 @@
 
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o
+lwl-y += lowlevel_init.o
 obj-y += a9m2440.o
 obj-$(CONFIG_MACH_A9M2410DEV) += a9m2410dev.o

arch/arm/boards/archosg9/Makefile

@@ -1,4 +1,3 @@
 obj-y += board.o
 obj-$(CONFIG_ARM_BOARD_APPEND_ATAG) += archos_features.o
-obj-y += lowlevel.o mux.o
-pbl-y += lowlevel.o mux.o
+lwl-y += lowlevel.o mux.o

arch/arm/boards/at91sam9261ek/Makefile

@@ -1,5 +1,3 @@
 obj-y += init.o
 
-obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
-
-pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o

arch/arm/boards/at91sam9263ek/Makefile

@@ -1,5 +1,3 @@
 obj-y += init.o
 
-obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
-
-pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o

arch/arm/boards/beagle/Makefile

@@ -1,3 +1,2 @@
 obj-y += board.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/beaglebone/Makefile

@@ -1,5 +1,2 @@
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o
 obj-y += board.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o

arch/arm/boards/ccxmx51/Makefile

@@ -1,5 +1,4 @@
-obj-y					+= flash_header.o ccxmx51.o
-pbl-y					+= flash_header.o
+obj-y					+= ccxmx51.o
+lwl-y				+= flash_header.o
+lwl-y				+= lowlevel.o
 obj-$(CONFIG_MACH_CCMX51_BASEBOARD)	+= ccxmx51js.o
-obj-y					+= lowlevel.o
-pbl-y					+= lowlevel.o

arch/arm/boards/chumby_falconwing/Makefile

@@ -1,3 +1,2 @@
 obj-y = falconwing.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/clep7212/Makefile

@@ -1,2 +1,2 @@
-obj-y += lowlevel.o clep7212.o
-pbl-y += lowlevel.o
+obj-y += clep7212.o
+lwl-y += lowlevel.o

arch/arm/boards/crystalfontz-cfa10036/Makefile

@@ -1,3 +1,2 @@
 obj-y += cfa10036.o hwdetect.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/edb93xx/Makefile

@@ -1,3 +1,3 @@
 
-obj-y += edb93xx.o flash_cfg.o pll_cfg.o sdram_cfg.o
-pbl-y += edb93xx.o flash_cfg.o pll_cfg.o sdram_cfg.o
+obj-y += edb93xx.o
+lwl-y += flash_cfg.o pll_cfg.o sdram_cfg.o

arch/arm/boards/efika-mx-smartbook/Makefile

@@ -1,5 +1,3 @@
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
 obj-y += board.o
-obj-y += flash_header.o
-pbl-y += flash_header.o
+lwl-y += lowlevel.o
+lwl-y += flash_header.o

arch/arm/boards/eukrea_cpuimx25/Makefile

@@ -16,8 +16,6 @@
 #
 #
 
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
 obj-y += eukrea_cpuimx25.o
-obj-$(CONFIG_ARCH_IMX_INTERNAL_BOOT) += flash_header.o
-pbl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT) += flash_header.o
+lwl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT) += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/eukrea_cpuimx27/Makefile

@@ -1,4 +1,3 @@
 
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o
+lwl-y += lowlevel_init.o
 obj-y += eukrea_cpuimx27.o

arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c

@@ -230,14 +230,14 @@ console_initcall(eukrea_cpuimx27_console_init);
 
 static int eukrea_cpuimx27_late_init(void)
 {
-#ifdef CONFIG_I2C_LP3972
+#ifdef CONFIG_MFD_LP3972
 	struct i2c_client *client;
 	u8 reg[1];
 #endif
 	console_flush();
 	imx27_add_fec(&fec_info);
 
-#ifdef CONFIG_I2C_LP3972
+#ifdef CONFIG_MFD_LP3972
 	client = lp3972_get_client();
 	if (!client)
 		return -ENODEV;

arch/arm/boards/eukrea_cpuimx35/Makefile

@@ -16,8 +16,6 @@
 #
 #
 
-obj-y					+= lowlevel.o
-pbl-y					+= lowlevel.o
 obj-y					+= eukrea_cpuimx35.o
-obj-$(CONFIG_ARCH_IMX_INTERNAL_BOOT)	+= flash_header.o
-pbl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT)	+= flash_header.o
+lwl-y					+= lowlevel.o
+lwl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT)	+= flash_header.o

arch/arm/boards/eukrea_cpuimx51/Makefile

@@ -1,5 +1,3 @@
 obj-y += eukrea_cpuimx51.o
-obj-y += flash_header.o
-pbl-y += flash_header.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/freescale-mx23-evk/Makefile

@@ -1,4 +1,3 @@
 #
 obj-y := mx23-evk.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/freescale-mx25-3-stack/Makefile

@@ -16,6 +16,5 @@
 #
 #
 
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o
+lwl-y += lowlevel_init.o
 obj-y += 3stack.o

arch/arm/boards/freescale-mx28-evk/Makefile

@@ -1,3 +1,2 @@
 obj-y += mx28-evk.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/freescale-mx35-3-stack/Makefile

@@ -1,6 +1,4 @@
 
-obj-y					+= lowlevel_init.o
-pbl-y					+= lowlevel_init.o
 obj-y					+= 3stack.o
-obj-$(CONFIG_ARCH_IMX_INTERNAL_BOOT)	+= flash_header.o
-pbl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT)	+= flash_header.o
+lwl-y					+= lowlevel_init.o
+lwl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT)	+= flash_header.o

arch/arm/boards/freescale-mx51-pdk/Makefile

@@ -1,5 +1,3 @@
 obj-y += board.o
-obj-y += flash_header.o
-pbl-y += flash_header.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/freescale-mx53-loco/Makefile

@@ -1,5 +1,3 @@
 obj-y += board.o
-obj-y += flash_header.o
-pbl-y += flash_header.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/freescale-mx53-smd/Makefile

@@ -1,5 +1,3 @@
 obj-y += board.o
-obj-y += flash_header.o
-pbl-y += flash_header.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/freescale-mx6-arm2/Makefile

@@ -1,4 +1,3 @@
-obj-y += board.o flash_header.o
-pbl-y += flash_header.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+obj-y += board.o
+lwl-y += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/freescale-mx6-sabrelite/Makefile

@@ -1,4 +1,3 @@
-obj-y += board.o flash_header.o
-pbl-y += flash_header.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+obj-y += board.o
+lwl-y += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/friendlyarm-mini2440/Makefile

@@ -1,3 +1,3 @@
 
-obj-y += mini2440.o lowlevel_init.o
-pbl-y += lowlevel_init.o
+obj-y += mini2440.o
+lwl-y += lowlevel_init.o

arch/arm/boards/friendlyarm-mini6410/Makefile

@@ -1,3 +1,2 @@
 obj-y += mini6410.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/friendlyarm-tiny210/Makefile

@@ -1,2 +1,2 @@
-obj-y += tiny210.o lowlevel.o
-pbl-y += lowlevel.o
+obj-y += tiny210.o
+lwl-y += lowlevel.o

arch/arm/boards/friendlyarm-tiny6410/Makefile

@@ -1,4 +1,3 @@
 obj-y += tiny6410.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
-obj-$(CONFIG_MACH_TINY6410_FA) += development-board.o
+lwl-y += lowlevel.o
+lwl-$(CONFIG_MACH_TINY6410_FA) += development-board.o

arch/arm/boards/guf-cupid/Makefile

@@ -16,6 +16,5 @@
 #
 #
 
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o
 obj-y += board.o

arch/arm/boards/guf-neso/Makefile

@@ -1,4 +1,3 @@
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o
 obj-y += board.o
 obj-y += pll_init.o

arch/arm/boards/guf-vincell/Makefile

@@ -1,3 +1,2 @@
 obj-y += board.o
-obj-y += flash_header.o lowlevel.o
-pbl-y += flash_header.o lowlevel.o
+lwl-y += flash_header.o lowlevel.o

arch/arm/boards/imx21ads/Makefile

@@ -1,3 +1,2 @@
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o
+lwl-y += lowlevel_init.o
 obj-y += imx21ads.o

arch/arm/boards/imx233-olinuxino/Makefile

@@ -1,3 +1,2 @@
 obj-y = imx23-olinuxino.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/imx27ads/Makefile

@@ -1,4 +1,3 @@
 
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o
+lwl-y += lowlevel_init.o
 obj-y += imx27ads.o

arch/arm/boards/karo-tx25/Makefile

@@ -16,6 +16,5 @@
 #
 #
 
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o
 obj-y += board.o

arch/arm/boards/karo-tx28/Makefile

@@ -1,4 +1,3 @@
 obj-y += tx28.o
 obj-$(CONFIG_MACH_TX28STK5) += tx28-stk5.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/karo-tx51/Makefile

@@ -1,5 +1,3 @@
 obj-y += tx51.o
-obj-$(CONFIG_ARCH_IMX_INTERNAL_BOOT) += flash_header.o
-pbl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT) += flash_header.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT) += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/karo-tx53/Makefile

@@ -1,5 +1,3 @@
 obj-y += board.o
-obj-y += flash_header.o
-pbl-y += flash_header.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/mioa701/Makefile

@@ -1,3 +1,2 @@
 obj-y += board.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/mmccpu/Makefile

@@ -1,5 +1,3 @@
 obj-y += init.o
 
-obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
-
-pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o

arch/arm/boards/netx/Makefile

@@ -1,2 +1,2 @@
-obj-y += netx.o platform.o
-pbl-y += platform.o
+obj-y += netx.o
+lwl-y += platform.o

arch/arm/boards/nhk8815/Makefile

@@ -1,3 +1,2 @@
 obj-y += setup.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/omap343xdsp/Makefile

@@ -1,3 +1,2 @@
 obj-y += board.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/omap3evm/Makefile

@@ -1,3 +1,2 @@
 obj-y += board.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/panda/Makefile

@@ -1,3 +1,2 @@
 obj-y += board.o
-obj-y += lowlevel.o mux.o
-pbl-y += lowlevel.o mux.o
+lwl-y += lowlevel.o mux.o

arch/arm/boards/pcm027/Makefile

@@ -1,3 +1,2 @@
 obj-y += board.o
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o
+lwl-y += lowlevel_init.o

arch/arm/boards/pcm037/Makefile

@@ -16,6 +16,5 @@
 #
 #
 
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o
 obj-y += pcm037.o

arch/arm/boards/pcm038/Makefile

@@ -1,3 +1,3 @@
-obj-y					+= lowlevel.o pcm038.o
-pbl-y					+= lowlevel.o
+obj-y					+= pcm038.o
+lwl-y				+= lowlevel.o
 obj-$(CONFIG_MACH_PCM970_BASEBOARD)	+= pcm970.o

arch/arm/boards/pcm043/Makefile

@@ -16,6 +16,5 @@
 #
 #
 
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o
 obj-y += pcm043.o

arch/arm/boards/pcm049/Makefile

@@ -1,2 +1,2 @@
-obj-y += board.o mux.o lowlevel.o
-pbl-y += lowlevel.o mux.o
+obj-y += board.o
+lwl-y += lowlevel.o mux.o

arch/arm/boards/pcm051/Makefile

@@ -1,3 +1,2 @@
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o
 obj-y += board.o

arch/arm/boards/phycard-a-l1/Makefile

@@ -15,5 +15,4 @@
 #
 
 obj-y += pca-a-l1.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/phycard-a-xl2/Makefile

@@ -13,5 +13,5 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-obj-y += pca-a-xl2.o mux.o lowlevel.o
-pbl-y += mux.o lowlevel.o
+obj-y += pca-a-xl2.o
+lwl-y += mux.o lowlevel.o

arch/arm/boards/phycard-i.MX27/Makefile

@@ -1,4 +1,3 @@
 
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o
+lwl-y += lowlevel_init.o
 obj-y += pca100.o

arch/arm/boards/pm9261/Makefile

@@ -1,5 +1,3 @@
 obj-y += init.o
 
-obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
-
-pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o

arch/arm/boards/pm9263/Makefile

@@ -1,5 +1,3 @@
 obj-y += init.o
 
-obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
-
-pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o
+lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += lowlevel_init.o

arch/arm/boards/raspberry-pi/Makefile

@@ -1,3 +1,2 @@
 obj-$(CONFIG_MACH_RPI) += rpi.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/scb9328/Makefile

@@ -1,4 +1,3 @@
 
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o
+lwl-y += lowlevel_init.o
 obj-y += scb9328.o

arch/arm/boards/tny-a926x/Makefile

@@ -5,6 +5,4 @@ obj-$(CONFIG_AT91_BOOTSTRAP) += $(bootstrap-y)
 
 lowlevel_init-$(CONFIG_MACH_TNY_A9263) = tny_a9263_lowlevel_init.o
 
-obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
-
-pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
+lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)

arch/arm/boards/toshiba-ac100/Makefile

@@ -1,4 +1,3 @@
 obj-y += board.o
 obj-$(CONFIG_DRIVER_SERIAL_NS16550) += serial.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/boards/tqma53/Makefile

@@ -1,5 +1,3 @@
 obj-y += board.o
-obj-y += flash_header.o
-pbl-y += flash_header.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += flash_header.o
+lwl-y += lowlevel.o

arch/arm/boards/usb-a926x/Makefile

@@ -5,6 +5,4 @@ obj-$(CONFIG_AT91_BOOTSTRAP) += $(bootstrap-y)
 
 lowlevel_init-$(CONFIG_MACH_USB_A9263) = usb_a9263_lowlevel_init.o
 
-obj-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
-
-pbl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)
+lwl-$(CONFIG_HAVE_AT91_LOWLEVEL_INIT) += $(lowlevel_init-y)

arch/arm/boards/versatile/Makefile

@@ -1,3 +1,2 @@
 obj-$(CONFIG_MACH_VERSATILEPB) += versatilepb.o
-obj-y += lowlevel.o
-pbl-y += lowlevel.o
+lwl-y += lowlevel.o

arch/arm/configs/archosg9_defconfig

@@ -59,8 +59,8 @@ CONFIG_BAUDRATE=115200
 # CONFIG_SPI is not set
 CONFIG_I2C=y
 CONFIG_I2C_OMAP=y
-CONFIG_I2C_TWLCORE=y
-CONFIG_I2C_TWL6030=y
+CONFIG_MFD_TWLCORE=y
+CONFIG_MFD_TWL6030=y
 CONFIG_MCI=y
 CONFIG_MCI_STARTUP=y
 CONFIG_MCI_OMAP_HSMMC=y

arch/arm/configs/eukrea_cpuimx27_defconfig

@@ -45,7 +45,7 @@ CONFIG_DRIVER_NET_FEC_IMX=y
 # CONFIG_SPI is not set
 CONFIG_I2C=y
 CONFIG_I2C_IMX=y
-CONFIG_I2C_LP3972=y
+CONFIG_MFD_LP3972=y
 CONFIG_DRIVER_CFI=y
 # CONFIG_DRIVER_CFI_AMD is not set
 # CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set

arch/arm/configs/omap3530_beagle_defconfig

@@ -80,7 +80,7 @@ CONFIG_USB_TWL4030=y
 CONFIG_MCI=y
 CONFIG_MCI_STARTUP=y
 CONFIG_MCI_OMAP_HSMMC=y
-CONFIG_I2C_TWL4030=y
+CONFIG_MFD_TWL4030=y
 CONFIG_FS_TFTP=y
 CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y

arch/arm/configs/pcm049_defconfig

@@ -64,7 +64,7 @@ CONFIG_USB=y
 CONFIG_MCI=y
 CONFIG_MCI_STARTUP=y
 CONFIG_MCI_OMAP_HSMMC=y
-CONFIG_I2C_TWL6030=y
+CONFIG_MFD_TWL6030=y
 CONFIG_FS_TFTP=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y

arch/arm/mach-at91/Makefile

@@ -12,9 +12,7 @@ lowlevel_init-$(CONFIG_SOC_AT91SAM9X5) += at91sam9x5_lowlevel_init.o
 lowlevel_init-$(CONFIG_SOC_AT91SAM9N12) += at91sam9n12_lowlevel_init.o
 lowlevel_init-$(CONFIG_ARCH_AT91RM9200) = at91rm9200_lowlevel_init.o
 lowlevel_init-$(CONFIG_ARCH_SAMA5D3) += sama5d3_lowlevel_init.o
-obj-y += $(lowlevel_init-y)
-
-pbl-y += $(lowlevel_init-y)
+lwl-y += $(lowlevel_init-y)
 
 obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o
 obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o

arch/arm/mach-ep93xx/Makefile

@@ -1,4 +1,3 @@
-obj-y += clocksource.o gpio.o led.o header.o
+obj-y += clocksource.o gpio.o header.o
 
-obj-y += lowlevel_init.o
-pbl-y += lowlevel_init.o led.o
+lwl-y += lowlevel_init.o led.o

arch/arm/mach-imx/Kconfig

@@ -249,7 +249,7 @@ config MACH_EUKREA_CPUIMX25
 config MACH_FREESCALE_MX25_3STACK
 	bool "Freescale MX25 3stack"
 	select I2C
-	select I2C_MC34704
+	select MFD_MC34704
 	help
 	  Say Y here if you are using the Freescale MX25 3stack board equipped
 	  with a Freescale i.MX25 Processor
@@ -357,7 +357,7 @@ config MACH_FREESCALE_MX35_3STACK
 	select I2C
 	select I2C_IMX
 	select MFD_MC13XXX
-	select I2C_MC9SDZ60
+	select MFD_MC9SDZ60
 	help
 	  Say Y here if you are using the Freescale MX35 3stack board equipped
 	  with a Freescale i.MX35 Processor

arch/arm/mach-imx/Makefile

@@ -11,11 +11,7 @@ pbl-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o esdctl-v4.o
 obj-$(CONFIG_ARCH_IMX6) += imx6.o iomux-v3.o usb-imx6.o clk-imx6.o
 obj-$(CONFIG_IMX_IIM)	+= iim.o
 obj-$(CONFIG_NAND_IMX) += nand.o
-ifdef CONFIG_PBL_IMAGE
-pbl-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o
-else
-obj-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o
-endif
+lwl-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o
 obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-pfd.o
 obj-y += devices.o imx.o esdctl.o
 obj-y += boot.o

arch/arm/mach-omap/Makefile

@@ -28,6 +28,6 @@ obj-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock.o
 pbl-$(CONFIG_OMAP3_CLOCK_CONFIG) += omap3_clock.o
 obj-$(CONFIG_OMAP_GPMC) += gpmc.o devices-gpmc-nand.o
 obj-$(CONFIG_SHELL_NONE) += xload.o
-obj-$(CONFIG_I2C_TWL6030) += omap4_twl6030_mmc.o
+obj-$(CONFIG_MFD_TWL6030) += omap4_twl6030_mmc.o
 obj-$(CONFIG_OMAP4_USBBOOT) += omap4_rom_usb.o
 obj-y += gpio.o

arch/sandbox/board/hostfile.c

@@ -89,13 +89,7 @@ static struct driver_d hf_drv = {
 	.probe = hf_probe,
 	.info  = hf_info,
 };
-
-static int hf_init(void)
-{
-	return platform_driver_register(&hf_drv);
-}
-
-device_initcall(hf_init);
+device_platform_driver(hf_drv);
 
 int barebox_register_filedev(struct hf_platform_data *hf)
 {

commands/nandtest.c

@@ -42,42 +42,18 @@ static unsigned int ecc_stats[MAX_ECC_BITS];
 static unsigned int ecc_stats_over;
 static unsigned int ecc_failed_cnt;
 
-/*
- * Implementation of pread with lseek and read.
- */
-static ssize_t pread(int fd, void *buf, size_t count, loff_t offset)
-{
-	int ret;
-
-	/* Seek to offset */
-	ret = lseek(fd, offset, SEEK_SET);
-	if (ret < 0)
-		perror("lseek");
-
-	/* Read from flash and put it into buf  */
-	ret = read(fd, buf, count);
-	if (ret < 0)
-		perror("read");
-
-	return 0;
-}
-
 /*
  * Implementation of pwrite with lseek and write.
  */
-static ssize_t pwrite(int fd, const void *buf,
+static ssize_t __pwrite(int fd, const void *buf,
 		size_t count, loff_t offset, loff_t length)
 {
-	int ret;
-
-	ret = lseek(fd, offset, SEEK_SET);
-	if (ret < 0)
-		perror("lseek");
+	ssize_t ret;
 
 	/* Write buf to flash */
-	ret = write(fd, buf, count);
+	ret = pwrite(fd, buf, count, offset);
 	if (ret < 0) {
-		perror("write");
+		perror("pwrite");
 		if (markbad) {
 			printf("\nMark block bad at 0x%08llx\n",
 					offset + memregion.offset);
@@ -88,7 +64,7 @@ static ssize_t pwrite(int fd, const void *buf,
 	}
 
 	flush(fd);
-	return 0;
+	return ret;
 }
 
 /*
@@ -119,7 +95,7 @@ static int erase_and_write(loff_t ofs, unsigned char *data,
 	for (i = 0; i < meminfo.erasesize;
 			i += meminfo.writesize) {
 		/* Write data to given offset */
-		pwrite(fd, data + i, meminfo.writesize,
+		__pwrite(fd, data + i, meminfo.writesize,
 				ofs + i, length);
 
 		/* Read data from offset */
@@ -136,7 +112,7 @@ static int erase_and_write(loff_t ofs, unsigned char *data,
 					newstats.corrected - oldstats.corrected,
 					ofs + memregion.offset + i);
 			init_progression_bar(length);
-			show_progress(ofs);
+			show_progress(ofs + i);
 			if ((newstats.corrected-oldstats.corrected) >=
 					MAX_ECC_BITS) {
 				/* Increment ECC stats that
@@ -154,7 +130,7 @@ static int erase_and_write(loff_t ofs, unsigned char *data,
 			printf("\nECC failed at page 0x%08llx\n",
 					ofs + memregion.offset + i);
 			init_progression_bar(length);
-			show_progress(ofs);
+			show_progress(ofs + i);
 			oldstats.failed = newstats.failed;
 			ecc_failed_cnt++;
 		}
@@ -316,8 +292,8 @@ static int do_nandtest(int argc, char *argv[])
 
 	for (iter = 0; iter < nr_iterations; iter++) {
 		init_progression_bar(length);
-		for (test_ofs = flash_offset;
-				test_ofs < flash_offset + length;
+		for (test_ofs = 0;
+				test_ofs < length;
 				test_ofs += meminfo.erasesize) {
 			show_progress(test_ofs);
 			srand(seed);

common/hush.c

@@ -335,6 +335,19 @@ static int b_addchr(o_string *o, int ch)
 	return 0;
 }
 
+static int b_addstr(o_string *o, const char *str)
+{
+	int ret;
+
+	while (*str) {
+		ret = b_addchr(o, *str++);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
 static void b_reset(o_string *o)
 {
 	o->length = 0;
@@ -782,7 +795,8 @@ static int run_pipe_real(struct p_context *ctx, struct pipe *pi)
 
 	remove_quotes(globbuf.gl_pathc, globbuf.gl_pathv);
 
-	if (!strcmp(globbuf.gl_pathv[0], "getopt")) {
+	if (!strcmp(globbuf.gl_pathv[0], "getopt") &&
+			IS_ENABLED(CONFIG_HUSH_GETOPT)) {
 		ret = builtin_getopt(ctx, child, globbuf.gl_pathc, globbuf.gl_pathv);
 	} else if (!strcmp(globbuf.gl_pathv[0], "exit")) {
 		ret = builtin_exit(ctx, child, globbuf.gl_pathc, globbuf.gl_pathv);
@@ -1406,6 +1420,14 @@ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *i
 			}
 			b_addchr(dest, SPECIAL_VAR_SYMBOL);
 			break;
+		case '*':
+			for (i = 1; i < ctx->global_argc; i++) {
+				b_addstr(dest, ctx->global_argv[i]);
+				b_addchr(dest, ' ');
+			}
+
+			advance = 1;
+			break;
 		default:
 			b_addchr(dest, '$');
 		}

defaultenv-2/base/bin/init

@@ -13,6 +13,7 @@ global linux.bootargs.dyn.ip
 global linux.bootargs.dyn.root
 global editcmd=sedit
 
+/env/config-board
 /env/config
 
 if [ -e /env/menu ]; then

defaultenv-2/base/config

@@ -6,16 +6,16 @@
 #global.hostname=
 
 # set to false if you do not want to have colors
-global.allow_color=true
+#global.allow_color=true
 
 # user (used for network filenames)
-global.user=none
+#global.user=none
 
 # timeout in seconds before the default boot entry is started
-global.autoboot_timeout=3
+#global.autoboot_timeout=3
 
 # default boot entry (one of /env/boot/*)
-global.boot.default=net
+#global.boot.default=net
 
 # base bootargs
 #global.linux.bootargs.base="console=ttyS0,115200"

drivers/ata/Kconfig

@@ -38,6 +38,7 @@ config DISK_AHCI
 	select DISK_DRIVE
 
 config DISK_AHCI_IMX
+	depends on ARCH_IMX
 	depends on DISK_AHCI
 	bool "i.MX AHCI support"
 

drivers/ata/ahci.c

@@ -685,10 +685,4 @@ static struct driver_d ahci_driver = {
 	.info	= ahci_info,
 	.of_compatible = DRV_OF_COMPAT(ahci_dt_ids),
 };
-
-static int ahci_init(void)
-{
-	return platform_driver_register(&ahci_driver);
-}
-
-device_initcall(ahci_init);
+device_platform_driver(ahci_driver);

drivers/ata/intf_platform_ide.c

@@ -108,13 +108,7 @@ static struct driver_d platform_ide_driver = {
 	.name   = "ide_intf",
 	.probe  = platform_ide_probe,
 };
-
-static int platform_ide_init(void)
-{
-	return platform_driver_register(&platform_ide_driver);
-}
-
-device_initcall(platform_ide_init);
+device_platform_driver(platform_ide_driver);
 
 /**
  * @file

drivers/ata/pata-imx.c

@@ -194,10 +194,4 @@ static struct driver_d imx_pata_driver = {
 	.name   = "imx-pata",
 	.probe  = imx_pata_probe,
 };
-
-static int imx_pata_init(void)
-{
-	return platform_driver_register(&imx_pata_driver);
-}
-
-device_initcall(imx_pata_init);
+device_platform_driver(imx_pata_driver);

drivers/ata/sata-imx.c

@@ -146,10 +146,4 @@ static struct driver_d imx_sata_driver = {
 	.info	= ahci_info,
 	.id_table = imx_sata_ids,
 };
-
-static int ahci_init(void)
-{
-	return platform_driver_register(&imx_sata_driver);
-}
-
-device_initcall(ahci_init);
+device_platform_driver(imx_sata_driver);

drivers/base/driver.c

@@ -230,7 +230,7 @@ int register_driver(struct driver_d *drv)
 }
 EXPORT_SYMBOL(register_driver);
 
-static struct resource *dev_get_resource(struct device_d *dev, int num)
+struct resource *dev_get_resource(struct device_d *dev, int num)
 {
 	int i, n = 0;
 

drivers/gpio/Kconfig

@@ -17,7 +17,7 @@ config GPIO_PL061
 	  Say yes here to support the PrimeCell PL061 GPIO device
 
 config GPIO_STMPE
-	depends on I2C_STMPE
+	depends on MFD_STMPE
 	bool "STMPE GPIO Expander"
 endmenu
 

drivers/i2c/busses/i2c-gpio.c

@@ -169,9 +169,4 @@ static struct driver_d i2c_gpio_driver = {
 	.name	= "i2c-gpio",
 	.probe	= i2c_gpio_probe,
 };
-
-static int __init i2c_gpio_init(void)
-{
-	return platform_driver_register(&i2c_gpio_driver);
-}
-device_initcall(i2c_gpio_init);
+device_platform_driver(i2c_gpio_driver);