Add support for MB86R0x SoCs

This patchset adds support for MB86R0x SoC familiy from Fujitsu, its built in lcd controller and a first board using the MB86R01.

Changes since V1
- Used C structs for addressing instead of base + offset
- Moved offsets for assmebler code to asm-offsets.h
- Moved some dublicated sections of code to functions

Matthias Weisser (3):
arm: Add support for MB86R0x SoCs
video: add support for display controller in MB86R0x SoCs
arm: Add support for jadecpu board based on MB86R01 SoC

 MAINTAINERS                                     |    4 +
 MAKEALL                                         |    1 +
 Makefile                                        |    4 +
 arch/arm/cpu/arm926ejs/mb86r0x/Makefile         |   47 ++
 arch/arm/cpu/arm926ejs/mb86r0x/reset.c          |   40 ++
 arch/arm/cpu/arm926ejs/mb86r0x/timer.c          |  139 ++++++
 arch/arm/include/asm/arch-mb86r0x/asm-offsets.h |   74 +++
 arch/arm/include/asm/arch-mb86r0x/hardware.h    |   31 ++
 arch/arm/include/asm/arch-mb86r0x/mb86r0x.h     |  561 +++++++++++++++++++++++
 board/syteco/jadecpu/Makefile                   |   55 +++
 board/syteco/jadecpu/config.mk                  |    1 +
 board/syteco/jadecpu/jadecpu.c                  |  171 +++++++
 board/syteco/jadecpu/lowlevel_init.S            |  266 +++++++++++
 common/serial.c                                 |    6 +-
 drivers/video/Makefile                          |    1 +
 drivers/video/mb86r0xgdc.c                      |  186 ++++++++
 include/configs/jadecpu.h                       |  283 ++++++++++++
 include/serial.h                                |    6 +-
 tools/Makefile                                  |    3 +
 tools/logos/syteco.bmp                          |  Bin 0 -> 11414 bytes
 20 files changed, 1875 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/Makefile
 create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/reset.c
 create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/timer.c
 create mode 100644 arch/arm/include/asm/arch-mb86r0x/asm-offsets.h
 create mode 100644 arch/arm/include/asm/arch-mb86r0x/hardware.h
 create mode 100644 arch/arm/include/asm/arch-mb86r0x/mb86r0x.h
 create mode 100644 board/syteco/jadecpu/Makefile
 create mode 100644 board/syteco/jadecpu/config.mk
 create mode 100644 board/syteco/jadecpu/jadecpu.c
 create mode 100644 board/syteco/jadecpu/lowlevel_init.S
 create mode 100644 drivers/video/mb86r0xgdc.c
 create mode 100644 include/configs/jadecpu.h
 create mode 100644 tools/logos/syteco.bmp

This patch adds support for MB86R0x SoCs from Fujitsu

---
 arch/arm/cpu/arm926ejs/mb86r0x/Makefile         |   47 ++
 arch/arm/cpu/arm926ejs/mb86r0x/reset.c          |   40 ++
 arch/arm/cpu/arm926ejs/mb86r0x/timer.c          |  139 ++++++
 arch/arm/include/asm/arch-mb86r0x/asm-offsets.h |   74 +++
 arch/arm/include/asm/arch-mb86r0x/hardware.h    |   31 ++
 arch/arm/include/asm/arch-mb86r0x/mb86r0x.h     |  561 +++++++++++++++++++++++
 common/serial.c                                 |    6 +-
 include/serial.h                                |    6 +-
 8 files changed, 900 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/Makefile
 create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/reset.c
 create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/timer.c
 create mode 100644 arch/arm/include/asm/arch-mb86r0x/asm-offsets.h
 create mode 100644 arch/arm/include/asm/arch-mb86r0x/hardware.h
 create mode 100644 arch/arm/include/asm/arch-mb86r0x/mb86r0x.h

new file mode 100644
index 0000000..360f046
@@ -0,0 +1,47 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd at 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 as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(SOC).a
+
+COBJS	= timer.o reset.o
+SOBJS	=
+
+SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))
+START	:= $(addprefix $(obj),$(START))
+
+all:	$(obj).depend $(LIB)
+
+$(LIB):	$(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################

new file mode 100644
index 0000000..e7f0f67
@@ -0,0 +1,40 @@
+/*
+ * (C) Copyright 2010
+ * Matthias Weisser <[email protected]>
+ *
+ * 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 as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+
+/*
+ * Reset the cpu by setting software reset request bit
+ */
+void reset_cpu(ulong ignored)
+{
+	struct mb86r0x_crg * crg = (struct mb86r0x_crg *)
+					MB86R0x_CRG_BASE;
+
+	writel(MB86R0x_CRSR_SWRSTREQ, &crg->crsr);
+	while (1)
+		/* NOP */;
+	/* Never reached */
+}

new file mode 100644
index 0000000..d1e57c0
@@ -0,0 +1,31 @@
+/*
+ * (C) Copyright 2007
+ *
+ * Author : Carsten Schneider, mycable GmbH
+ *          <[email protected]>
+ *
+ * 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 as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#ifndef __ASM_ARCH_HARDWARE_H
+#define __ASM_ARCH_HARDWARE_H
+
+#include <asm/sizes.h>
+#include <asm/arch/mb86r0x.h>
+
+#endif

index 5f9ffd7..3e7103c 100644
@@ -40,8 +40,10 @@ struct serial_device *__default_serial_console (void)
 	return &serial_scc_device;
 #elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \
    || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) \
-   || defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC83xx) \
-   || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
+   || defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) \
+   || defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) \
+   || defined(CONFIG_MPC86xx)
+
 #if defined(CONFIG_CONS_INDEX) && defined(CONFIG_SYS_NS16550_SERIAL)
 #if (CONFIG_CONS_INDEX==1)
 	return &eserial1_device;

index f2638ec..b892f6b 100644
@@ -24,8 +24,10 @@ extern struct serial_device * default_serial_console (void);
 
 #if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) || \
     defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) || \
-    defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC83xx) || \
-    defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
+    defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) || \
+    defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
+    defined(CONFIG_MPC86xx)
+
 extern struct serial_device serial0_device;
 extern struct serial_device serial1_device;
 #if defined(CONFIG_SYS_NS16550_SERIAL)

1.5.6.3

This patch adds support for the display controller in the MB86R0x SoCs.

---
 drivers/video/Makefile     |    1 +
 drivers/video/mb86r0xgdc.c |  186 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 187 insertions(+), 0 deletions(-)
 create mode 100644 drivers/video/mb86r0xgdc.c

index a5e339a..1a60ec6 100644
@@ -32,6 +32,7 @@ COBJS-$(CONFIG_S6E63D6) += s6e63d6.o
 COBJS-$(CONFIG_VIDEO_AMBA) += amba.o
 COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o
 COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o
+COBJS-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o
 COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.o
 COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o
 COBJS-$(CONFIG_SED156X) += sed156x.o

1.5.6.3

This patch adds support for the jadecpu board using the MB86R01 'Jade' SoC from Fujitsu.

---
 MAINTAINERS                          |    4 +
 MAKEALL                              |    1 +
 Makefile                             |    4 +
 board/syteco/jadecpu/Makefile        |   55 +++++++
 board/syteco/jadecpu/config.mk       |    1 +
 board/syteco/jadecpu/jadecpu.c       |  171 ++++++++++++++++++++
 board/syteco/jadecpu/lowlevel_init.S |  266 ++++++++++++++++++++++++++++++++
 include/configs/jadecpu.h            |  283 ++++++++++++++++++++++++++++++++++
 tools/Makefile                       |    3 +
 tools/logos/syteco.bmp               |  Bin 0 -> 11414 bytes
 10 files changed, 788 insertions(+), 0 deletions(-)
 create mode 100644 board/syteco/jadecpu/Makefile
 create mode 100644 board/syteco/jadecpu/config.mk
 create mode 100644 board/syteco/jadecpu/jadecpu.c
 create mode 100644 board/syteco/jadecpu/lowlevel_init.S
 create mode 100644 include/configs/jadecpu.h
 create mode 100644 tools/logos/syteco.bmp

index 04c8730..ac0ed62 100644
@@ -776,6 +776,10 @@ Prafulla Wadaskar <[email protected]>
 	rd6281a		ARM926EJS (Kirkwood SoC)
 	sheevaplug	ARM926EJS (Kirkwood SoC)
 
+Matthias Weisser <[email protected]>
+
+	jadecpu		ARM926EJS (MB86R01 SoC)
+
 Richard Woodruff <[email protected]>
 
 	omap2420h4	ARM1136EJS

index fb1f7a3..5ee9678 100755
@@ -561,6 +561,7 @@ LIST_ARM9="			\
 	edb9315			\
 	edb9315a		\
 	imx27lite		\
+	jadecpu			\
 	lpd7a400		\
 	mv88f6281gtw_ge		\
 	mx1ads			\

index 0381c81..1d7627e 100644
@@ -203,6 +203,7 @@ LIBS += net/libnet.a
 LIBS += disk/libdisk.a
 LIBS += drivers/bios_emulator/libatibiosemu.a
 LIBS += drivers/block/libblock.a
+LIBS += drivers/can/libcan.a
 LIBS += drivers/dma/libdma.a
 LIBS += drivers/fpga/libfpga.a
 LIBS += drivers/gpio/libgpio.a

@@ -2834,6 +2835,9 @@ CPU9260_config	:	unconfig
 	@echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
 	@$(MKCONFIG) -a cpu9260 arm arm926ejs cpu9260 eukrea at91
 
+jadecpu_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm arm926ejs jadecpu syteco mb86r0x
+
 meesc_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm926ejs meesc esd at91
 

new file mode 100644
index 0000000..c661f0b
@@ -0,0 +1 @@
+TEXT_BASE = 0x46000000

index 749d994..b2e73b2 100644
@@ -118,6 +118,9 @@ endif
 ifeq ($(VENDOR),ronetix)
 LOGO_BMP= logos/ronetix.bmp
 endif
+ifeq ($(VENDOR),syteco)
+LOGO_BMP= logos/syteco.bmp
+endif
 
 # now $(obj) is defined
 HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))

new file mode 100644
index 0000000000000000000000000000000000000000..9a994fe3e3812bdc2d63f7045d2740d931b2a42a
GIT binary patch

zcmeI0%Z=PH42HG#1PG8ua at cbU$T=w at oy;*6q at L+)mXs;FTE_mvj+$Vm-;vzbIOp zpTGaTJ70d>ocj*7zwrA7zc=^Q_v1f*zJ*xcs%*@pwS<xpm#${eIu-^Dz~e3QPqq zP~cWsoRbp=!%6e0_7xyYP4OUX;&?@vBY<qNM)uXM3F5j;XIMfWw|<7cYm)1ac^7M zc7S$9X#t+$oJ&xgPAoJxGGiHnkfBtwoA;ZR9u>;?jzeRD@&naCCtPjCEmR=eG!^ zQa#o$6?*72<zqx*tjm)3O-CiiK?hHog62(Mq~7HoB}a0x;ak7h=tM3(H<iv#sH4S zt-*xFPF-j;ofqc}3yq2ZhcZIby>Za#nZ-J!3uVH0wB!+kgJR%EA9Aq12N0O(PQ6eZ z$UlR1&A~BJAO?q0Ht&BQ^&pBvVkAH;4hgb*DpU|ea%c>HA5&XnatM%u(qfa3l0mz z0>RTB%VAF#qXYSRB?sP6xgtpp8mxKWY_vft;lE&fTC{zc{EXkA}`|*TXPu)+dZQZ zgA|@|G<1>F8VBm0_P&(XUdBNj6{-<geK6xd-7}#_!8sX@ZYD<%W$HnK1FD!>u)I1x zeAfRI96^!S>k$<B3>>J)NRItNOh05iELAIfp)pd)w*{-%RbN;>-EZcML*E7Dy$EK2 z$8j8R?b=?CzP9E7ul#}*K<eLK&t!U_dGEEL2fqGb5W%s56gg}Vs-k}7Y>(s!AY~2{ zgq at kJTQ#USJV*tH0RpQ?tSVR84!UwXYWVjRRoIBr5JVzIL=MTiRfCLU2dUx^iU^FJ z{1KDSt&W3%NQ^#?xSH;Z($MZ;!O at pbG0K9I29A9yiP6K5&8&OnTX<urac$YB3XG_% zc4_xmAdMW7Ahd0F>0Se*g#-Qz+~i0*OpRzmO&p8Kk#d&nS0HU1i=ju(U3yG{baTYZ zbK0dnB0zdMFzwrpO1&JUlOuePN-phj2GYk7Fh(fS#St;if{=@D566LV9^}}v+N=(L v-!AOjQj8HG2a<6m=FVaZmJGf;QwXdp^U*bbS~I1ozV-x>`b|atPencepjJ52

literal 0
HcmV?d00001

1.5.6.3

I am trying to implement CONFIG_LOGBUFFER and CONFIG_CMD_LOG on our ARM systems and I seem to have run into an endless loop. With loglevel=5 so we still see our console output, the printf at the end of logbuff_printk appears to create an endless loop.

I had to replace that line with serial_puts(msg);

Have I missed some other solution or do the systems that use this never set logbuffer higher than default_message_loglevel?

DaR

Hi Dennis,

I see the same issue you describe when enabling CONFIG_LOGBUFFER. It looks like only a few boards have CONFIG_LOGBUFFER enabled, and many of them also have CONFIG_SYS_CONSOLE_IS_IN_ENV defined. When CONFIG_SYS_CONSOLE_IS_IN_ENV is defined I believe the behavior is changed so that the the stdout/stderr/stdin values are read from the environment, with a default fallback of 'serial'.

My guess is most of the boards with CONFIG_LOGBUFFER defined have their 'stdout' value set to 'serial', so they don't actually utilize the logbuffer, and thus don't run into the issue you found.

In any case, I think its a bug and your suggested workaround sounds good to me. Have any interest in submitting a patch to fix it?

Best,
Peter

Peter, reply inline below...

I'm hoping to get setup to submit patches eventually, but I'm not there yet and it's not on my critical path at the moment. I'm just glad to hear I hadn't missed some critical setup piece.

Thanks for verifying it!

DaR

<snip>

Thanks for finding it. I'll go ahead and submit a patch fixing the bug
- let me know if you have any issues with this.

Best,
Peter

Hi Peter,

The log buffer was originally implemented to pass the results of the POST tests to a Linux kernel so the user space application can access the test results. In this combination the boards using it would usually have stdout on serial (as you describe) and have POST log into the logbuffer. The POST results were not considered to be important enough to be printed on the serial console however - if needed, one can inspect the logbuffer with "log show".

Yes, this sound like a bug, I agree.

Cheers
Detlev

Modern methods of production have given us the possibility of ease and
security for all;  we have chosen, instead,  to have overwork for some
and starvation for others.
                                    -- Bertrand Russell
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

I am trying to implement CONFIG_LOGBUFFER and CONFIG_CMD_LOG on our ARM systems and I seem to have run into an endless loop. With loglevel=5 so we still see our console output, the printf at the end of logbuff_printk appears to create an endless loop.

I had to replace that line with serial_puts(msg);

Have I missed some other solution or do the systems that use this never set logbuffer higher than default_message_loglevel?

DaR

Not sure why this hasn't come through in my 2 earlier attempts...

I am trying to implement CONFIG_LOGBUFFER and CONFIG_CMD_LOG on our ARM systems and I seem to have run into an endless loop. With loglevel=5 so we still see our console output, the printf at the end of logbuff_printk appears to create an endless loop.

I had to replace that line with serial_puts(msg);

Have I missed some other solution or do the systems that use this never set logbuffer higher than default_message_loglevel?

DaR

Not sure why this hasn't come through in my 3 earlier attempts...

Let me try a different email address...

I am trying to implement CONFIG_LOGBUFFER and CONFIG_CMD_LOG on our ARM systems and I seem to have run into an endless loop. With loglevel=5 so we still see our console output, the printf at the end of logbuff_printk appears to create an endless loop.

I had to replace that line with serial_puts(msg);

Have I missed some other solution or do the systems that use this never set logbuffer higher than default_message_loglevel?

DaR

Hi Dennis,

It has been coming through. 4 times now. Give people some time to respond. http://lists.denx.de/pipermail/u-boot/2010-May/071107.html

Best,
Peter

Oh, sorry. I have the option turned on to send me my postings, but I have not gotten them. ;(

Sorry for spamming the list!

DaR

Hi Dennis,

I believe some email clients are "smart" enough to detect duplicate emails and filter accordingly. If I remember correctly I see the same thing when I use a gmail address to send patches.

No problem. Its best not to top-post here as well:)

Best,
Peter

Hi Matthias,

This patch needs rebasing, too. Please also Cc Tom when submitting ARM based board patches.

Thanks,
Anatolij

Hi Matthias,

Hi Matthias,

Please rebase the patch, it doesn't apply any more. Also please Cc u-boot-arm custodian Tom Rix <[email protected]>. Thanks!

Best regards,
Anatolij