* [PATCH 1/2] serial-imx: fix for non of usage
@ 2014-09-22 22:13 Eric Bénard
2014-09-22 22:13 ` [PATCH 2/2] eukrea-cpuimx35: refresh configuration Eric Bénard
2014-09-23 6:04 ` [PATCH 1/2] serial-imx: fix for non of usage Sascha Hauer
0 siblings, 2 replies; 5+ messages in thread
From: Eric Bénard @ 2014-09-22 22:13 UTC (permalink / raw)
To: barebox
this was broken by :
"3843bfd serial: imx: Determine device name from device tree"
Tested on an i.MX35.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
drivers/serial/serial_imx.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index 474bfaf..e97fd2f 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -338,10 +338,11 @@ static int imx_serial_probe(struct device_d *dev)
cdev->flush = imx_serial_flush;
cdev->setbrg = imx_serial_setbaudrate;
cdev->linux_console_name = "ttymxc";
- devname = of_alias_get(dev->device_node);
- if (devname)
- cdev->devname = xstrdup(devname);
-
+ if (dev->device_node) {
+ devname = of_alias_get(dev->device_node);
+ if (devname)
+ cdev->devname = xstrdup(devname);
+ }
imx_serial_init_port(cdev);
/* Enable UART */
@@ -352,7 +353,6 @@ static int imx_serial_probe(struct device_d *dev)
console_register(cdev);
priv->notify.notifier_call = imx_clocksource_clock_change;
clock_register_client(&priv->notify);
-
return 0;
err_free:
--
1.9.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] eukrea-cpuimx35: refresh configuration
2014-09-22 22:13 [PATCH 1/2] serial-imx: fix for non of usage Eric Bénard
@ 2014-09-22 22:13 ` Eric Bénard
2014-09-23 6:05 ` Sascha Hauer
2014-09-23 6:04 ` [PATCH 1/2] serial-imx: fix for non of usage Sascha Hauer
1 sibling, 1 reply; 5+ messages in thread
From: Eric Bénard @ 2014-09-22 22:13 UTC (permalink / raw)
To: barebox
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
arch/arm/configs/eukrea_cpuimx35_defconfig | 61 ++++++++++++++++++------------
1 file changed, 36 insertions(+), 25 deletions(-)
diff --git a/arch/arm/configs/eukrea_cpuimx35_defconfig b/arch/arm/configs/eukrea_cpuimx35_defconfig
index 7569cde..4c83102 100644
--- a/arch/arm/configs/eukrea_cpuimx35_defconfig
+++ b/arch/arm/configs/eukrea_cpuimx35_defconfig
@@ -1,71 +1,81 @@
CONFIG_ARCH_IMX=y
-CONFIG_CACHE_L2X0=y
-CONFIG_ARCH_IMX35=y
+CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000
CONFIG_MACH_EUKREA_CPUIMX35=y
CONFIG_IMX_IIM=y
CONFIG_IMX_IIM_FUSE_BLOW=y
CONFIG_AEABI=y
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
+CONFIG_PBL_IMAGE=y
+CONFIG_PBL_RELOCATABLE=y
CONFIG_MMU=y
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000
CONFIG_MALLOC_SIZE=0x800000
CONFIG_EXPERIMENTAL=y
CONFIG_MALLOC_TLSF=y
-CONFIG_LONGHELP=y
+CONFIG_RELOCATABLE=y
CONFIG_GLOB=y
CONFIG_HUSH_FANCY_PROMPT=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
CONFIG_CONSOLE_ACTIVATE_ALL=y
+CONFIG_DEFAULT_COMPRESSION_LZO=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/eukrea_cpuimx35/env"
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_AUTOMOUNT=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_LOADB=y
-CONFIG_CMD_MEMINFO=y
+CONFIG_LONGHELP=y
CONFIG_CMD_IOMEM=y
-CONFIG_CMD_MTEST=y
-CONFIG_CMD_FLASH=y
+CONFIG_CMD_IMD=y
+CONFIG_CMD_MEMINFO=y
CONFIG_CMD_BOOTM_SHOW_TYPE=y
CONFIG_CMD_BOOTM_VERBOSE=y
CONFIG_CMD_BOOTM_INITRD=y
CONFIG_CMD_BOOTM_OFTREE=y
CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y
-CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_LOADB=y
+CONFIG_CMD_RESET=y
CONFIG_CMD_PARTITION=y
+CONFIG_CMD_AUTOMOUNT=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_LOADENV=y
+CONFIG_CMD_PRINTENV=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_UNCOMPRESS=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MIITOOL=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_TFTP=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_EDIT=y
CONFIG_CMD_SPLASH=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MM=y
+CONFIG_CMD_CLK=y
+CONFIG_CMD_DETECT=y
+CONFIG_CMD_FLASH=y
CONFIG_CMD_GPIO=y
-CONFIG_CMD_UNCOMPRESS=y
CONFIG_CMD_I2C=y
CONFIG_CMD_LED=y
CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_USBGADGET=y
+CONFIG_CMD_OFTREE=y
CONFIG_NET=y
-CONFIG_CMD_DHCP=y
CONFIG_NET_NFS=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_TFTP=y
-CONFIG_FS_TFTP=y
CONFIG_NET_NETCONSOLE=y
CONFIG_DRIVER_NET_FEC_IMX=y
+CONFIG_SMSC_PHY=y
# CONFIG_SPI is not set
CONFIG_I2C=y
CONFIG_I2C_IMX=y
CONFIG_MTD=y
CONFIG_MTD_RAW_DEVICE=y
CONFIG_NAND=y
+CONFIG_NAND_ALLOW_ERASE_BAD=y
CONFIG_NAND_IMX=y
+CONFIG_NAND_IMX_BBM=y
CONFIG_USB_HOST=y
CONFIG_USB_EHCI=y
CONFIG_USB_STORAGE=y
@@ -79,6 +89,7 @@ CONFIG_MCI_IMX_ESDHC=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_LED_TRIGGERS=y
+CONFIG_FS_TFTP=y
CONFIG_FS_FAT=y
CONFIG_FS_FAT_WRITE=y
CONFIG_FS_FAT_LFN=y
--
1.9.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] serial-imx: fix for non of usage
2014-09-22 22:13 [PATCH 1/2] serial-imx: fix for non of usage Eric Bénard
2014-09-22 22:13 ` [PATCH 2/2] eukrea-cpuimx35: refresh configuration Eric Bénard
@ 2014-09-23 6:04 ` Sascha Hauer
2014-09-23 6:15 ` Eric Bénard
1 sibling, 1 reply; 5+ messages in thread
From: Sascha Hauer @ 2014-09-23 6:04 UTC (permalink / raw)
To: Eric Bénard; +Cc: barebox
Hi Eric,
On Tue, Sep 23, 2014 at 12:13:34AM +0200, Eric Bénard wrote:
> this was broken by :
> "3843bfd serial: imx: Determine device name from device tree"
>
> Tested on an i.MX35.
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
This is already fixed by:
commit dc82bce50b6d7050c8a65682f5ea4078b293f171
Author: Philipp Zabel <p.zabel@pengutronix.de>
Date: Fri Aug 15 11:10:03 2014 +0200
serial: imx: Fix for non-devicetree boards
Commit 3843bfd0ab77eaf125ca617922927b61fc8ded74
"serial: imx: Determine device name from device tree"
broke this driver for non-devicetree boards, since
of_alias_get may not be called with a NULL pointer
as first argument.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
It is contained in master and in the stable/v2014.09 branch.
Unfortunately it's broken in the last release.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] eukrea-cpuimx35: refresh configuration
2014-09-22 22:13 ` [PATCH 2/2] eukrea-cpuimx35: refresh configuration Eric Bénard
@ 2014-09-23 6:05 ` Sascha Hauer
0 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2014-09-23 6:05 UTC (permalink / raw)
To: Eric Bénard; +Cc: barebox
On Tue, Sep 23, 2014 at 12:13:35AM +0200, Eric Bénard wrote:
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
> arch/arm/configs/eukrea_cpuimx35_defconfig | 61 ++++++++++++++++++------------
> 1 file changed, 36 insertions(+), 25 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/configs/eukrea_cpuimx35_defconfig b/arch/arm/configs/eukrea_cpuimx35_defconfig
> index 7569cde..4c83102 100644
> --- a/arch/arm/configs/eukrea_cpuimx35_defconfig
> +++ b/arch/arm/configs/eukrea_cpuimx35_defconfig
> @@ -1,71 +1,81 @@
> CONFIG_ARCH_IMX=y
> -CONFIG_CACHE_L2X0=y
> -CONFIG_ARCH_IMX35=y
> +CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000
> CONFIG_MACH_EUKREA_CPUIMX35=y
> CONFIG_IMX_IIM=y
> CONFIG_IMX_IIM_FUSE_BLOW=y
> CONFIG_AEABI=y
> CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
> +CONFIG_PBL_IMAGE=y
> +CONFIG_PBL_RELOCATABLE=y
> CONFIG_MMU=y
> -CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000
> CONFIG_MALLOC_SIZE=0x800000
> CONFIG_EXPERIMENTAL=y
> CONFIG_MALLOC_TLSF=y
> -CONFIG_LONGHELP=y
> +CONFIG_RELOCATABLE=y
> CONFIG_GLOB=y
> CONFIG_HUSH_FANCY_PROMPT=y
> CONFIG_CMDLINE_EDITING=y
> CONFIG_AUTO_COMPLETE=y
> -# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
> CONFIG_CONSOLE_ACTIVATE_ALL=y
> +CONFIG_DEFAULT_COMPRESSION_LZO=y
> CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
> CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/eukrea_cpuimx35/env"
> -CONFIG_CMD_EDIT=y
> -CONFIG_CMD_SLEEP=y
> -CONFIG_CMD_SAVEENV=y
> -CONFIG_CMD_EXPORT=y
> -CONFIG_CMD_PRINTENV=y
> -CONFIG_CMD_READLINE=y
> -CONFIG_CMD_AUTOMOUNT=y
> -CONFIG_CMD_ECHO_E=y
> -CONFIG_CMD_LOADB=y
> -CONFIG_CMD_MEMINFO=y
> +CONFIG_LONGHELP=y
> CONFIG_CMD_IOMEM=y
> -CONFIG_CMD_MTEST=y
> -CONFIG_CMD_FLASH=y
> +CONFIG_CMD_IMD=y
> +CONFIG_CMD_MEMINFO=y
> CONFIG_CMD_BOOTM_SHOW_TYPE=y
> CONFIG_CMD_BOOTM_VERBOSE=y
> CONFIG_CMD_BOOTM_INITRD=y
> CONFIG_CMD_BOOTM_OFTREE=y
> CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y
> -CONFIG_CMD_RESET=y
> CONFIG_CMD_GO=y
> -CONFIG_CMD_OFTREE=y
> -CONFIG_CMD_TIMEOUT=y
> +CONFIG_CMD_LOADB=y
> +CONFIG_CMD_RESET=y
> CONFIG_CMD_PARTITION=y
> +CONFIG_CMD_AUTOMOUNT=y
> +CONFIG_CMD_EXPORT=y
> +CONFIG_CMD_LOADENV=y
> +CONFIG_CMD_PRINTENV=y
> CONFIG_CMD_MAGICVAR=y
> CONFIG_CMD_MAGICVAR_HELP=y
> +CONFIG_CMD_SAVEENV=y
> +CONFIG_CMD_UNCOMPRESS=y
> +CONFIG_CMD_SLEEP=y
> +CONFIG_CMD_DHCP=y
> +CONFIG_CMD_MIITOOL=y
> +CONFIG_CMD_PING=y
> +CONFIG_CMD_TFTP=y
> +CONFIG_CMD_ECHO_E=y
> +CONFIG_CMD_EDIT=y
> CONFIG_CMD_SPLASH=y
> +CONFIG_CMD_READLINE=y
> +CONFIG_CMD_TIMEOUT=y
> +CONFIG_CMD_MEMTEST=y
> +CONFIG_CMD_MM=y
> +CONFIG_CMD_CLK=y
> +CONFIG_CMD_DETECT=y
> +CONFIG_CMD_FLASH=y
> CONFIG_CMD_GPIO=y
> -CONFIG_CMD_UNCOMPRESS=y
> CONFIG_CMD_I2C=y
> CONFIG_CMD_LED=y
> CONFIG_CMD_LED_TRIGGER=y
> +CONFIG_CMD_USBGADGET=y
> +CONFIG_CMD_OFTREE=y
> CONFIG_NET=y
> -CONFIG_CMD_DHCP=y
> CONFIG_NET_NFS=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_TFTP=y
> -CONFIG_FS_TFTP=y
> CONFIG_NET_NETCONSOLE=y
> CONFIG_DRIVER_NET_FEC_IMX=y
> +CONFIG_SMSC_PHY=y
> # CONFIG_SPI is not set
> CONFIG_I2C=y
> CONFIG_I2C_IMX=y
> CONFIG_MTD=y
> CONFIG_MTD_RAW_DEVICE=y
> CONFIG_NAND=y
> +CONFIG_NAND_ALLOW_ERASE_BAD=y
> CONFIG_NAND_IMX=y
> +CONFIG_NAND_IMX_BBM=y
> CONFIG_USB_HOST=y
> CONFIG_USB_EHCI=y
> CONFIG_USB_STORAGE=y
> @@ -79,6 +89,7 @@ CONFIG_MCI_IMX_ESDHC=y
> CONFIG_LED=y
> CONFIG_LED_GPIO=y
> CONFIG_LED_TRIGGERS=y
> +CONFIG_FS_TFTP=y
> CONFIG_FS_FAT=y
> CONFIG_FS_FAT_WRITE=y
> CONFIG_FS_FAT_LFN=y
> --
> 1.9.3
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] serial-imx: fix for non of usage
2014-09-23 6:04 ` [PATCH 1/2] serial-imx: fix for non of usage Sascha Hauer
@ 2014-09-23 6:15 ` Eric Bénard
0 siblings, 0 replies; 5+ messages in thread
From: Eric Bénard @ 2014-09-23 6:15 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
Hi Sascha,
Le Tue, 23 Sep 2014 08:04:45 +0200,
Sascha Hauer <s.hauer@pengutronix.de> a écrit :
> This is already fixed by:
>
> commit dc82bce50b6d7050c8a65682f5ea4078b293f171
> Author: Philipp Zabel <p.zabel@pengutronix.de>
> Date: Fri Aug 15 11:10:03 2014 +0200
>
> serial: imx: Fix for non-devicetree boards
>
> Commit 3843bfd0ab77eaf125ca617922927b61fc8ded74
> "serial: imx: Determine device name from device tree"
> broke this driver for non-devicetree boards, since
> of_alias_get may not be called with a NULL pointer
> as first argument.
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
>
> It is contained in master and in the stable/v2014.09 branch.
> Unfortunately it's broken in the last release.
>
ok stupid me I checked out the v2014.09.0 tag but not the v2014.09
branch
Thanks
Eric
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-23 6:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-22 22:13 [PATCH 1/2] serial-imx: fix for non of usage Eric Bénard
2014-09-22 22:13 ` [PATCH 2/2] eukrea-cpuimx35: refresh configuration Eric Bénard
2014-09-23 6:05 ` Sascha Hauer
2014-09-23 6:04 ` [PATCH 1/2] serial-imx: fix for non of usage Sascha Hauer
2014-09-23 6:15 ` Eric Bénard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox