ZOOM2 Add initial support for Zoom2
PATCH 1/10 ZOOM2 Add initial support for Zoom2
Zoom2 is a new board from Texas Instruments and LogicPD
The logicpd web site is a good source for general information on this board. Please start looking here if the below links are broken.
http://www.logicpd.com
This is a pdf of the product
http://www.logicpd.com/sites/default/files/1012659A_Zoom_OMAP34x-II_MDP_Brief.pdf
This is the product description web page
http://www.logicpd.com/products/development-kits/texas-instruments-zoom%E2%84%A2-omap34x-ii-mdp
This patch provides a zoom2 base target by copying zoom1 and by making some obvious changes.
To configure, run
make omap3_zoom2_config
--- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/omap3/common/Makefile | 1 + board/omap3/zoom2/Makefile | 49 ++++++++ board/omap3/zoom2/config.mk | 33 ++++++ board/omap3/zoom2/u-boot.lds | 63 +++++++++++ board/omap3/zoom2/zoom2.c | 76 +++++++++++++ board/omap3/zoom2/zoom2.h | 151 +++++++++++++++++++++++++ doc/README.omap3 | 13 ++ include/configs/omap3_zoom2.h | 247 +++++++++++++++++++++++++++++++++++++++++ 11 files changed, 641 insertions(+), 0 deletions(-) create mode 100644 board/omap3/zoom2/Makefile create mode 100644 board/omap3/zoom2/config.mk create mode 100644 board/omap3/zoom2/u-boot.lds create mode 100644 board/omap3/zoom2/zoom2.c create mode 100644 board/omap3/zoom2/zoom2.h create mode 100644 include/configs/omap3_zoom2.h
MAINTAINERS +4 -0
@@ -611,6 +611,10 @@ Stelian Pop <[email protected]> at91sam9263ek ARM926EJS (AT91SAM9263 SoC) at91sam9rlek ARM926EJS (AT91SAM9RL SoC) +Tom Rix <[email protected]> + + omap3_zoom2 ARM CORTEX-A8 (OMAP3xx SoC) + Stefan Roese <[email protected]> ixdpg425 xscale
MAKEALL +1 -0
@@ -561,6 +561,7 @@ LIST_ARM_CORTEX_A8=" \ omap3_evm \ omap3_pandora \ omap3_zoom1 \ + omap3_zoom2 \ " #########################################################################
Makefile +3 -0
@@ -2980,6 +2980,9 @@ omap3_pandora_config : unconfig omap3_zoom1_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3 +omap3_zoom2_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 omap3 omap3 + ######################################################################### ## XScale Systems #########################################################################
board/omap3/common/Makefile +1 -0
@@ -33,6 +33,7 @@ COBJS-$(CONFIG_OMAP3_BEAGLE) += power.o COBJS-$(CONFIG_OMAP3_OVERO) += power.o COBJS-$(CONFIG_OMAP3_PANDORA) += power.o COBJS-$(CONFIG_OMAP3_ZOOM1) += power.o +COBJS-$(CONFIG_OMAP3_ZOOM2) += power.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
board/omap3/zoom2/Makefile new file +49 -0
49 lines not on this page · raw message
board/omap3/zoom2/config.mk new file +33 -0
@@ -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: +# 0x80000000 (bank0) +# 0xA0000000 (bank1) +# Linux-Kernel is expected to be at 0x80008000, entry 0x80008000 +# (mem base + reserved) + +# For use with external or internal boots. +TEXT_BASE = 0x80e80000
board/omap3/zoom2/u-boot.lds new file +63 -0
63 lines not on this page · raw message
board/omap3/zoom2/zoom2.c new file +76 -0
76 lines not on this page · raw message
board/omap3/zoom2/zoom2.h new file +151 -0
151 lines not on this page · raw message
doc/README.omap3 +13 -0
@@ -19,6 +19,8 @@ Currently the following boards are supported: * TI/Logic PD Zoom MDK [6] +* TI/Logic PD Zoom 2 [8] + Toolchain =========
@@ -54,6 +56,11 @@ make make omap3_zoom1_config make +* Zoom 2: + +make omap3_zoom2_config +make + Custom commands ===============
@@ -114,3 +121,9 @@ http://www.logicpd.com/products/devkit/ti/zoom_mobile_development_kit [7] TI OMAP3 U-Boot: http://beagleboard.googlecode.com/files/u-boot_beagle_revb.tar.gz + +[8] TI/Logic PD Zoom 2 + +http://www.logicpd.com/sites/default/files/1012659A_Zoom_OMAP34x-II_MDP_Brief.pdf + +
include/configs/omap3_zoom2.h new file +247 -0
247 lines not on this page · raw message
Signature · 1 line
1.6.0.5
PATCH 2/10 OMAP3 Port kernel omap gpio interface.
Port the linux kernel's omap gpio interface to u-boot. The orignal source is in linux/arch/arm/plat-omap/gpio.c
See doc/README.omap3 for instructions on use.
--- cpu/arm_cortexa8/omap3/Makefile | 2 +- cpu/arm_cortexa8/omap3/gpio.c | 177 +++++++++++++++++++++++++++++++++++++ doc/README.omap3 | 32 +++++++ include/asm-arm/arch-omap3/gpio.h | 93 +++++++++++++++++++ 4 files changed, 303 insertions(+), 1 deletions(-) create mode 100644 cpu/arm_cortexa8/omap3/gpio.c create mode 100644 include/asm-arm/arch-omap3/gpio.h
cpu/arm_cortexa8/omap3/Makefile +1 -1
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a SOBJS := lowlevel_init.o -COBJS := sys_info.o board.o clock.o interrupts.o mem.o syslib.o +COBJS := sys_info.o board.o clock.o gpio.o interrupts.o mem.o syslib.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
cpu/arm_cortexa8/omap3/gpio.c new file +177 -0
177 lines not on this page · raw message
doc/README.omap3 +32 -0
@@ -84,6 +84,38 @@ For all other commands see help +Interfaces +========== + +gpio + +To set a bit : + + if (!omap_request_gpio(N)) { + omap_set_gpio_direction(N, 0); + omap_set_gpio_dataout(N, 1); + } + +To clear a bit : + + if (!omap_request_gpio(N)) { + omap_set_gpio_direction(N, 0); + omap_set_gpio_dataout(N, 0); + } + +To read a bit : + + if (!omap_request_gpio(N)) { + omap_set_gpio_direction(NULL, 1); + val = omap_get_gpio_datain(N); + omap_free_gpio(N); + } + if (val) + printf("GPIO N is set\n"); + else + printf("GPIO N is clear\n"); + + Acknowledgements ================
include/asm-arm/arch-omap3/gpio.h new file +93 -0
93 lines not on this page · raw message
Signature · 1 line
1.6.0.5
PATCH 3/10 ZOOM2 Add support for debug board detection.
The logicpd web site is a good source for general information on this board. Please start looking here if the below links are broken.
http://www.logicpd.com
This is a pdf of the product
http://www.logicpd.com/sites/default/files/1012659A_Zoom_OMAP34x-II_MDP_Brief.pdf
This is a pdf of the product quick start guide.
The debug board is described here.
http://support.logicpd.com/downloads/1165/
This is a wiki showing the debug board in use
https://omapzoom.org/gf/project/omapzoom/wiki/?pagename=GettingStartedWithZoomII_AKA_OMAP34XII_MDP
The zoom2 has an auxillary board that contains the serial, net, jtag and battery simulator. This change supports a runtime check if the debug board is connected.
--- board/omap3/zoom2/Makefile | 3 +- board/omap3/zoom2/debug_board.c | 58 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletions(-) create mode 100644 board/omap3/zoom2/debug_board.c
board/omap3/zoom2/Makefile +2 -1
@@ -25,7 +25,8 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := zoom2.o +COBJS := zoom2.o \ + debug_board.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
board/omap3/zoom2/debug_board.c new file +58 -0
58 lines not on this page · raw message
Signature · 1 line
1.6.0.5
PATCH 4/10 ZOOM2 Add serial support.
Zoom2 serial is in general supplied by one of the 4 UARTS on the debug board. The default serial is from the USB connector on left side of the debug board. The USB connector will produce 2 of the 4 UARTS. On your host pick the first enumeration.
The serial port set up is the same with Zoom1.
Baud rate 115200, 8 bit data, no parity, 1 stop bit, no flow.
The kernel bootargs are
console=ttyS3,115200n8
--- board/omap3/zoom2/Makefile | 3 +- board/omap3/zoom2/zoom2.c | 30 +++++++++ board/omap3/zoom2/zoom2_serial.c | 130 ++++++++++++++++++++++++++++++++++++++ board/omap3/zoom2/zoom2_serial.h | 75 ++++++++++++++++++++++ common/serial.c | 2 + drivers/serial/ns16550.c | 4 +- include/configs/omap3_zoom2.h | 28 ++++---- include/serial.h | 7 ++ 8 files changed, 262 insertions(+), 17 deletions(-) create mode 100644 board/omap3/zoom2/zoom2_serial.c create mode 100644 board/omap3/zoom2/zoom2_serial.h
board/omap3/zoom2/Makefile +2 -1
@@ -26,7 +26,8 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := zoom2.o \ - debug_board.o + debug_board.o \ + zoom2_serial.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
board/omap3/zoom2/zoom2.c +30 -0
@@ -30,10 +30,24 @@*/ #include <common.h> #include <asm/io.h> +#include <asm/arch/mem.h> #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> #include <asm/mach-types.h> #include "zoom2.h" +#include "zoom2_serial.h" + +extern void enable_gpmc_config (u32 *gpmc_config,gpmc_csx_t *gpmc_cs_base, +u32 base,u32 size); + +static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG ] = { +0x00011000 , +0x001F1F01 , +0x00080803 , +0x1D091D09 , +0x041D1F1F , +0x1D0904C4 ,0 +};/* * Routine: board_init
@@ -42,13 +56,29 @@int board_init (void ) {DECLARE_GLOBAL_DATA_PTR ; +gpmc_csx_t *serial_cs_base; +u32 *gpmc_config;gpmc_init ();/* in SRAM or SDRAM, finish GPMC */ + +/* Configure console support on zoom2 */ + gpmc_config = gpmc_serial_TL16CP754C; + serial_cs_base = (gpmc_csx_t *) (GPMC_CONFIG_CS0_BASE + + (3 *GPMC_CONFIG_WIDTH )); +enable_gpmc_config (gpmc_config, + serial_cs_base, +SERIAL_TL16CP754C_BASE , +GPMC_SIZE_16M ); +/* board id for Linux */ gd->bd->bi_arch_number =MACH_TYPE_OMAP_ZOOM2 ;/* boot param addr */ gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 +0x100 ); +#if defined(CONFIG_STATUS_LED ) && defined(STATUS_LED_BOOT ) +status_led_set (STATUS_LED_BOOT ,STATUS_LED_ON ); +#endif +return 0 ; }
board/omap3/zoom2/zoom2_serial.c new file +130 -0
130 lines not on this page · raw message
board/omap3/zoom2/zoom2_serial.h new file +75 -0
75 lines not on this page · raw message
common/serial.c +2 -0
@@ -68,6 +68,8 @@ struct serial_device *__default_serial_console (void)#else #error "CONFIG_SERIAL? missing."#endif +#elif defined(CONFIG_OMAP3_ZOOM2 ) +return DEFAULT_ZOOM2_SERIAL_DEVICE ;#else #error No default console#endif
drivers/serial/ns16550.c +2 -2
@@ -17,7 +17,7 @@void NS16550_init (NS16550_t com_port,int baud_divisor) { com_port->ier =0x00 ; -#ifdef CONFIG_OMAP +#if defined(CONFIG_OMAP ) && !defined(CONFIG_OMAP3_ZOOM2 ) com_port->mdr1 =0x7 ;/* mode select reset TL16C750*/ #endif com_port->lcr =UART_LCR_BKSE |UART_LCRVAL ;
@@ -30,7 +30,7 @@ void NS16550_init (NS16550_t com_port, int baud_divisor) com_port->dll = baud_divisor &0xff ; com_port->dlm = (baud_divisor >>8 ) &0xff ; com_port->lcr =UART_LCRVAL ; -#if defined(CONFIG_OMAP ) +#if defined(CONFIG_OMAP ) && !defined(CONFIG_OMAP3_ZOOM2 )#if defined(CONFIG_APTIX ) com_port->mdr1 =3 ;/* /13 mode so Aptix 6MHz can hit 115200 */ #else
include/configs/omap3_zoom2.h +14 -14
@@ -69,26 +69,26 @@/* * NS16550 Configuration +* Zoom2 uses the TL16CP754C on the debug board */ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - +#define CONFIG_SERIAL_MULTI 1/* -* select serial console configuration +* 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 CONFIG_CONS_INDEX 3 -#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3/* UART3 */ +#define DEFAULT_ZOOM2_SERIAL_DEVICE (&zoom2_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_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE {115200}/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} +#define CONFIG_MMC 1#define CONFIG_OMAP3_MMC 1#define CONFIG_DOS_PARTITION 1
include/serial.h +7 -0
@@ -42,6 +42,13 @@ extern struct serial_device s3c24xx_serial1_device;extern struct serial_device s3c24xx_serial2_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; +#endif +extern struct serial_device serial_ffuart_device;extern struct serial_device serial_btuart_device;extern struct serial_device serial_stuart_device;
Signature · 1 line
1.6.0.5
PATCH 5/10 ZOOM2: rename timer divisor
Divisor field is called PTV not PVT.
This change is needed because of earlier OMAP commit 81472d893fa565c9d300928a40e504a689bde131
of the same name
--- include/configs/omap3_zoom2.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
include/configs/omap3_zoom2.h +2 -4
@@ -170,11 +170,9 @@* 2430 has 12 GP timers, they can be driven by the SysClk (12/13/19.2) or by * 32KHz clk, or from external sig. This rate is divided by a local divisor. */ -#define V_PVT 7 -#define CONFIG_SYS_TIMERBASE (OMAP34XX_GPT2) -#define CONFIG_SYS_PVT V_PVT/* 2^(pvt+1) */ -#define CONFIG_SYS_HZ ((V_SCLK) / (2 << CONFIG_SYS_PVT)) +#define CONFIG_SYS_PTV 7/* 2^(PTV+1) */ +#define CONFIG_SYS_HZ ((V_SCLK) / (2 << CONFIG_SYS_PTV))/*----------------------------------------------------------------------- * Stack sizes
Signature · 1 line
1.6.0.5
PATCH 6/10 LED Add documentation describing the status_led and colour led API.
This document describes the u-boot status LED API.
This allows common u-boot commands to use a board's leds to provide status for activities like booting and downloading files.
--- doc/README.LED | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) create mode 100644 doc/README.LED
doc/README.LED new file +78 -0
@@ -0,0 +1,78 @@ +Status LED +======================================== + +This README describes the status LED API. + +The API is defined by the include file include/status_led.h + +The first step is to define CONFIG_STATUS_LED in the board config file. + +If the LED support is only for a single board, define CONFIG_BOARD_SPECIFIC_LED +in the board config file. + +At a minimum, these macros must be defined at +STATUS_LED_BIT +STATUS_LED_STATE +STATUS_LED_PERIOD + +If there are multiple status LED's define +STATUS_LED_BIT<n> +STATUS_LED_STATE<n> +STATUS_LED_PERIOD<n> + +Where <n> can a integer 1 through 3. + +STATUS_LED_BIT is passed into the __led_* functions to identify which LED is +being acted on. As such, the value choose must be unique with with respect to +the other STATUS_LED_BIT's. Mapping the value to a physical LED is the +reponsiblity of the __led_* function. + +STATUS_LED_STATE is the initial state of the LED. It should be set to one of +these values: STATUS_LED_OFF or STATUS_LED_ON. + +STATUS_LED_PERIOD is how long is the LED blink period. This usually set to +(CONFIG_SYS_HZ / <N>) where <N> is the frequency of the blink. Typical values +range from 2 to 10. + +Some other LED macros + +STATUS_LED_BOOT is the LED to light when the board is booting. This must be a +valid STATUS_LED_BIT value. + +STATUS_LED_RED is the red LED. It is used signal errors. This must be a valid +STATUS_LED_BIT value. Other similar color LED's are STATUS_LED_YELLOW and +STATUS_LED_BLUE. + +These board must define these functions + +__led_init is called once to initialize the LED to STATUS_LED_STATE. One time +start up code should be placed here. + +__led_set is called to change the state of the LED. + +__led_toggle is called to toggle the current state of the LED. + +Colour LED +======================================== + +Colour LED's are at present only used by ARM. + +The functions names explain their purpose. + +coloured_LED_init +red_LED_on +red_LED_off +green_LED_on +green_LED_off +yellow_LED_on +yellow_LED_off +blue_LED_on +blue_LED_off + +These are weakly defined in lib_arm/board.c to noops. Where applicable, define +these functions in the board specific source. + +TBD : Describe older board dependent macros similar to what is done for +CONFIG_TQM8xxL. + +TBD : Describe general support via asm/status_led.h
Signature · 1 line
1.6.0.5
PATCH 7/10 ARM Add blue colour LED to status_led.
There is exiting support for red,yellow,green but no blue. The main LED on the zoom2 is a blue LED.
--- include/status_led.h | 4 ++++ lib_arm/board.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-)
include/status_led.h +4 -0
@@ -397,6 +397,8 @@ extern void green_LED_on(void);extern void green_LED_off (void );extern void yellow_LED_on (void );extern void yellow_LED_off (void ); +extern void blue_LED_on (void ); +extern void blue_LED_off (void );#else .extern LED_init .extern red_LED_on
@@ -405,6 +407,8 @@ extern void yellow_LED_off(void); .extern yellow_LED_off .extern green_LED_on .extern green_LED_off + .extern blue_LED_on + .extern blue_LED_off#endif #endif /* CONFIG_STATUS_LED */
lib_arm/board.c +4 -0
@@ -136,6 +136,10 @@ void inline __yellow_LED_on(void) {}void inline yellow_LED_on (void )__attribute__((weak,alias ("__yellow_LED_on" )));void inline __yellow_LED_off (void ) {}void inline yellow_LED_off (void )__attribute__((weak,alias ("__yellow_LED_off" ))); +void inline __blue_LED_on (void ) {} +void inline blue_LED_on (void )__attribute__((weak,alias ("__blue_LED_on" ))); +void inline __blue_LED_off (void ) {} +void inline blue_LED_off (void )__attribute__((weak,alias ("__blue_LED_off" )));/************************************************************************ * Init Utilities *
Signature · 1 line
1.6.0.5
PATCH 8/10 ZOOM2 Add led support.
This patch controls the large LED on the top left of the zoom2.
--- board/omap3/zoom2/Makefile | 8 ++- board/omap3/zoom2/led.c | 125 +++++++++++++++++++++++++++++++++++++++++ board/omap3/zoom2/zoom2.c | 4 +- include/configs/omap3_zoom2.h | 16 +++++ 4 files changed, 149 insertions(+), 4 deletions(-) create mode 100644 board/omap3/zoom2/led.c
board/omap3/zoom2/Makefile +5 -3
@@ -25,10 +25,12 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := zoom2.o \ - debug_board.o \ - zoom2_serial.o +COBJS-y := $(BOARD).o +COBJS-y += debug_board.o +COBJS-y += zoom2_serial.o +COBJS-${CONFIG_STATUS_LED} += led.o +COBJS := $(sort $(COBJS-y)) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
board/omap3/zoom2/led.c new file +125 -0
125 lines not on this page · raw message
board/omap3/zoom2/zoom2.c +3 -1
@@ -29,6 +29,9 @@* MA 02111-1307 USA */ #include <common.h> +#ifdef CONFIG_STATUS_LED +#include <status_led.h> +#endif #include <asm/io.h> #include <asm/arch/mem.h> #include <asm/arch/mux.h>
@@ -78,7 +81,6 @@ int board_init (void)#if defined(CONFIG_STATUS_LED ) && defined(STATUS_LED_BOOT )status_led_set (STATUS_LED_BOOT ,STATUS_LED_ON );#endif -return 0 ; }
include/configs/omap3_zoom2.h +16 -0
@@ -93,6 +93,22 @@#define CONFIG_OMAP3_MMC 1#define CONFIG_DOS_PARTITION 1 +/* Status LED */ +#define CONFIG_STATUS_LED 1/* Status LED enabled */ +#define CONFIG_BOARD_SPECIFIC_LED 1 +#define STATUS_LED_BLUE 0 +#define STATUS_LED_RED 1 +/* 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_BIT1 STATUS_LED_RED +#define STATUS_LED_STATE1 STATUS_LED_OFF +#define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2) +/* Optional value */ +#define STATUS_LED_BOOT STATUS_LED_BIT +/* commands to include */ #include <config_cmd_default.h>
Signature · 1 line
1.6.0.5
PATCH 9/10 ZOOM1 Remove more legacy NAND defines.
These legacy NAND defines are no longer needed by this target.
--- include/configs/omap3_zoom1.h | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-)
include/configs/omap3_zoom1.h +0 -13
@@ -132,19 +132,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of NAND */ /* devices */ -#define SECTORSIZE 512 - -#define NAND_ALLOW_ERASE_ALL -#define ADDR_COLUMN 1 -#define ADDR_PAGE 2 -#define ADDR_COLUMN_PAGE 3 - -#define NAND_ChipID_UNKNOWN 0x00 -#define NAND_MAX_FLOORS 1 -#define NAND_MAX_CHIPS 1 -#define NAND_NO_RB 1 -#define CONFIG_SYS_NAND_WP -#define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0"
Signature · 1 line
1.6.0.5
PATCH 10/10 OMAP Consolidate common u-boot.lds to cpu layer.
The u-boot.lds file is common for all omap boards.
Move a cleaned up version to the cpu layer and add makefile logic to use it.
--- board/omap3/beagle/u-boot.lds | 63 ------------------------------------- board/omap3/evm/u-boot.lds | 63 ------------------------------------- board/omap3/overo/u-boot.lds | 63 ------------------------------------- board/omap3/pandora/u-boot.lds | 63 ------------------------------------- board/omap3/zoom1/u-boot.lds | 63 ------------------------------------- board/omap3/zoom2/u-boot.lds | 63 ------------------------------------- cpu/arm_cortexa8/omap3/config.mk | 2 + cpu/arm_cortexa8/omap3/u-boot.lds | 58 ++++++++++++++++++++++++++++++++++ 8 files changed, 60 insertions(+), 378 deletions(-) delete mode 100644 board/omap3/beagle/u-boot.lds delete mode 100644 board/omap3/evm/u-boot.lds delete mode 100644 board/omap3/overo/u-boot.lds delete mode 100644 board/omap3/pandora/u-boot.lds delete mode 100644 board/omap3/zoom1/u-boot.lds delete mode 100644 board/omap3/zoom2/u-boot.lds create mode 100644 cpu/arm_cortexa8/omap3/u-boot.lds
board/omap3/beagle/u-boot.lds deleted +0 -63
@@ -1,63 +0,0 @@ -/* - * January 2004 - Changed to support H4 device - * Copyright (c) 2004 Texas Instruments - * - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <[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 - */ - -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) -ENTRY(_start) -SECTIONS -{ - . = 0x00000000; - - . = ALIGN(4); - .text : - { - cpu/arm_cortexa8/start.o (.text) - *(.text) - } - - . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } - - .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } - __exidx_start = .; - .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } - __exidx_end = .; - - . = ALIGN(4); - .data : { *(.data) } - - . = ALIGN(4); - .got : { *(.got) } - - __u_boot_cmd_start = .; - .u_boot_cmd : { *(.u_boot_cmd) } - __u_boot_cmd_end = .; - - . = ALIGN(4); - __bss_start = .; - .bss : { *(.bss) } - _end = .; -}
board/omap3/evm/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/omap3/overo/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/omap3/pandora/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/omap3/zoom1/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
board/omap3/zoom2/u-boot.lds deleted +0 -63
63 lines not on this page · raw message
cpu/arm_cortexa8/omap3/config.mk +2 -0
@@ -34,3 +34,5 @@ PLATFORM_CPPFLAGS +=$(call cc-option) PLATFORM_CPPFLAGS +=$(call cc-option,-mno-thumb-interwork,) PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,\ $(call cc-option,-malignment-traps,)) + +LDSCRIPT := $(SRCTREE)/cpu/arm_cortexa8/omap3/u-boot.lds
cpu/arm_cortexa8/omap3/u-boot.lds new file +58 -0
58 lines not on this page · raw message
Signature · 1 line
1.6.0.5
Jean-Christophe PLAGNIOL-VILLARD
AppliedPATCH 9/10 ZOOM1 Remove more legacy NAND defines.
In reply to Tom RixQuoted 4 lines · Tom Rix
These legacy NAND defines are no longer needed by this target.
Signed-off-by Tom Rix <[email protected]>---
Applied to arm/next
Best Regards,
J.
PATCH 8/10 ZOOM2 Add led support.
In reply to Tom RixQuoted 18 lines
board/omap3/zoom2/zoom2.c +2
-1+#include <status_led.h> +#endif #include <asm/io.h> #include <asm/arch/mem.h> #include <asm/arch/mux.h> @@ -78,7 +81,6 @@ int board_init (void)#if defined(CONFIG_STATUS_LED ) && defined(STATUS_LED_BOOT )status_led_set (STATUS_LED_BOOT ,STATUS_LED_ON );#endif -return 0 ; }include/configs/omap3_zoom2.h +0
-0
include/configs/omap3_zoom2.h line 97
Quoted 5 lines
include/configs/omap3_zoom2.h +2
-0@@ -93,6 +93,22 @@#define CONFIG_OMAP3_MMC 1#define CONFIG_DOS_PARTITION 1 +/* Status LED */ +#define CONFIG_STATUS_LED 1/* Status LED enabled */
^^^^^^^^^^^^^^^
please use tab not space and so on
Best Regards,
J.
Jean-Christophe PLAGNIOL-VILLARD
AppliedPATCH 7/10 ARM Add blue colour LED to status_led.
In reply to Tom RixQuoted 5 lines · Tom Rix
There is exiting support for red,yellow,green but no blue. The main LED on the zoom2 is a blue LED.
Signed-off-by Tom Rix <[email protected]>---
Applied to arm/next
Best Regards,
J.
PATCH 7/10 ARM Add blue colour LED to status_led.
Quoted 5 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 3 lines · Tom Rix
There is exiting support for red,yellow,green but no blue. The main LED on the zoom2 is a blue LED.
Quoted 8 lines
Quoted 3 lines
Signed-off-by Tom Rix <[email protected]>---
Applied to arm/next
Best Regards,
J.
Thanks.
I will work the outstanding zoom2 issues on the arm/next branch.
Tom
Jean-Christophe PLAGNIOL-VILLARD
AppliedPATCH 6/10 LED Add documentation describing the status_led and colour led API.
In reply to Tom RixQuoted 6 lines · Tom Rix
This document describes the u-boot status LED API.
This allows common u-boot commands to use a board's leds to provide status for activities like booting and downloading files.Signed-off-by Tom Rix <[email protected]>---
Applied to arm/next
Best Regards,
J.
PATCH 5/10 ZOOM2: rename timer divisor
In reply to Tom RixQuoted 6 lines · Tom Rix
Divisor field is called PTV not PVT.
This change is needed because of earlier OMAP commit
81472d893fa565c9d300928a40e504a689bde131
of the same name
this change need to be done at the first patch otherwise will not be able to compile it or bisect it at all
Best Regards,
J.
PATCH 1/10 ZOOM2 Add initial support for Zoom2
In reply to Tom RixQuoted 84 lines · Tom Rix
Zoom2 is a new board from Texas Instruments and LogicPD
The logicpd web site is a good source for general information on this board. Please start looking here if the below links are broken.
http://www.logicpd.comThis is a pdf of the product
http://www.logicpd.com/sites/default/files/1012659A_Zoom_OMAP34x-II_MDP_Brief.pdf
This is the product description web page
http://www.logicpd.com/products/development-kits/texas-instruments-zoom%E2%84%A2-omap34x-ii-mdpThis patch provides a zoom2 base target by copying zoom1 and by making some obvious changes.
To configure, run
makeomap3_zoom2_configSigned-off-by Tom Rix <[email protected]>--- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/omap3/common/Makefile | 1 + board/omap3/zoom2/Makefile | 49 ++++++++ board/omap3/zoom2/config.mk | 33 ++++++ board/omap3/zoom2/u-boot.lds | 63 +++++++++++ board/omap3/zoom2/zoom2.c | 76 +++++++++++++ board/omap3/zoom2/zoom2.h | 151 +++++++++++++++++++++++++ doc/README.omap3 | 13 ++ include/configs/omap3_zoom2.h | 247 +++++++++++++++++++++++++++++++++++++++++ 11 files changed, 641 insertions(+), 0 deletions(-) create mode 100644 board/omap3/zoom2/Makefile create mode 100644 board/omap3/zoom2/config.mk create mode 100644 board/omap3/zoom2/u-boot.lds create mode 100644 board/omap3/zoom2/zoom2.c create mode 100644 board/omap3/zoom2/zoom2.h create mode 100644 include/configs/omap3_zoom2.hMAINTAINERS +4
-0@@ -611,6 +611,10 @@ Stelian Pop <[email protected]> at91sam9263ek ARM926EJS (AT91SAM9263 SoC) at91sam9rlek ARM926EJS (AT91SAM9RL SoC) +Tom Rix <[email protected]> + + omap3_zoom2 ARM CORTEX-A8 (OMAP3xx SoC) + Stefan Roese <[email protected]> ixdpg425 xscaleMAKEALL +1
-0@@ -561,6 +561,7 @@ LIST_ARM_CORTEX_A8=" \ omap3_evm \ omap3_pandora \ omap3_zoom1 \ + omap3_zoom2 \ " #########################################################################Makefile +3
-0@@ -2980,6 +2980,9 @@ omap3_pandora_config : unconfig omap3_zoom1_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3 +omap3_zoom2_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 omap3 omap3 + ######################################################################### ## XScale Systems #########################################################################board/omap3/common/Makefile +0
-0
board/omap3/common/Makefile COBJS-$(CONFIG_OMAP3_BEAGLE) += power.o · line 36
Quoted 4 lines
board/omap3/common/Makefile +1
-0@@ -33,6 +33,7 @@ COBJS-$(CONFIG_OMAP3_BEAGLE) += power.o COBJS-$(CONFIG_OMAP3_OVERO) += power.o COBJS-$(CONFIG_OMAP3_PANDORA) += power.o COBJS-$(CONFIG_OMAP3_ZOOM1) += power.o +COBJS-$(CONFIG_OMAP3_ZOOM2) += power.o
how many CONFIG_X_BOARDS will we have?
It's time to create a functionnality CONFIG_
(it can be done in an other patch but no other new board will be allow to do it)
Quoted 23 lines
board/omap3/common/Makefile +0
-0COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)board/omap3/zoom2/Makefile new file +15
-0+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN(4); + .text : + { + cpu/arm_cortexa8/start.o (.text)
board/omap3/zoom2/Makefile
Quoted 10 lines
board/omap3/zoom2/Makefile new file +10
-0+ *(.text) + } + + . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } + __exidx_start = .; + .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } + __exidx_end = .;
as said precedently .ARM.extab & .ARM.exidx is not needed please remove
Quoted 21 lines
board/omap3/zoom2/Makefile new file +16
-0+ + . = ALIGN(4); + .data : { *(.data) } + + . = ALIGN(4); + .got : { *(.got) } + + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + . = ALIGN(4); + __bss_start = .; + .bss : { *(.bss) } + _end = .; +}board/omap3/zoom2/zoom2.c new file +0
-0
Quoted 3 lines
new file mode 100644
index 0000000..08d2321
---/dev/null
Best Regards,
J.
PATCH 1/10 ZOOM2 Add initial support for Zoom2
Quoted 120 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 84 lines · Tom Rix
Zoom2 is a new board from Texas Instruments and LogicPD
The logicpd web site is a good source for general information on this board. Please start looking here if the below links are broken.
http://www.logicpd.comThis is a pdf of the product
http://www.logicpd.com/sites/default/files/1012659A_Zoom_OMAP34x-II_MDP_Brief.pdf
This is the product description web page
http://www.logicpd.com/products/development-kits/texas-instruments-zoom%E2%84%A2-omap34x-ii-mdpThis patch provides a zoom2 base target by copying zoom1 and by making some obvious changes.
To configure, run
makeomap3_zoom2_configSigned-off-by Tom Rix <[email protected]>--- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/omap3/common/Makefile | 1 + board/omap3/zoom2/Makefile | 49 ++++++++ board/omap3/zoom2/config.mk | 33 ++++++ board/omap3/zoom2/u-boot.lds | 63 +++++++++++ board/omap3/zoom2/zoom2.c | 76 +++++++++++++ board/omap3/zoom2/zoom2.h | 151 +++++++++++++++++++++++++ doc/README.omap3 | 13 ++ include/configs/omap3_zoom2.h | 247 +++++++++++++++++++++++++++++++++++++++++ 11 files changed, 641 insertions(+), 0 deletions(-) create mode 100644 board/omap3/zoom2/Makefile create mode 100644 board/omap3/zoom2/config.mk create mode 100644 board/omap3/zoom2/u-boot.lds create mode 100644 board/omap3/zoom2/zoom2.c create mode 100644 board/omap3/zoom2/zoom2.h create mode 100644 include/configs/omap3_zoom2.hMAINTAINERS +4
-0@@ -611,6 +611,10 @@ Stelian Pop <[email protected]> at91sam9263ek ARM926EJS (AT91SAM9263 SoC) at91sam9rlek ARM926EJS (AT91SAM9RL SoC) +Tom Rix <[email protected]> + + omap3_zoom2 ARM CORTEX-A8 (OMAP3xx SoC) + Stefan Roese <[email protected]> ixdpg425 xscaleMAKEALL +1
-0@@ -561,6 +561,7 @@ LIST_ARM_CORTEX_A8=" \ omap3_evm \ omap3_pandora \ omap3_zoom1 \ + omap3_zoom2 \ " #########################################################################Makefile +3
-0@@ -2980,6 +2980,9 @@ omap3_pandora_config : unconfig omap3_zoom1_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 omap3 omap3 +omap3_zoom2_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 omap3 omap3 + ######################################################################### ## XScale Systems #########################################################################board/omap3/common/Makefile +0
-0board/omap3/common/Makefile COBJS-$(CONFIG_OMAP3_BEAGLE) += power.o · line 36
Quoted 4 lines
board/omap3/common/Makefile +1
-0@@ -33,6 +33,7 @@ COBJS-$(CONFIG_OMAP3_BEAGLE) += power.o COBJS-$(CONFIG_OMAP3_OVERO) += power.o COBJS-$(CONFIG_OMAP3_PANDORA) += power.o COBJS-$(CONFIG_OMAP3_ZOOM1) += power.o +COBJS-$(CONFIG_OMAP3_ZOOM2) += power.ohow many
CONFIG_X_BOARDSwill we have?It's time to create a functionnality
CONFIG_
(it can be done in an other patch but no other new board will be allow to do it)Quoted 26 lines
board/omap3/common/Makefile +0
-0COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)board/omap3/zoom2/Makefile new file +18
-0+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN(4); + .text : + { + cpu/arm_cortexa8/start.o (.text) + *(.text) + } +
Quoted 8 lines
board/omap3/zoom2/Makefile
Quoted 7 lines
board/omap3/zoom2/Makefile new file +7
-0+ . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } + __exidx_start = .; + .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } + __exidx_end = .;as said precedently .ARM.extab & .ARM.exidx is not needed please remove
I've seen you fix it in the 10th patch
Best Regards,
J.
PATCH 1/10 ZOOM2 Add initial support for Zoom2
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 1 line · In message <[email protected]> you wrote:
...
[FULL QUOTE DELETED]
It makes no sense to quote the complete patch when you just want to add one line of comment at the end!
Quoted 9 lines
Quoted 8 lines
board/omap3/zoom2/u-boot.lds line 47
Quoted 7 lines
board/omap3/zoom2/u-boot.lds new file +7
-0+ . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } + __exidx_start = .; + .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } + __exidx_end = .;as said precedently .ARM.extab & .ARM.exidx is not needed please remove
I've seen you fix it in the 10th patch
So what does this mean now? Will this patch 01/10 be accepted?
I asked you before, and I hereby ask again: please make clear what the status of a patch is: accepted or rejected?
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Don't think; let the machine do it for you!" - E. C. Berkeley
PATCH 1/10 ZOOM2 Add initial support for Zoom2
Quoted 20 lines · Wolfgang Denk
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 1 line · In message <[email protected]> you wrote:
...
[FULL QUOTE DELETED]It makes no sense to quote the complete patch when you just want to add one line of comment at the end!
Quoted 8 lines
Quoted 8 lines
board/omap3/zoom2/u-boot.lds line 47
Quoted 7 lines
board/omap3/zoom2/u-boot.lds new file +7
-0+ . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } + __exidx_start = .; + .ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } + __exidx_end = .;as said precedently .ARM.extab & .ARM.exidx is not needed please remove
Quoted 3 lines
Quoted 1 line
I've seen you fix it in the 10th patch
So what does this mean now? Will this patch 01/10 be accepted?
As ask on the [PATCH 05/10] ZOOM2: rename timer divisor this patch and the 5th need to be joined otherwise fine
Best Regards,
J.