[PATCH 1/4] usb: gadget: serial: only call into CONSOLE_FULL code if it's there

[PATCH 1/4] usb: gadget: serial: only call into CONSOLE_FULL code if it's there

[Lucas Stach]

From: Lucas Stach <dev@lynxeye.de>

Fixes:
drivers/built-in.o: In function `gserial_connect':
drivers/usb/gadget/u_serial.c:539: undefined reference to `console_set_active'

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
 drivers/usb/gadget/u_serial.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
index 2b0faf33037e..140346e77028 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -536,8 +536,9 @@ int gserial_connect(struct gserial *gser, u8 port_num)
 	if (status)
 		goto fail_out;
 
-	console_set_active(cdev, CONSOLE_STDIN | CONSOLE_STDOUT |
-		CONSOLE_STDERR);
+	if (IS_ENABLED(CONFIG_CONSOLE_FULL))
+		console_set_active(cdev, CONSOLE_STDIN | CONSOLE_STDOUT |
+				   CONSOLE_STDERR);
 
 	/* REVISIT if waiting on "carrier detect", signal. */
 
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/4] ARM: pxa: move mainstone TEXTBASE to Kconfig

[Lucas Stach]

From: Lucas Stach <dev@lynxeye.de>

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

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
 arch/arm/configs/mainstone_defconfig | 1 -
 arch/arm/mach-pxa/Kconfig            | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig
index 946902d200ee..1e735d4a6dbb 100644
--- a/arch/arm/configs/mainstone_defconfig
+++ b/arch/arm/configs/mainstone_defconfig
@@ -7,7 +7,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 2b7f631757b7..54094f4ca0ed 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -5,6 +5,7 @@ config ARCH_TEXT_BASE
 	default 0xa0000000 if MACH_MIOA701
 	default 0xa3f00000 if MACH_PCM027
 	default 0xa3d00000 if MACH_LUBBOCK
+	default 0xa3d00000 if MACH_MAINSTONE
 	default 0x83f00000 if MACH_ZYLONITE
 
 # ----------------------------------------------------------
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/4] ARM: rockchip: depend on OFTREE

[Lucas Stach]

From: Lucas Stach <dev@lynxeye.de>

The current supported Rockchip board is initialized from a
builtin DTB and I suppose all future boards will do the same.

Fixes various missing functions and prototypes in Rockchip clk
driver.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
 arch/arm/Kconfig                    | 1 +
 arch/arm/configs/rockchip_defconfig | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 50f30958bac8..ef7b60d16819 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -158,6 +158,7 @@ config ARCH_ROCKCHIP
 	select GPIOLIB
 	select PINCTRL
 	select PINCTRL_ROCKCHIP
+	select OFTREE
 	select HAVE_PBL_MULTI_IMAGES
 	select HAS_DEBUG_LL
 	select ARCH_HAS_L2X0
diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index e08699d1f549..b738620c68f4 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -80,14 +80,12 @@ CONFIG_OF_BAREBOX_DRIVERS=y
 CONFIG_DRIVER_SERIAL_NS16550=y
 CONFIG_DRIVER_NET_ARC_EMAC=y
 CONFIG_SMSC_PHY=y
-CONFIG_I2C=y
 CONFIG_I2C_GPIO=y
 CONFIG_MCI=y
 CONFIG_MCI_STARTUP=y
 CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 CONFIG_MCI_DW=y
 CONFIG_MCI_DW_PIO=y
-CONFIG_MFD_ACT8846=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_LED_GPIO_OF=y
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/4] ARM: don't allow Thumb2 on AT91

[Lucas Stach]

AT91 has a custom barebox head that doesn't support Thumb2.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ef7b60d16819..d836f66854d9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -279,7 +279,7 @@ config AEABI
 config THUMB2_BAREBOX
 	select ARM_ASM_UNIFIED
 	select AEABI
-	depends on !ARCH_TEGRA
+	depends on !ARCH_TEGRA && !ARCH_AT91
 	depends on CPU_V7 && !CPU_32v4T && !CPU_32v5 && !CPU_32v6
 	bool "Compile barebox in thumb-2 mode (read help)"
 	help
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/4] usb: gadget: serial: only call into CONSOLE_FULL code if it's there

[Sascha Hauer]

On Thu, Jul 23, 2015 at 11:56:50AM +0200, Lucas Stach wrote:
> From: Lucas Stach <dev@lynxeye.de>
> 
> Fixes:
> drivers/built-in.o: In function `gserial_connect':
> drivers/usb/gadget/u_serial.c:539: undefined reference to `console_set_active'
> 
> Signed-off-by: Lucas Stach <dev@lynxeye.de>

Applied, thanks

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