[PATCH 1/5] pbl: let pbl-console depend on !CONSOLE_NONE

[PATCH 1/5] pbl: let pbl-console depend on !CONSOLE_NONE

[Lucas Stach]

It doesn't make much sense to have a console in the pbl
but not in the main barebox binary.

Fixes:
pbl/console.c:34:5: error: redefinition of 'ctrlc'
include/stdio.h:60:19: note: previous definition of 'ctrlc' was here

pbl/console.c:39:6: error: redefinition of 'console_putc'
include/stdio.h:49:20: note: previous definition of 'console_putc' was here

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

diff --git a/common/Kconfig b/common/Kconfig
index cf197076dbab..74d5c4d12a39 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -886,6 +886,7 @@ config DEBUG_INITCALLS
 
 config PBL_CONSOLE
 	depends on DEBUG_LL
+	depends on !CONSOLE_NONE
 	bool "Enable console support in PBL"
 	help
 	  This enables printf/pr_* support in the PBL to get more
-- 
2.1.4


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

[PATCH 2/5] ARM: versatile: provide clk_set_rate stub

[Lucas Stach]

Some drivers depend on this symbol and this fixes a failure
to link them.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-versatile/core.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 253e408db9ad..c671aa6173fa 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -57,6 +57,12 @@ unsigned long clk_get_rate(struct clk *clk)
 EXPORT_SYMBOL(clk_get_rate);
 
 /* enable and disable do nothing */
+int clk_set_rate(struct clk *clk, unsigned long rate)
+{
+	return 0;
+}
+EXPORT_SYMBOL(clk_set_rate);
+
 int clk_enable(struct clk *clk)
 {
 	return 0;
-- 
2.1.4


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

[PATCH 3/5] ARM: zynq: zedboard: don't select serial

[Lucas Stach]

Selecting the serial driver breaks the build with CONFIG_SERIAL_NONE.
Move it to the defconfig of the board instead, like we do on other
boards.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/configs/zedboard_defconfig | 36 +++++++++++++++++-------------------
 arch/arm/mach-zynq/Kconfig          |  1 -
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/arch/arm/configs/zedboard_defconfig b/arch/arm/configs/zedboard_defconfig
index 73684183362a..9ce7c5ab12d3 100644
--- a/arch/arm/configs/zedboard_defconfig
+++ b/arch/arm/configs/zedboard_defconfig
@@ -1,6 +1,5 @@
 CONFIG_ARCH_ZYNQ=y
 CONFIG_AEABI=y
-CONFIG_CMD_ARM_MMUINFO=y
 CONFIG_ARM_UNWIND=y
 CONFIG_PBL_IMAGE=y
 CONFIG_MMU=y
@@ -8,7 +7,6 @@ CONFIG_STACK_SIZE=0xf000
 CONFIG_MALLOC_SIZE=0x8000000
 CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
-CONFIG_LONGHELP=y
 CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
@@ -17,32 +15,32 @@ CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/avnet-zedboard/env"
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_LL=y
-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_MENU=y
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_DIRNAME=y
-CONFIG_CMD_LN=y
-CONFIG_CMD_READLINK=y
+CONFIG_LONGHELP=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_OFTREE_PROBE=y
-CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_RESET=y
 CONFIG_CMD_PARTITION=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_LN=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_MENU=y
+CONFIG_CMD_MENU_MANAGEMENT=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_CLK=y
+CONFIG_CMD_OFTREE=y
+CONFIG_CMD_TIME=y
 CONFIG_NET=y
-CONFIG_CMD_DHCP=y
+CONFIG_DRIVER_SERIAL_CADENCE=y
 # CONFIG_SPI is not set
 CONFIG_FS_TFTP=y
 CONFIG_DIGEST=y
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 6d02cb28cadc..d35bd41232a1 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -28,7 +28,6 @@ choice
 
 config MACH_ZEDBOARD
 	bool "Avnet Zynq-7000 ZedBoard"
-	select DRIVER_SERIAL_CADENCE
 
 endchoice
 endif
-- 
2.1.4


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

[PATCH 4/5] ARM: radxa-rock: select options for regulator

[Lucas Stach]

Fixes the build with a minimal config while maintaining
functionality of the board.

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

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 9c9eed0559c9..ea4361d44e30 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -7,6 +7,8 @@ config ARCH_TEXT_BASE
 comment "select Rockchip boards:"
 
 config MACH_RADXA_ROCK
+	select I2C
+	select MFD_ACT8846
 	bool "Radxa rock board"
 
 endif
-- 
2.1.4


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

[PATCH 5/5] ARM: highbank: fix Thumb build

[Lucas Stach]

Note: this only fixes the build failure, I haven't actually tested
if it works.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-highbank/smc.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-highbank/smc.S b/arch/arm/mach-highbank/smc.S
index b2118b4a84bf..cc932a393166 100644
--- a/arch/arm/mach-highbank/smc.S
+++ b/arch/arm/mach-highbank/smc.S
@@ -18,6 +18,7 @@
  */
 
 ENTRY(highbank_smc1)
+	.arch_extension sec
 	stmfd	sp!, {r4-r11, lr}
 	mov	r12, r0
 	mov	r0, r1
-- 
2.1.4


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

Re: [PATCH 5/5] ARM: highbank: fix Thumb build

[Sascha Hauer]

On Tue, Mar 10, 2015 at 08:59:08PM +0100, Lucas Stach wrote:
> Note: this only fixes the build failure, I haven't actually tested
> if it works.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/mach-highbank/smc.S | 1 +
>  1 file changed, 1 insertion(+)

Applied all but this one.

Could you tell us more about the build failure? It builds fine here with
thumb2 enabled.

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

Re: [PATCH 5/5] ARM: highbank: fix Thumb build

[Lucas Stach]

Am Mittwoch, den 11.03.2015, 09:38 +0100 schrieb Sascha Hauer:
> On Tue, Mar 10, 2015 at 08:59:08PM +0100, Lucas Stach wrote:
> > Note: this only fixes the build failure, I haven't actually tested
> > if it works.
> > 
> > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > ---
> >  arch/arm/mach-highbank/smc.S | 1 +
> >  1 file changed, 1 insertion(+)
> 
> Applied all but this one.
> 
> Could you tell us more about the build failure? It builds fine here with
> thumb2 enabled.
> 
The failure is this one:
Error: selected processor does not support Thumb mode `smc #0' 

Now looking at this again it may not only hit the Thumb build, but also
normal ARM mode builds. The check that is triggered here was only later
introduced into binutils, I can't really point at a specific version
though.

So you may not see this error depending on your toolchain version.

Regards,
Lucas
-- 
Pengutronix e.K.             | Lucas Stach                 |
Industrial Linux Solutions   | http://www.pengutronix.de/  |


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