[U-Boot] [PATCH] [U-BOOT] Zoom2 Zoom3: introduced a macro to use a different buffer size when compiling for Zoom2 or Zoom3.
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Zoom2 and Zoom2 used to hang with md command. It was due to a problem with a buffer size in print_buffer() function. A macro was introduced to use a different buffer size in case of compiling for Zoom2 and Zoom3. Jeff could you please test it on your board with the Zoom3 initial support patch. Sandeep I also saw this behaving in Zoom2, so maybe I could send a patch that introduces only Zoom2 change, which could be introduced in TI tree without waiting for Zoom3 initial support for going mainline. Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- lib/display_options.c |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/display_options.c b/lib/display_options.c index 20319e6..99e43f7 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -101,7 +101,12 @@ void print_size(unsigned long long size, const char *s) #define DEFAULT_LINE_LENGTH_BYTES (16) int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen) { +#if defined(CONFIG_OMAP3_ZOOM2) || defined(CONFIG_OMAP3_ZOOM3) + uint8_t linebuf[DEFAULT_LINE_LENGTH_BYTES]; +#else uint8_t linebuf[MAX_LINE_LENGTH_BYTES + 1]; +#endif /* CONFIG_OMAP3 */ + uint32_t *uip = (void*)linebuf; uint16_t *usp = (void*)linebuf; uint8_t *ucp = (void*)linebuf; -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/2 v5][U-BOOT] Zoom3: Add support for OMAP3630 Zoom3 board.
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com This patch set gives basic functionality to Omap3630 Zoom3 board. And unifies serial_devices for zoom2 and zoom3 since both use the same struct. Thanks Wolfgang for your comments, the modifications done were: - Added entry to MAINTAINERS in proper order. - Macro for UART1_RX pin. - Left include for status led unconditional. - Unindented preprocessor statements. - Made CONFIG_SYS_HZ a constant with value 1000. - Zoom2 and Zoom3 devices now use the same serial device. Aldo Brett Cedillo Martinez (2): [U-BOOT] Zoom3: Add support for OMAP3630 Zoom3 board. [U-BOOT] Unify serial_device for zoom2 and zoom3. MAINTAINERS|4 + MAKEALL|1 + board/logicpd/zoom2/zoom2_serial.h |2 +- board/logicpd/zoom3/Makefile | 54 +++ board/logicpd/zoom3/config.mk | 33 + board/logicpd/zoom3/debug_board.c | 68 + board/logicpd/zoom3/led.c | 133 + board/logicpd/zoom3/zoom3.c| 199 ++ board/logicpd/zoom3/zoom3.h| 164 + board/logicpd/zoom3/zoom3_serial.c | 132 + board/logicpd/zoom3/zoom3_serial.h | 76 ++ boards.cfg |1 + common/serial.c|2 + include/configs/omap3_zoom2.h |2 +- include/configs/omap3_zoom3.h | 274 include/serial.h | 11 +- 16 files changed, 1148 insertions(+), 8 deletions(-) create mode 100644 board/logicpd/zoom3/Makefile create mode 100644 board/logicpd/zoom3/config.mk create mode 100644 board/logicpd/zoom3/debug_board.c create mode 100644 board/logicpd/zoom3/led.c create mode 100644 board/logicpd/zoom3/zoom3.c create mode 100644 board/logicpd/zoom3/zoom3.h create mode 100644 board/logicpd/zoom3/zoom3_serial.c create mode 100644 board/logicpd/zoom3/zoom3_serial.h create mode 100644 include/configs/omap3_zoom3.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] [U-BOOT] Zoom3: Add support for OMAP3630 Zoom3 board.
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com This patch gives basic functionality to OMAP3630 Zoom3 board. Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- MAINTAINERS|4 + MAKEALL|1 + board/logicpd/zoom3/Makefile | 54 +++ board/logicpd/zoom3/config.mk | 33 + board/logicpd/zoom3/debug_board.c | 68 + board/logicpd/zoom3/led.c | 133 + board/logicpd/zoom3/zoom3.c| 199 ++ board/logicpd/zoom3/zoom3.h| 164 + board/logicpd/zoom3/zoom3_serial.c | 132 + board/logicpd/zoom3/zoom3_serial.h | 76 ++ boards.cfg |1 + common/serial.c|2 + include/configs/omap3_zoom3.h | 274 include/serial.h |7 + 14 files changed, 1148 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/Makefile create mode 100644 board/logicpd/zoom3/config.mk create mode 100644 board/logicpd/zoom3/debug_board.c create mode 100644 board/logicpd/zoom3/led.c create mode 100644 board/logicpd/zoom3/zoom3.c create mode 100644 board/logicpd/zoom3/zoom3.h create mode 100644 board/logicpd/zoom3/zoom3_serial.c create mode 100644 board/logicpd/zoom3/zoom3_serial.h create mode 100644 include/configs/omap3_zoom3.h diff --git a/MAINTAINERS b/MAINTAINERS index 1520312..84b2100 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -570,6 +570,10 @@ Rick Bronson r...@efn.org AT91RM9200DKat91rm9200 +Aldo Brett Cedillo aldo.cedi...@ti.com + + omap3_zoom3 ARM ARMV7 (OMAP3xx SoC) + Po-Yu Chuang ratb...@faraday-tech.com a320evb FA526 (ARM920T-like) (a320 SoC) diff --git a/MAKEALL b/MAKEALL index 2e98b6c..4254a5c 100755 --- a/MAKEALL +++ b/MAKEALL @@ -657,6 +657,7 @@ LIST_ARMV7=\ omap3_sdp3430 \ omap3_zoom1 \ omap3_zoom2 \ + omap3_zoom3 \ omap4_panda \ omap4_sdp4430 \ s5p_goni\ diff --git a/board/logicpd/zoom3/Makefile b/board/logicpd/zoom3/Makefile new file mode 100644 index 000..79c02ab --- /dev/null +++ b/board/logicpd/zoom3/Makefile @@ -0,0 +1,54 @@ +# +# (C) Copyright 2000, 2001, 2002 +# Wolfgang Denk, DENX Software Engineering, w...@denx.de. +# Aldo Cedillo aldo.cedi...@ti.com +# +# 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$(BOARD).a + +COBJS-y := $(BOARD).o +COBJS-y += debug_board.o +COBJS-y += zoom3_serial.o +COBJS-$(CONFIG_STATUS_LED) += led.o + +COBJS := $(sort $(COBJS-y)) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB):$(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +#defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/logicpd/zoom3/config.mk b/board/logicpd/zoom3/config.mk new file mode 100644 index 000..33f394b --- /dev/null +++ b/board/logicpd/zoom3/config.mk @@ -0,0 +1,33 @@ +# +# (C) Copyright 2009 +# Texas Instruments, www.ti.com +# +# Zoom II uses OMAP3 (ARM-CortexA8) CPU +# see http://www.ti.com/ for more information on Texas Instruments +# +# 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
[U-Boot] [PATCH 2/2] [U-BOOT] Unify serial_device for zoom2 and zoom3.
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Instead of using struct serial_device zoom2_serial_device0 and struct serial_device zoom3_serial_device0, we now use a single struct serial_device zoom_serial_device0. Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- board/logicpd/zoom2/zoom2_serial.h |2 +- board/logicpd/zoom3/zoom3_serial.h |2 +- include/configs/omap3_zoom2.h |2 +- include/configs/omap3_zoom3.h |2 +- include/serial.h | 18 +- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/board/logicpd/zoom2/zoom2_serial.h b/board/logicpd/zoom2/zoom2_serial.h index a6d2427..dbc9d36 100644 --- a/board/logicpd/zoom2/zoom2_serial.h +++ b/board/logicpd/zoom2/zoom2_serial.h @@ -60,7 +60,7 @@ int quad_tstc_##n(void) \ { \ return quad_tstc_dev(QUAD_BASE_##n);\ } \ -struct serial_device zoom2_serial_device##n = \ +struct serial_device zoom_serial_device##n = \ { \ N(n), \ U(n), \ diff --git a/board/logicpd/zoom3/zoom3_serial.h b/board/logicpd/zoom3/zoom3_serial.h index f581a7f..f72e6f3 100644 --- a/board/logicpd/zoom3/zoom3_serial.h +++ b/board/logicpd/zoom3/zoom3_serial.h @@ -60,7 +60,7 @@ int quad_tstc_##n(void) \ { \ return quad_tstc_dev(QUAD_BASE_##n);\ } \ -struct serial_device zoom3_serial_device##n = \ +struct serial_device zoom_serial_device##n = \ { \ N(n), \ U(n), \ diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index aaf929e..eef95fe 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -83,7 +83,7 @@ * 0 - 1 : first USB with respect to the left edge of the debug board * 2 - 3 : second USB with respect to the left edge of the debug board */ -#define ZOOM2_DEFAULT_SERIAL_DEVICE(zoom2_serial_device0) +#define ZOOM2_DEFAULT_SERIAL_DEVICE(zoom_serial_device0) #define V_NS16550_CLK (1843200) /* 1.8432 Mhz */ diff --git a/include/configs/omap3_zoom3.h b/include/configs/omap3_zoom3.h index b92c0c2..3ddaeff 100644 --- a/include/configs/omap3_zoom3.h +++ b/include/configs/omap3_zoom3.h @@ -85,7 +85,7 @@ * 0 - 1 : first USB with respect to the left edge of the debug board * 2 - 3 : second USB with respect to the left edge of the debug board */ -#define ZOOM3_DEFAULT_SERIAL_DEVICE(zoom3_serial_device0) +#define ZOOM3_DEFAULT_SERIAL_DEVICE(zoom_serial_device0) #define V_NS16550_CLK (1843200) /* 1.8432 Mhz */ diff --git a/include/serial.h b/include/serial.h index 236e5d1..963bb86 100644 --- a/include/serial.h +++ b/include/serial.h @@ -59,20 +59,12 @@ extern struct serial_device s5p_serial2_device; extern struct serial_device s5p_serial3_device; #endif -#if defined(CONFIG_OMAP3_ZOOM2) -extern struct serial_device zoom2_serial_device0; -extern struct serial_device zoom2_serial_device1; -extern struct serial_device zoom2_serial_device2; -extern struct serial_device zoom2_serial_device3; +#if defined(CONFIG_OMAP3_ZOOM2) || defined(CONFIG_OMAP3_ZOOM3) +extern struct serial_device zoom_serial_device0; +extern struct serial_device zoom_serial_device1; +extern struct serial_device zoom_serial_device2; +extern struct serial_device zoom_serial_device3; #endif - -#if defined(CONFIG_OMAP3_ZOOM3) -extern struct serial_device zoom3_serial_device0; -extern struct serial_device zoom3_serial_device1; -extern struct serial_device zoom3_serial_device2; -extern struct serial_device zoom3_serial_device3; -#endif - extern struct serial_device serial_ffuart_device; extern struct serial_device serial_btuart_device; extern struct serial_device serial_stuart_device; -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4] [U-BOOT] Zoom3: Add support for OMAP3630 Zoom3 board.
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com This patch gives basic functionality to OMAP3630 Zoom3 board. This version has been rebased againts u-boot-ti Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- MAINTAINERS|4 + MAKEALL|1 + board/logicpd/zoom3/Makefile | 54 +++ board/logicpd/zoom3/config.mk | 33 + board/logicpd/zoom3/debug_board.c | 66 + board/logicpd/zoom3/led.c | 133 + board/logicpd/zoom3/zoom3.c| 201 ++ board/logicpd/zoom3/zoom3.h| 164 + board/logicpd/zoom3/zoom3_serial.c | 132 + board/logicpd/zoom3/zoom3_serial.h | 76 ++ boards.cfg |1 + common/serial.c|2 + include/configs/omap3_zoom3.h | 274 include/serial.h |7 + 14 files changed, 1148 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/Makefile create mode 100644 board/logicpd/zoom3/config.mk create mode 100644 board/logicpd/zoom3/debug_board.c create mode 100644 board/logicpd/zoom3/led.c create mode 100644 board/logicpd/zoom3/zoom3.c create mode 100644 board/logicpd/zoom3/zoom3.h create mode 100644 board/logicpd/zoom3/zoom3_serial.c create mode 100644 board/logicpd/zoom3/zoom3_serial.h create mode 100644 include/configs/omap3_zoom3.h diff --git a/MAINTAINERS b/MAINTAINERS index 1520312..260fda3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -813,6 +813,10 @@ Alex Z lartSA1100 dnp1110 SA1110 +Aldo Brett Cedillo Martinez aldo.cedi...@ti.com + + omap3_zoom3 ARM CORTEX-A8 (OMAP3xx SoC) + - Unknown / orphaned boards: diff --git a/MAKEALL b/MAKEALL index 2e98b6c..4254a5c 100755 --- a/MAKEALL +++ b/MAKEALL @@ -657,6 +657,7 @@ LIST_ARMV7=\ omap3_sdp3430 \ omap3_zoom1 \ omap3_zoom2 \ + omap3_zoom3 \ omap4_panda \ omap4_sdp4430 \ s5p_goni\ diff --git a/board/logicpd/zoom3/Makefile b/board/logicpd/zoom3/Makefile new file mode 100644 index 000..79c02ab --- /dev/null +++ b/board/logicpd/zoom3/Makefile @@ -0,0 +1,54 @@ +# +# (C) Copyright 2000, 2001, 2002 +# Wolfgang Denk, DENX Software Engineering, w...@denx.de. +# Aldo Cedillo aldo.cedi...@ti.com +# +# 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$(BOARD).a + +COBJS-y := $(BOARD).o +COBJS-y += debug_board.o +COBJS-y += zoom3_serial.o +COBJS-$(CONFIG_STATUS_LED) += led.o + +COBJS := $(sort $(COBJS-y)) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB):$(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +#defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/logicpd/zoom3/config.mk b/board/logicpd/zoom3/config.mk new file mode 100644 index 000..33f394b --- /dev/null +++ b/board/logicpd/zoom3/config.mk @@ -0,0 +1,33 @@ +# +# (C) Copyright 2009 +# Texas Instruments, www.ti.com +# +# Zoom II uses OMAP3 (ARM-CortexA8) CPU +# see http://www.ti.com/ for more information on Texas Instruments +# +# 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
Re: [U-Boot] [PATCH 03/35] Blackfin: expand EVT1 usage documentation a bit more
#ifdef CONFIG_BFIN_BOOTROM_USES_EVT1 serial_putc('I'); - /* tell the bootrom where our entry point is */ + /* Tell the bootrom where our entry point is so that it knows + * where to jump to when finishing processing the LDR. This + * allows us to avoid small jump blocks in the LDR, and also + * works around anomaly 05000389 (init address in external + * memory causes bootrom to trigger external addressing IVHW). + */ if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_BYPASS) bfin_write_EVT1(CONFIG_SYS_MONITOR_BASE); #endif The comment format is like the kernel's one. /* * Comment */ Best regards, Aldo Brett. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3] [U-BOOT] Zoom3: Add support for OMAP3630 Zoom3 board.
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com This patch gives basic functionality to OMAP3630 Zoom3 board. Thanks Sandeep for the observations. This version has been rebased on the next branch. Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- MAINTAINERS|4 + MAKEALL|1 + Makefile |4 + board/logicpd/zoom3/Makefile | 54 +++ board/logicpd/zoom3/config.mk | 33 + board/logicpd/zoom3/debug_board.c | 66 + board/logicpd/zoom3/led.c | 133 + board/logicpd/zoom3/zoom3.c| 201 ++ board/logicpd/zoom3/zoom3.h| 164 + board/logicpd/zoom3/zoom3_serial.c | 132 + board/logicpd/zoom3/zoom3_serial.h | 76 ++ common/serial.c|2 + include/configs/omap3_zoom3.h | 274 include/serial.h |7 + 14 files changed, 1151 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/Makefile create mode 100644 board/logicpd/zoom3/config.mk create mode 100644 board/logicpd/zoom3/debug_board.c create mode 100644 board/logicpd/zoom3/led.c create mode 100644 board/logicpd/zoom3/zoom3.c create mode 100644 board/logicpd/zoom3/zoom3.h create mode 100644 board/logicpd/zoom3/zoom3_serial.c create mode 100644 board/logicpd/zoom3/zoom3_serial.h create mode 100644 include/configs/omap3_zoom3.h diff --git a/MAINTAINERS b/MAINTAINERS index d7aec98..e2eff5f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -810,6 +810,10 @@ Alex Z lartSA1100 dnp1110 SA1110 +Aldo Brett Cedillo Martinez aldo.cedi...@ti.com + + omap3_zoom3 ARM CORTEX-A8 (OMAP3xx SoC) + - Unknown / orphaned boards: diff --git a/MAKEALL b/MAKEALL index d6d5f5b..c64de47 100755 --- a/MAKEALL +++ b/MAKEALL @@ -654,6 +654,7 @@ LIST_ARM_CORTEX_A8=\ omap3_sdp3430 \ omap3_zoom1 \ omap3_zoom2 \ + omap3_zoom3 \ s5p_goni\ smdkc100\ diff --git a/Makefile b/Makefile index 64b7573..99142d0 100644 --- a/Makefile +++ b/Makefile @@ -2086,6 +2086,10 @@ omap730p2_cs3boot_config : unconfig fi; @$(MKCONFIG) -n $@ -a omap730p2 arm arm926ejs omap730p2 ti omap +omap3_zoom3_config:unconfig + @mkdir -p $(obj)include + @$(MKCONFIG) -n $@ -a omap3_zoom3 arm arm_cortexa8 zoom3 logicpd omap3 + spear300_config \ spear310_config \ spear320_config : unconfig diff --git a/board/logicpd/zoom3/Makefile b/board/logicpd/zoom3/Makefile new file mode 100644 index 000..79c02ab --- /dev/null +++ b/board/logicpd/zoom3/Makefile @@ -0,0 +1,54 @@ +# +# (C) Copyright 2000, 2001, 2002 +# Wolfgang Denk, DENX Software Engineering, w...@denx.de. +# Aldo Cedillo aldo.cedi...@ti.com +# +# 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$(BOARD).a + +COBJS-y := $(BOARD).o +COBJS-y += debug_board.o +COBJS-y += zoom3_serial.o +COBJS-$(CONFIG_STATUS_LED) += led.o + +COBJS := $(sort $(COBJS-y)) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB):$(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +#defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/logicpd/zoom3/config.mk b/board/logicpd/zoom3/config.mk new file mode 100644 index 000..33f394b --- /dev/null +++ b/board/logicpd/zoom3/config.mk @@ -0,0 +1,33 @@ +# +# (C) Copyright 2009 +# Texas Instruments, www.ti.com +# +# Zoom II uses OMAP3 (ARM-CortexA8) CPU +# see http://www.ti.com/ for more information on Texas Instruments +# +# See file CREDITS for list of people who contributed
Re: [U-Boot] u-boot not giving output in Kermit on startup (OMAP3430 sdp)
Hey Shrikumar, Hi Aldo Thanks for your reply. Im using the Omap3430 SDP board, I used the config omap3_sdp3430. I used the following commit of u-boot: 1f241263e088a71b8f33f87b03a37c5418d41e2e Shrikumar Sharma I just flashed main branch u-boot with the commit you are telling and it went fine. I flashed in the u-boot to the H6 omap3430 board, but i get a blank screen on reset; moreover, when I use kermit via Serial port COM1, Im able to connect but I do not get the u-boot shell. And I do get the prompt line from the shell. Do you get something like this? OMAP34XX SDP # If you do you are in the shell, try typing printenv to test it. Best regards. Aldo Brett ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] u-boot not giving output in Kermit on startup (OMAP3430 sdp)
Hi I flashed in the u-boot to the H6 omap3430 board, but i get a blank screen on reset; moreover, when I use kermit via Serial port COM1, Im able to connect but I do not get the u-boot shell. (I am a newbie...) Could someone tell me what I am doing wrong or missing here? Thanks in advance for helping me and Best regards Shrikumar Sharma Maybe you could give more info, like what commit of U-boot are you using, what config file (because I don't know what board is that one). Regards. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 05/11] [U-BOOT][ZOOM3] Initial support - adding board files (led.c)
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- board/logicpd/zoom3/led.c | 133 + 1 files changed, 133 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/led.c diff --git a/board/logicpd/zoom3/led.c b/board/logicpd/zoom3/led.c new file mode 100644 index 000..1871d79 --- /dev/null +++ b/board/logicpd/zoom3/led.c @@ -0,0 +1,133 @@ +/* + * Copyright (c) 2009 Wind River Systems, Inc. + * Tom Rix tom@windriver.com + * + * 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 status_led.h +#include asm/arch/cpu.h +#include asm/io.h +#include asm/arch/sys_proto.h +#include asm/arch/gpio.h + +static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF}; + +/* + * GPIO LEDs + * 173 red + * 154 blue + * 61 blue2 + */ +#define ZOOM3_LED_RED 173 +#define ZOOM3_LED_BLUE 154 +#define ZOOM3_LED_BLUE261 + +void red_LED_off(void) +{ + /* red */ + if (!omap_request_gpio(ZOOM3_LED_RED)) { + omap_set_gpio_direction(ZOOM3_LED_RED, 0); + omap_set_gpio_dataout(ZOOM3_LED_RED, 0); + } + + saved_state[STATUS_LED_RED] = STATUS_LED_OFF; +} + +void blue_LED_off(void) +{ + /* blue */ + if (!omap_request_gpio(ZOOM3_LED_BLUE)) { + omap_set_gpio_direction(ZOOM3_LED_BLUE, 0); + omap_set_gpio_dataout(ZOOM3_LED_BLUE, 0); + } + + /* blue 2 */ + if (!omap_request_gpio(ZOOM3_LED_BLUE2)) { + omap_set_gpio_direction(ZOOM3_LED_BLUE2, 0); + omap_set_gpio_dataout(ZOOM3_LED_BLUE2, 0); + } + + saved_state[STATUS_LED_BLUE] = STATUS_LED_OFF; +} + +void red_LED_on(void) +{ + blue_LED_off(); + + /* red */ + if (!omap_request_gpio(ZOOM3_LED_RED)) { + omap_set_gpio_direction(ZOOM3_LED_RED, 0); + omap_set_gpio_dataout(ZOOM3_LED_RED, 1); + } + + saved_state[STATUS_LED_BLUE] = STATUS_LED_ON; +} + +void blue_LED_on(void) +{ + red_LED_off(); + + /* blue */ + if (!omap_request_gpio(ZOOM3_LED_BLUE)) { + omap_set_gpio_direction(ZOOM3_LED_BLUE, 0); + omap_set_gpio_dataout(ZOOM3_LED_BLUE, 1); + } + + /* blue 2 */ + if (!omap_request_gpio(ZOOM3_LED_BLUE2)) { + omap_set_gpio_direction(ZOOM3_LED_BLUE2, 0); + omap_set_gpio_dataout(ZOOM3_LED_BLUE2, 1); + } + + saved_state[STATUS_LED_BLUE] = STATUS_LED_ON; +} + +void __led_init(led_id_t mask, int state) +{ + __led_set(mask, state); +} + +void __led_toggle(led_id_t mask) +{ + if (STATUS_LED_BLUE == mask) { + if (STATUS_LED_ON == saved_state[STATUS_LED_BLUE]) + blue_LED_off(); + else + blue_LED_on(); + } else if (STATUS_LED_RED == mask) { + if (STATUS_LED_ON == saved_state[STATUS_LED_RED]) + red_LED_off(); + else + red_LED_on(); + } +} + +void __led_set(led_id_t mask, int state) +{ + if (STATUS_LED_BLUE == mask) { + if (STATUS_LED_ON == state) + blue_LED_on(); + else + blue_LED_off(); + } else if (STATUS_LED_RED == mask) { + if (STATUS_LED_ON == state) + red_LED_on(); + else + red_LED_off(); + } +} -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 00/11][U-BOOT][ZOOM3] Initial support.
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com The following series of patches is intented to give basic functionality to OMAP3630 Zoom3 board. All your reviews are welcome and appreciated. Aldo Brett Cedillo Martinez (11): [U-BOOT][ZOOM3] Initial support - adding board files (zoom3.h) [U-BOOT][ZOOM3] Initial support - adding board files (zoom3.c) [U-BOOT][ZOOM3] Initial support - adding board files (zoom3_serial.h) [U-BOOT][ZOOM3] Initial support - adding board files (zoom3_serial.c) [U-BOOT][ZOOM3] Initial support - adding board files (led.c) [U-BOOT][ZOOM3] Initial support - adding board files (debug_board.c) [U-BOOT][ZOOM3] Initial support - adding board files (config.mk) [U-BOOT][ZOOM3] Initial support - adding board files (Makefile) [U-BOOT][ZOOM3] Initial support - add config file (omap3_zoom3.h) [U-BOOT][ZOOM3] Initial support - added OMAP3630 serial devices. [U-BOOT][ZOOM3] Initial support - add board to main Makefile, , add the board to the list in MAKEALL file, and name to MAINTAINERS. MAINTAINERS|4 + MAKEALL|1 + Makefile |3 + board/logicpd/zoom3/Makefile | 54 +++ board/logicpd/zoom3/config.mk | 33 + board/logicpd/zoom3/debug_board.c | 66 + board/logicpd/zoom3/led.c | 133 ++ board/logicpd/zoom3/zoom3.c| 201 ++ board/logicpd/zoom3/zoom3.h| 163 ++ board/logicpd/zoom3/zoom3_serial.c | 132 + board/logicpd/zoom3/zoom3_serial.h | 76 ++ common/serial.c|2 + include/configs/omap3_zoom3.h | 271 include/serial.h |7 + 14 files changed, 1146 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/Makefile create mode 100644 board/logicpd/zoom3/config.mk create mode 100644 board/logicpd/zoom3/debug_board.c create mode 100644 board/logicpd/zoom3/led.c create mode 100644 board/logicpd/zoom3/zoom3.c create mode 100644 board/logicpd/zoom3/zoom3.h create mode 100644 board/logicpd/zoom3/zoom3_serial.c create mode 100644 board/logicpd/zoom3/zoom3_serial.h create mode 100644 include/configs/omap3_zoom3.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 08/11] [U-BOOT][ZOOM3] Initial support - adding board files (Makefile)
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- board/logicpd/zoom3/Makefile | 54 ++ 1 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/Makefile diff --git a/board/logicpd/zoom3/Makefile b/board/logicpd/zoom3/Makefile new file mode 100644 index 000..79c02ab --- /dev/null +++ b/board/logicpd/zoom3/Makefile @@ -0,0 +1,54 @@ +# +# (C) Copyright 2000, 2001, 2002 +# Wolfgang Denk, DENX Software Engineering, w...@denx.de. +# Aldo Cedillo aldo.cedi...@ti.com +# +# 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$(BOARD).a + +COBJS-y := $(BOARD).o +COBJS-y += debug_board.o +COBJS-y += zoom3_serial.o +COBJS-$(CONFIG_STATUS_LED) += led.o + +COBJS := $(sort $(COBJS-y)) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB):$(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +# + +#defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 07/11] [U-BOOT][ZOOM3] Initial support - adding board files (config.mk)
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- board/logicpd/zoom3/config.mk | 33 + 1 files changed, 33 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/config.mk diff --git a/board/logicpd/zoom3/config.mk b/board/logicpd/zoom3/config.mk new file mode 100644 index 000..33f394b --- /dev/null +++ b/board/logicpd/zoom3/config.mk @@ -0,0 +1,33 @@ +# +# (C) Copyright 2009 +# Texas Instruments, www.ti.com +# +# Zoom II uses OMAP3 (ARM-CortexA8) CPU +# see http://www.ti.com/ for more information on Texas Instruments +# +# 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 +# +# Physical Address: +# 0x8000 (bank0) +# 0xA000 (bank1) +# Linux-Kernel is expected to be at 0x80008000, entry 0x80008000 +# (mem base + reserved) + +# For use with external or internal boots. +TEXT_BASE = 0x80e8 -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 10/11] [U-BOOT][ZOOM3] Initial support - added OMAP3630 serial devices.
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- common/serial.c |2 ++ include/serial.h |7 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/common/serial.c b/common/serial.c index fceabfa..2a644ba 100644 --- a/common/serial.c +++ b/common/serial.c @@ -92,6 +92,8 @@ struct serial_device *__default_serial_console (void) #endif #elif defined(CONFIG_OMAP3_ZOOM2) return ZOOM2_DEFAULT_SERIAL_DEVICE; +#elif defined(CONFIG_OMAP3_ZOOM3) + return ZOOM3_DEFAULT_SERIAL_DEVICE; #else #error No default console #endif diff --git a/include/serial.h b/include/serial.h index 6513d8e..236e5d1 100644 --- a/include/serial.h +++ b/include/serial.h @@ -66,6 +66,13 @@ extern struct serial_device zoom2_serial_device2; extern struct serial_device zoom2_serial_device3; #endif +#if defined(CONFIG_OMAP3_ZOOM3) +extern struct serial_device zoom3_serial_device0; +extern struct serial_device zoom3_serial_device1; +extern struct serial_device zoom3_serial_device2; +extern struct serial_device zoom3_serial_device3; +#endif + extern struct serial_device serial_ffuart_device; extern struct serial_device serial_btuart_device; extern struct serial_device serial_stuart_device; -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 04/11] [U-BOOT][ZOOM3] Initial support - adding board files (zoom3_serial.c)
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- board/logicpd/zoom3/zoom3_serial.c | 132 1 files changed, 132 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/zoom3_serial.c diff --git a/board/logicpd/zoom3/zoom3_serial.c b/board/logicpd/zoom3/zoom3_serial.c new file mode 100644 index 000..e50c6dc --- /dev/null +++ b/board/logicpd/zoom3/zoom3_serial.c @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2009 Wind River Systems, Inc. + * Tom Rix tom@windriver.com + * Aldo Cedillo aldo.cedi...@ti.com + * + * 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 + * + * This file was adapted from arch/powerpc/cpu/mpc5xxx/serial.c + * + */ + +#include common.h +#include serial.h +#include ns16550.h +#include asm/arch/cpu.h +#include zoom3_serial.h + +int quad_init_dev(unsigned long base) +{ + /* +* The Quad UART is on the debug board. +* Check if the debug board is attached before using the UART +*/ + if (zoom3_debug_board_connected()) { + NS16550_t com_port = (NS16550_t) base; + int baud_divisor = CONFIG_SYS_NS16550_CLK / 16 / + CONFIG_BAUDRATE; + /* +* Zoom3 has a board specific initialization of its UART. +* This generic initialization has been copied from +* drivers/serial/ns16550.c. The macros have been expanded. +* +* Do the following instead of +* NS16550_init (com_port, clock_divisor); +*/ + com_port-ier = 0x00; + + /* +* On Zoom3 board Set pre-scalar to 1 +* CLKSEL is GND = MCR[7] is 1 = preslr is 4 +* So change the prescl to 1 +*/ + com_port-lcr = 0xbf; + com_port-fcr |= 0x10; + com_port-mcr = 0x7f; + + /* This is generic ns16550.c setup */ + com_port-lcr = UART_LCR_BKSE | UART_LCR_8N1; + com_port-dll = 0; + com_port-dlm = 0; + com_port-lcr = UART_LCR_8N1; + com_port-mcr = UART_MCR_DTR | UART_MCR_RTS; + com_port-fcr = UART_FCR_FIFO_EN | UART_FCR_RXSR | + UART_FCR_TXSR; + com_port-lcr = UART_LCR_BKSE | UART_LCR_8N1; + com_port-dll = baud_divisor 0xff; + com_port-dlm = (baud_divisor 8) 0xff; + com_port-lcr = UART_LCR_8N1; + } + + /* +* We have to lie here, otherwise the board init code will hang +* on the check +*/ + return 0; +} + +void quad_putc_dev(unsigned long base, const char c) +{ + if (zoom3_debug_board_connected()) { + if (c == '\n') + quad_putc_dev(base, '\r'); + + NS16550_putc((NS16550_t) base, c); + } else { + usbtty_putc(c); + } +} + +void quad_puts_dev(unsigned long base, const char *s) +{ + if (zoom3_debug_board_connected()) { + while ((s != NULL) (*s != '\0')) + quad_putc_dev(base, *s++); + } else { + usbtty_puts(s); + } +} + +int quad_getc_dev(unsigned long base) +{ + if (zoom3_debug_board_connected()) + return NS16550_getc((NS16550_t) base); + + return usbtty_getc(); +} + +int quad_tstc_dev(unsigned long base) +{ + if (zoom3_debug_board_connected()) + return NS16550_tstc((NS16550_t) base); + + return usbtty_tstc(); +} + +void quad_setbrg_dev(unsigned long base) +{ + if (zoom3_debug_board_connected()) { + int clock_divisor = CONFIG_SYS_NS16550_CLK / 16 / + CONFIG_BAUDRATE; + + NS16550_reinit((NS16550_t) base, clock_divisor); + } +} + +QUAD_INIT(0) +QUAD_INIT(1) +QUAD_INIT(2) +QUAD_INIT(3) -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 09/11] [U-BOOT][ZOOM3] Initial support - add config file (omap3_zoom3.h)
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- include/configs/omap3_zoom3.h | 271 + 1 files changed, 271 insertions(+), 0 deletions(-) create mode 100644 include/configs/omap3_zoom3.h diff --git a/include/configs/omap3_zoom3.h b/include/configs/omap3_zoom3.h new file mode 100644 index 000..e70f1cf --- /dev/null +++ b/include/configs/omap3_zoom3.h @@ -0,0 +1,271 @@ +/* + * (C) Copyright 2006-2010 Texas Instruments. + * + * Richard Woodruff r-woodru...@ti.com + * Syed Mohammed Khasim x0kha...@ti.com + * Nishanth Menon n...@ti.com + * Tom Rix tom@windriver.com + * Aldo Cedillo aldo.cedi...@ti.com + * + * Configuration settings for the TI OMAP3630 Zoom 3 board. + * + * 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 __CONFIG_H +#define __CONFIG_H + +/* + * High Level Configuration Options + */ +#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */ +#define CONFIG_OMAP1 /* in a TI OMAP core */ +#define CONFIG_OMAP36XX1 /* which is a 36XX */ +#define CONFIG_OMAP3_ZOOM3 1 /* working with a Zoom3 */ + +#include asm/arch/cpu.h /* get chip and board defs */ +#include asm/arch/omap3.h + +/* + * Display CPU and board information + */ +#define CONFIG_DISPLAY_CPUINFO 1 +#define CONFIG_DISPLAY_BOARDINFO 1 + +/* Clock defines */ +#define V_OSCK 260 /* Clock output from T2 */ +#define V_SCLK (V_OSCK 1) + +#undef CONFIG_USE_IRQ /* no support for IRQs */ +#define CONFIG_MISC_INIT_R + +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 +#define CONFIG_REVISION_TAG1 + +/* + * Size of malloc() pool + */ +#define CONFIG_ENV_SIZE(128 10) /* 128 KiB */ +/* Sector */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 10)) +#define CONFIG_SYS_GBL_DATA_SIZE 128 /* bytes reserved for */ + /* initial data */ + +/* + * Hardware drivers + */ + +/* + * NS16550 Configuration + * Zoom3 uses the TL16CP754C on the debug board + */ +#define CONFIG_SERIAL_MULTI1 + +/* + * 0 - 1 : first USB with respect to the left edge of the debug board + * 2 - 3 : second USB with respect to the left edge of the debug board + */ +#define ZOOM3_DEFAULT_SERIAL_DEVICE(zoom3_serial_device0) + +#define V_NS16550_CLK (1843200) /* 1.8432 Mhz */ + +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_REG_SIZE(-2) +#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK +#define CONFIG_BAUDRATE115200 +#define CONFIG_SYS_BAUDRATE_TABLE {115200} + +#define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */ + +#define CONFIG_MMC 1 +#define CONFIG_OMAP3_MMC 1 +#define CONFIG_DOS_PARTITION 1 + +/* DDR - Use Micron DDR */ +#define CONFIG_OMAP3_MICRON_DDR1 + +/* Status LED */ +#define CONFIG_STATUS_LED 1 /* Status LED enabled */ +#define CONFIG_BOARD_SPECIFIC_LED 1 +#define STATUS_LED_BLUE0 /* Check what color is used */ +#define STATUS_LED_RED 1 /* when using 3630*/ +/* Blue */ +#define STATUS_LED_BIT STATUS_LED_BLUE +#define STATUS_LED_STATE STATUS_LED_ON +#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) +/* Red */ +#define STATUS_LED_BIT1STATUS_LED_RED +#define STATUS_LED_STATE1 STATUS_LED_OFF +#define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2) +/* Optional value */ +#define STATUS_LED_BOOTSTATUS_LED_BIT + +/* GPIO banks */ +#ifdef CONFIG_STATUS_LED +#define CONFIG_OMAP3_GPIO_2/* ZOOM2_LED_BLUE2 */ +#define CONFIG_OMAP3_GPIO_6/* ZOOM2_LED_RED */ +#endif +#define CONFIG_OMAP3_GPIO_3/* board revision */ +#define CONFIG_OMAP3_GPIO_5/* debug board detection, ZOOM2_LED_BLUE */ + +/* USB
[U-Boot] [PATCH 06/11] [U-BOOT][ZOOM3] Initial support - adding board files (debug_board.c)
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- board/logicpd/zoom3/debug_board.c | 66 + 1 files changed, 66 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/debug_board.c diff --git a/board/logicpd/zoom3/debug_board.c b/board/logicpd/zoom3/debug_board.c new file mode 100644 index 000..0520257 --- /dev/null +++ b/board/logicpd/zoom3/debug_board.c @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2010 Wind River Systems, Inc. + * Tom Rix tom@windriver.com + * Aldo Cedillo aldo.cedi...@ti.com + * + * 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/arch/cpu.h +#include asm/io.h +#include asm/arch/mux.h +#include asm/arch/gpio.h + +#define DEBUG_BOARD_CONNECTED 1 +#define DEBUG_BOARD_NOT_CONNECTED 0 + +static int debug_board_connected = DEBUG_BOARD_CONNECTED; + +static void zoom3_debug_board_detect(void) +{ + int val = 0; + + /* +* TODO gpio 158 is UART1_RX, should we make a macro of this +* instead of the raw number? +*/ + if (!omap_request_gpio(158)) { + /* +* GPIO to query for debug board +* 158 db board query +*/ + omap_set_gpio_direction(158, 1); + val = omap_get_gpio_datain(158); + omap_free_gpio(158); + } + + if (!val) + debug_board_connected = DEBUG_BOARD_NOT_CONNECTED; +} + +int zoom3_debug_board_connected(void) +{ + static int first_time = 1; + + if (first_time) { + zoom3_debug_board_detect(); + first_time = 0; + } + + return debug_board_connected; +} -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 03/11] [U-BOOT][ZOOM3] Initial support - adding board files (zoom3_serial.h)
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- board/logicpd/zoom3/zoom3_serial.h | 76 1 files changed, 76 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/zoom3_serial.h diff --git a/board/logicpd/zoom3/zoom3_serial.h b/board/logicpd/zoom3/zoom3_serial.h new file mode 100644 index 000..f581a7f --- /dev/null +++ b/board/logicpd/zoom3/zoom3_serial.h @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2009 Wind River Systems, Inc. + * Tom Rix tom@windriver.com + * + * 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 ZOOM3_SERIAL_H +#define ZOOM3_SERIAL_H + +extern int zoom3_debug_board_connected(void); + +#define SERIAL_TL16CP754C_BASE 0x1000 /* Zoom3 serial chip address */ + +#define QUAD_BASE_0SERIAL_TL16CP754C_BASE +#define QUAD_BASE_1(SERIAL_TL16CP754C_BASE + 0x100) +#define QUAD_BASE_2(SERIAL_TL16CP754C_BASE + 0x200) +#define QUAD_BASE_3(SERIAL_TL16CP754C_BASE + 0x300) + +#define S(a) #a +#define N(a) S(quad##a) +#define U(a) S(UART##a) + +#define QUAD_INIT(n) \ +int quad_init_##n(void)\ +{ \ + return quad_init_dev(QUAD_BASE_##n);\ +} \ +void quad_setbrg_##n(void) \ +{ \ + quad_setbrg_dev(QUAD_BASE_##n); \ +} \ +void quad_putc_##n(const char c) \ +{ \ + quad_putc_dev(QUAD_BASE_##n, c);\ +} \ +void quad_puts_##n(const char *s) \ +{ \ + quad_puts_dev(QUAD_BASE_##n, s);\ +} \ +int quad_getc_##n(void)\ +{ \ + return quad_getc_dev(QUAD_BASE_##n);\ +} \ +int quad_tstc_##n(void)\ +{ \ + return quad_tstc_dev(QUAD_BASE_##n);\ +} \ +struct serial_device zoom3_serial_device##n = \ +{ \ + N(n), \ + U(n), \ + quad_init_##n, \ + NULL, \ + quad_setbrg_##n,\ + quad_getc_##n, \ + quad_tstc_##n, \ + quad_putc_##n, \ + quad_puts_##n, \ +}; + +#endif /* ZOOM3_SERIAL_H */ -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 02/11] [U-BOOT][ZOOM3] Initial support - adding board files (zoom3.c)
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- board/logicpd/zoom3/zoom3.c | 201 +++ 1 files changed, 201 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/zoom3.c diff --git a/board/logicpd/zoom3/zoom3.c b/board/logicpd/zoom3/zoom3.c new file mode 100644 index 000..f5a8201 --- /dev/null +++ b/board/logicpd/zoom3/zoom3.c @@ -0,0 +1,201 @@ +/* + * Copyright (c) 2010 Texas Instruments www.ti.com + * Aldo Cedillo aldo.cedi...@ti.com + * + * Derived from Zoom2 code by + * Tom Rix tom@windriver.com + * + * Derived from Zoom1 code by + * Nishanth Menon n...@ti.com + * Sunil Kumar sunilsain...@gmail.com + * Shashi Ranjan shashiranjanmc...@gmail.com + * Richard Woodruff r-woodru...@ti.com + * Syed Mohammed Khasim kha...@ti.com + * + * + * 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 netdev.h +#ifdef CONFIG_STATUS_LED +#include status_led.h +#endif +#include twl4030.h +#include asm/io.h +#include asm/arch/gpio.h +#include asm/arch/mem.h +#include asm/arch/mux.h +#include asm/arch/sys_proto.h +#include asm/mach-types.h +#include zoom3.h +#include zoom3_serial.h + + +/* + * This is the zoom3, board specific, gpmc configuration for the + * quad uart on the debug board. The more general gpmc configurations + * are setup at the cpu level in vim arch/arm/cpu/armv7/omap3/mem.c + * + * The details of the setting of the serial gpmc setup are not available. + * The values were provided by another party. + */ +static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG] = { + 0x00011000, + 0x001f1f01, + 0x00080803, + 0x1d091d09, + 0x041f1f1f, + 0x1d0904c4, 0 +}; + +/* Used to track the revision of the board */ +static zoom3_revision revision = ZOOM3_REVISION_UNKNOWN; + +/* + * Routine: zoom3_get_version + * Description: Return the revision of the Zoom3 this code is running on. + */ +zoom3_revision zoom3_get_revision(void) +{ + return revision; +} + +/* + * Routine: zoom3_identify + * Description: Detect which version of Zoom3 we are running on. + */ +void zoom3_identify(void) +{ + /* +* To check for production board vs beta board, +* check if gpio 94 is clear. +* +* No way yet to check for alpha board identity. +* Alpha boards were produced in very limited quantities +* and they are not commonly used. The are mentioned here +* only for completeness. +*/ + if (!omap_request_gpio(94)) { + unsigned int val; + + omap_set_gpio_direction(94, 1); + val = omap_get_gpio_datain(94); + omap_free_gpio(94); + + if (val) + revision = ZOOM3_REVISION_BETA; + else + revision = ZOOM3_REVISION_PRODUCTION; + } + + puts(Board revision ); + + switch (revision) { + case ZOOM3_REVISION_PRODUCTION: + puts(Production\n); + break; + case ZOOM3_REVISION_BETA: + puts(Beta\n); + break; + default: + puts(Unknown\n); + break; + } +} + +/* + * Routine: board_init + * Description: Early hardware init. + */ +int board_init(void) +{ + DECLARE_GLOBAL_DATA_PTR; + u32 *gpmc_config; + + gpmc_init();/* in SRAM or SDRAM, finish GPMC */ + + /* Configure console support for zoom3 */ + gpmc_config = gpmc_serial_TL16CP754C; + enable_gpmc_cs_config(gpmc_config, gpmc_cfg-cs[3], + SERIAL_TL16CP754C_BASE, GPMC_SIZE_16M); + + /* board id for Linux */ + gd-bd-bi_arch_number = MACH_TYPE_OMAP_ZOOM3; + /* boot param addr */ + gd-bd-bi_boot_params = (OMAP36XX_SDRC_CS0 + 0x100); + +#if defined(CONFIG_STATUS_LED) defined(STATUS_LED_BOOT) + status_led_set(STATUS_LED_BOOT, STATUS_LED_ON); +#endif + return 0; +} + +/* + * Routine: misc_init_r + * Description: Configure zoom board specific configurations + */ +int misc_init_r(void) +{ + zoom3_identify
[U-Boot] [PATCH 01/11] [U-BOOT][ZOOM3] Initial support - adding board files (zoom3.h)
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- board/logicpd/zoom3/zoom3.h | 163 +++ 1 files changed, 163 insertions(+), 0 deletions(-) create mode 100644 board/logicpd/zoom3/zoom3.h diff --git a/board/logicpd/zoom3/zoom3.h b/board/logicpd/zoom3/zoom3.h new file mode 100644 index 000..7ef4af0 --- /dev/null +++ b/board/logicpd/zoom3/zoom3.h @@ -0,0 +1,163 @@ +/* + * Copyright (c) 2010 Texas Instruments + * + * Aldo Cedillo aldo.cedi...@ti.com + * + * Derived from: board/omap3/zoom2/zoom2.h + * Tom Rix tom@windriver.com + * + * Derived from: board/omap3/zoom1/zoom1.h + * Nishanth Menon n...@ti.com + * + * 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 _BOARD_ZOOM3_H_ +#define _BOARD_ZOOM3_H_ + +const omap3_sysinfo sysinfo = { + DDR_STACKED, + OMAP3 Zoom3, + NAND, +}; + +typedef enum { + ZOOM3_REVISION_UNKNOWN = 0, + ZOOM3_REVISION_ALPHA, + ZOOM3_REVISION_BETA, + ZOOM3_REVISION_PRODUCTION +} zoom3_revision; + +zoom3_revision zoom3_get_revision(void); + +/* + * IEN - Input Enable + * IDIS- Input Disable + * PTD - Pull type Down + * PTU - Pull type Up + * DIS - Pull type selection is inactive + * EN - Pull type selection is active + * M0 - Mode 0 + * The commented string gives the final mux configuration for that pin + */ +#define MUX_ZOOM3() \ + /* SDRC*/\ + MUX_VAL(CP(SDRC_D0),(IEN | PTD | DIS | M0)) /* SDRC_D0 */\ + MUX_VAL(CP(SDRC_D1),(IEN | PTD | DIS | M0)) /* SDRC_D1 */\ + MUX_VAL(CP(SDRC_D2),(IEN | PTD | DIS | M0)) /* SDRC_D2 */\ + MUX_VAL(CP(SDRC_D3),(IEN | PTD | DIS | M0)) /* SDRC_D3 */\ + MUX_VAL(CP(SDRC_D4),(IEN | PTD | DIS | M0)) /* SDRC_D4 */\ + MUX_VAL(CP(SDRC_D5),(IEN | PTD | DIS | M0)) /* SDRC_D5 */\ + MUX_VAL(CP(SDRC_D6),(IEN | PTD | DIS | M0)) /* SDRC_D6 */\ + MUX_VAL(CP(SDRC_D7),(IEN | PTD | DIS | M0)) /* SDRC_D7 */\ + MUX_VAL(CP(SDRC_D8),(IEN | PTD | DIS | M0)) /* SDRC_D8 */\ + MUX_VAL(CP(SDRC_D9),(IEN | PTD | DIS | M0)) /* SDRC_D9 */\ + MUX_VAL(CP(SDRC_D10), (IEN | PTD | DIS | M0)) /* SDRC_D10 */\ + MUX_VAL(CP(SDRC_D11), (IEN | PTD | DIS | M0)) /* SDRC_D11 */\ + MUX_VAL(CP(SDRC_D12), (IEN | PTD | DIS | M0)) /* SDRC_D12 */\ + MUX_VAL(CP(SDRC_D13), (IEN | PTD | DIS | M0)) /* SDRC_D13 */\ + MUX_VAL(CP(SDRC_D14), (IEN | PTD | DIS | M0)) /* SDRC_D14 */\ + MUX_VAL(CP(SDRC_D15), (IEN | PTD | DIS | M0)) /* SDRC_D15 */\ + MUX_VAL(CP(SDRC_D16), (IEN | PTD | DIS | M0)) /* SDRC_D16 */\ + MUX_VAL(CP(SDRC_D17), (IEN | PTD | DIS | M0)) /* SDRC_D17 */\ + MUX_VAL(CP(SDRC_D18), (IEN | PTD | DIS | M0)) /* SDRC_D18 */\ + MUX_VAL(CP(SDRC_D19), (IEN | PTD | DIS | M0)) /* SDRC_D19 */\ + MUX_VAL(CP(SDRC_D20), (IEN | PTD | DIS | M0)) /* SDRC_D20 */\ + MUX_VAL(CP(SDRC_D21), (IEN | PTD | DIS | M0)) /* SDRC_D21 */\ + MUX_VAL(CP(SDRC_D22), (IEN | PTD | DIS | M0)) /* SDRC_D22 */\ + MUX_VAL(CP(SDRC_D23), (IEN | PTD | DIS | M0)) /* SDRC_D23 */\ + MUX_VAL(CP(SDRC_D24), (IEN | PTD | DIS | M0)) /* SDRC_D24 */\ + MUX_VAL(CP(SDRC_D25), (IEN | PTD | DIS | M0)) /* SDRC_D25 */\ + MUX_VAL(CP(SDRC_D26), (IEN | PTD | DIS | M0)) /* SDRC_D26 */\ + MUX_VAL(CP(SDRC_D27), (IEN | PTD | DIS | M0)) /* SDRC_D27 */\ + MUX_VAL(CP(SDRC_D28), (IEN | PTD | DIS | M0)) /* SDRC_D28 */\ + MUX_VAL(CP(SDRC_D29), (IEN | PTD | DIS | M0)) /* SDRC_D29 */\ + MUX_VAL(CP(SDRC_D30), (IEN | PTD | DIS | M0)) /* SDRC_D30 */\ + MUX_VAL(CP(SDRC_D31), (IEN | PTD | DIS | M0)) /* SDRC_D31 */\ + MUX_VAL(CP(SDRC_CLK), (IEN | PTD | DIS | M0)) /* SDRC_CLK */\ + MUX_VAL(CP(SDRC_DQS0), (IEN | PTD | DIS | M0)) /* SDRC_DQS0 */\ + MUX_VAL(CP
[U-Boot] [PATCH 11/11] [U-BOOT][ZOOM3] Initial support - add board to main Makefile, add the board to the list in MAKEALL file, and name to MAINTAINERS.
From: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com Signed-off-by: Aldo Brett Cedillo Martinez aldo.cedi...@ti.com --- MAINTAINERS |4 MAKEALL |1 + Makefile|3 +++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7a13d28..384dda9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -798,6 +798,10 @@ Alex Z lartSA1100 dnp1110 SA1110 +Aldo Brett Cedillo Martinez aldo.cedi...@ti.com + + omap3_zoom3 ARM CORTEX-A8 (OMAP3xx SoC) + - Unknown / orphaned boards: diff --git a/MAKEALL b/MAKEALL index 2527352..8ebeaad 100755 --- a/MAKEALL +++ b/MAKEALL @@ -650,6 +650,7 @@ LIST_ARM_CORTEX_A8=\ omap3_sdp3430 \ omap3_zoom1 \ omap3_zoom2 \ + omap3_zoom3 \ smdkc100\ diff --git a/Makefile b/Makefile index c26e491..198ee67 100644 --- a/Makefile +++ b/Makefile @@ -3179,6 +3179,9 @@ omap3_zoom1_config : unconfig omap3_zoom2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3 +omap3_zoom3_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom3 logicpd omap3 + smdkc100_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx -- 1.6.3.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot