February 2009 - U-Boot

[U-Boot] [PATCH] NAND: cmd_nand.c: fix invalid pointers to static relocated chip names
by Valeriy Glushkov 07 Feb '09

07 Feb '09

When U-boot starting from NAND the pointers to chip names are set before relocation. If the original memory block is overwritten after relocation that led to invalid string data in the nand utility. Signed-off-by: Valeriy Glushkov <gvv(a)lstec.com> --- diff --git a/common/cmd_nand.c b/common/cmd_nand.c index b94a2bf..14925cd 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -10,6 +10,7 @@ #include <common.h> +DECLARE_GLOBAL_DATA_PTR; #ifndef CONFIG_NAND_LEGACY /* @@ -193,7 +194,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) for (i = 0; i < CFG_MAX_NAND_DEVICE; i++) { if (nand_info[i].name) printf("Device %d: %s, sector size %u KiB\n", - i, nand_info[i].name, + i, nand_info[i].name + gd->reloc_off, nand_info[i].erasesize >> 10); } return 0; @@ -207,7 +208,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) puts("\nno devices available\n"); else printf("\nDevice %d: %s\n", nand_curr_device, - nand_info[nand_curr_device].name); + nand_info[nand_curr_device].name + gd->reloc_off); return 0; } dev = (int)simple_strtoul(argv[2], NULL, 10); @@ -215,7 +216,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) puts("No such device\n"); return 1; } - printf("Device %d: %s", dev, nand_info[dev].name); + printf("Device %d: %s", dev, nand_info[dev].name + gd->reloc_off); puts("... is now current device\n"); nand_curr_device = dev; @@ -993,8 +994,8 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) show_boot_progress (55); printf ("\nLoading from device %d: %s at 0x%lx (offset 0x%lx)\n", - dev, nand_dev_desc[dev].name, nand_dev_desc[dev].IO_ADDR, - offset); + dev, nand_dev_desc[dev].name + gd->reloc_off, + nand_dev_desc[dev].IO_ADDR, offset); if (nand_legacy_rw (nand_dev_desc + dev, NANDRW_READ, offset, SECTORSIZE, NULL, (u_char *)addr)) { -- 1.5.2.5

3 3

[U-Boot] [PATCH v2][RFC] Add native win32 mkimage support
by Peter Tyser 07 Feb '09

07 Feb '09

Add a mkimage_win32.exe build target which can produce a native win32 mkimage executable using the MinGW toolchain. The mkimage_win32.exe binary is generated when the MINGW_COMPILE environment variable is defined. The mkimage_win32.exe binary can be used by those who use Windows as an OS build environment but don't use cygwin. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- I'm not sure what the odds of this being picked up, but I thought others might find this useful. Changes since v1: - Fixed "Engineering" typos Makefile | 5 ++- README | 6 +++ include/image.h | 2 + include/libfdt_env.h | 6 +++ include/linux/types.h | 5 ++- tools/Makefile | 13 ++++++- tools/mingw_support.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/mingw_support.h | 48 +++++++++++++++++++++++++ tools/mkimage.c | 4 ++ tools/mkimage.h | 5 +++ 10 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 tools/mingw_support.c create mode 100644 tools/mingw_support.h diff --git a/Makefile b/Makefile index 84e6125..8fb59de 100644 --- a/Makefile +++ b/Makefile @@ -3447,8 +3447,9 @@ clean: $(obj)tools/envcrc \ $(obj)tools/gdb/{astest,gdbcont,gdbsend} \ $(obj)tools/gen_eth_addr $(obj)tools/img2srec \ - $(obj)tools/mkimage $(obj)tools/mpc86x_clk \ - $(obj)tools/ncb $(obj)tools/ubsha1 + $(obj)tools/mkimage $(obj)tools/mkimage_win32.exe \ + $(obj)tools/mpc86x_clk $(obj)tools/ncb \ + $(obj)tools/ubsha1 \ @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \ $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin} \ $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ diff --git a/README b/README index 522471c..96b8db7 100644 --- a/README +++ b/README @@ -2695,6 +2695,12 @@ necessary. For example using the ELDK on a 4xx CPU, please enter: $ CROSS_COMPILE=ppc_4xx- $ export CROSS_COMPILE +Note: If you wish to generate a WIN32 version of the mkimage tool + using the MinGW toolchain (see http://www.mingw.org) you must + also set the MINGW_COMPILE environment variable, for example: + + $ export MINGW_COMPILE=i586-mingw32msvc- + U-Boot is intended to be simple to build. After installing the sources you must configure U-Boot for one specific board type. This is done by typing: diff --git a/include/image.h b/include/image.h index 4609200..ec6bb1a 100644 --- a/include/image.h +++ b/include/image.h @@ -34,7 +34,9 @@ #define __IMAGE_H__ #if USE_HOSTCC +#ifndef __MINGW32__ #include <endian.h> +#endif /* new uImage format support enabled on host */ #define CONFIG_FIT 1 diff --git a/include/libfdt_env.h b/include/libfdt_env.h index ea474a5..bdc7a58 100644 --- a/include/libfdt_env.h +++ b/include/libfdt_env.h @@ -24,8 +24,10 @@ #ifdef USE_HOSTCC #include <stdint.h> #include <string.h> +#ifndef __MINGW32__ #include <endian.h> #include <byteswap.h> +#endif /* __MINGW32__ */ #else #include <linux/string.h> #include <linux/types.h> @@ -36,6 +38,10 @@ extern struct fdt_header *working_fdt; /* Pointer to the working fdt */ #if __BYTE_ORDER == __LITTLE_ENDIAN +#ifdef __MINGW32__ +extern uint32_t bswap_32(uint32_t x); +extern uint64_t bswap_64(uint64_t x); +#endif #define fdt32_to_cpu(x) bswap_32(x) #define cpu_to_fdt32(x) bswap_32(x) #define fdt64_to_cpu(x) bswap_64(x) diff --git a/include/linux/types.h b/include/linux/types.h index 1b0b4a4..90c0695 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -10,10 +10,13 @@ #ifndef __KERNEL_STRICT_NAMES +#ifndef __MINGW32__ +/* prevent mingw overlaps for certain typedefs */ typedef __kernel_fd_set fd_set; typedef __kernel_dev_t dev_t; typedef __kernel_ino_t ino_t; typedef __kernel_mode_t mode_t; +#endif typedef __kernel_nlink_t nlink_t; typedef __kernel_off_t off_t; typedef __kernel_pid_t pid_t; @@ -54,7 +57,7 @@ typedef __kernel_loff_t loff_t; typedef __kernel_size_t size_t; #endif -#ifndef _SSIZE_T +#if !defined(_SSIZE_T) && !defined(__MINGW32__) #define _SSIZE_T typedef __kernel_ssize_t ssize_t; #endif diff --git a/tools/Makefile b/tools/Makefile index 9e9ee15..64d4a3f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -21,7 +21,8 @@ # MA 02111-1307 USA # -BIN_FILES = img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX) +BIN_FILES = img2srec$(SFX) mkimage$(SFX) mkimage_win32.exe envcrc$(SFX) \ + ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX) OBJ_LINKS = env_embedded.o crc32.o md5.o sha1.o image.o OBJ_FILES = img2srec.o mkimage.o envcrc.o ubsha1.o gen_eth_addr.o bmp_logo.o @@ -39,6 +40,9 @@ endif LIBFDT_OBJ_FILES = $(obj)fdt.o $(obj)fdt_ro.o $(obj)fdt_rw.o $(obj)fdt_strerror.o $(obj)fdt_wip.o +MKIMAGE_WIN32_SRC_FILES = $(src)mkimage.c $(src)mingw_support.c $(obj)crc32.c \ + $(obj)image.c $(obj)md5.c $(obj)sha1.c $(LIBFDT_OBJ_FILES:%.o=%.c) + LOGO_H = $(OBJTREE)/include/bmp_logo.h ifeq ($(LOGO_BMP),) @@ -151,6 +155,13 @@ $(obj)mkimage$(SFX): $(obj)mkimage.o $(obj)crc32.o $(obj)image.o $(obj)md5.o $(o $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^ $(STRIP) $@ +# Build native win32 mkimage if mingw compiler is specified +ifneq ($(MINGW_COMPILE),) +$(obj)mkimage_win32.exe: $(MKIMAGE_WIN32_SRC_FILES) + $(MINGW_COMPILE)gcc $(FIT_CFLAGS) $(HOST_LDFLAGS) -o $@ $^ + $(MINGW_COMPILE)strip $@ +endif + $(obj)ncb$(SFX): $(obj)ncb.o $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^ $(STRIP) $@ diff --git a/tools/mingw_support.c b/tools/mingw_support.c new file mode 100644 index 0000000..237914b --- /dev/null +++ b/tools/mingw_support.c @@ -0,0 +1,95 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * + * mmap/munmap implementation derived from: + * Clamav Native Windows Port : mmap win32 compatibility layer + * Copyright (c) 2005-2006 Gianluigi Tiesi <sherpya(a)netfarm.it> + * Parts by Kees Zeelenberg <kzlg(a)users.sourceforge.net> (LibGW32C) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this software; if not, write to the + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "mingw_support.h" +#include <stdio.h> +#include <stdint.h> +#include <errno.h> +#include <io.h> + +uint16_t bswap_16(uint16_t __x) +{ + return (__x >> 8) | (__x << 8); +} + +uint32_t bswap_32(uint32_t __x) +{ + return (bswap_16(__x & 0xffff) << 16) | (bswap_16(__x >> 16)); +} + +uint64_t bswap_64(uint64_t __x) +{ + return (((uint64_t) bswap_32(__x & 0xffffffff)) << 32) | + (bswap_32(__x >> 32)); +} + +int fsync(int fd) +{ + return _commit(fd); +} + +void *mmap(void *addr, size_t len, int prot, int flags, int fd, int offset) +{ + void *map = NULL; + HANDLE handle = INVALID_HANDLE_VALUE; + DWORD cfm_flags = 0, mvf_flags = 0; + + switch (prot) { + case PROT_READ | PROT_WRITE: + cfm_flags = PAGE_READWRITE; + mvf_flags = FILE_MAP_ALL_ACCESS; + break; + case PROT_WRITE: + cfm_flags = PAGE_READWRITE; + mvf_flags = FILE_MAP_WRITE; + break; + case PROT_READ: + cfm_flags = PAGE_READONLY; + mvf_flags = FILE_MAP_READ; + break; + default: + return MAP_FAILED; + } + + handle = CreateFileMappingA((HANDLE) _get_osfhandle(fd), NULL, + cfm_flags, HIDWORD(len), LODWORD(len), NULL); + if (!handle) + return MAP_FAILED; + + map = MapViewOfFile(handle, mvf_flags, HIDWORD(offset), + LODWORD(offset), len); + CloseHandle(handle); + + if (!map) + return MAP_FAILED; + + return map; +} + +int munmap(void *addr, size_t len) +{ + if (!UnmapViewOfFile(addr)) + return -1; + + return 0; +} diff --git a/tools/mingw_support.h b/tools/mingw_support.h new file mode 100644 index 0000000..b4011a6 --- /dev/null +++ b/tools/mingw_support.h @@ -0,0 +1,48 @@ +/* + * Copyright 2008 Extreme Engineering Solutions, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this software; if not, write to the + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __MINGW_SUPPORT_H_ +#define __WINGW_SUPPORT_H_ 1 + +/* Defining __INSIDE_MSYS__ helps to prevent u-boot/mingw overlap */ +#define __INSIDE_MSYS__ 1 + +#include <windows.h> + +/* mmap protections */ +#define PROT_READ 0x1 /* Page can be read */ +#define PROT_WRITE 0x2 /* Page can be written */ +#define PROT_EXEC 0x4 /* Page can be executed */ +#define PROT_NONE 0x0 /* Page can not be accessed */ + +/* Sharing types (must choose one and only one of these) */ +#define MAP_SHARED 0x01 /* Share changes */ +#define MAP_PRIVATE 0x02 /* Changes are private */ + +/* Return value of `mmap' in case of an error */ +#define MAP_FAILED ((void *) -1) + +/* Windows 64-bit access macros */ +#define LODWORD(l) ((DWORD)((DWORDLONG)(l))) +#define HIDWORD(l) ((DWORD)(((DWORDLONG)(l)>>32)&0xFFFFFFFF)) + +int fsync(int fd); +void *mmap(void *, size_t, int, int, int, int); +int munmap(void *, size_t); + +#endif /* __MINGW_SUPPORT_H_ */ diff --git a/tools/mkimage.c b/tools/mkimage.c index 967fe9a..380b535 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -25,6 +25,10 @@ #include "mkimage.h" #include <image.h> +#ifdef __MINGW32__ +#include "mingw_support.h" +#endif + extern int errno; #ifndef MAP_FAILED diff --git a/tools/mkimage.h b/tools/mkimage.h index a2d5248..6974fa4 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -28,7 +28,11 @@ #ifndef __WIN32__ #include <netinet/in.h> /* for host / network byte order conversions */ #endif +#ifdef __MINGW32__ +#include <stdint.h> +#else #include <sys/mman.h> +#endif #include <sys/stat.h> #include <time.h> #include <unistd.h> @@ -65,6 +69,7 @@ typedef unsigned int __u32; typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; +typedef unsigned long ulong; #define ntohl(a) SWAP_LONG(a) #define htonl(a) SWAP_LONG(a) -- 1.6.0.2.GIT

2 3

[U-Boot] [PATCH] Add support W90P710 ARM SoC from Nuvoton
by Konstantin Vovk 06 Feb '09

06 Feb '09

Add support W90P710 ARM SoC from Nuvoton Add W90P1 board based on W90P710 Signed-off-by: Konstantin Vovk <ksl(a)kslemb.com> --- MAKEALL | 1 + Makefile | 3 + board/w90p1/Makefile | 52 ++++ board/w90p1/config.mk | 27 ++ board/w90p1/ide.c | 108 ++++++++ board/w90p1/led.c | 63 +++++ board/w90p1/lowlevel_init.S | 130 +++++++++ board/w90p1/nand.c | 101 +++++++ board/w90p1/u-boot.lds | 69 +++++ board/w90p1/w90p1.c | 96 +++++++ cpu/arm720t/cpu.c | 46 +++- cpu/arm720t/interrupts.c | 88 ++++++- cpu/arm720t/serial.c | 108 +++++++- cpu/arm720t/start.S | 29 ++- drivers/net/Makefile | 1 + drivers/net/w90p710_eth.c | 451 +++++++++++++++++++++++++++++++ drivers/net/w90p710_eth.h | 274 +++++++++++++++++++ examples/Makefile | 6 +- include/asm-arm/arch-arm720t/W90P710.h | 239 ++++++++++++++++ include/asm-arm/arch-arm720t/hardware.h | 5 +- include/asm-arm/io.h | 4 + include/configs/W90P1.h | 237 ++++++++++++++++ include/netdev.h | 1 + 23 files changed, 2127 insertions(+), 12 deletions(-) create mode 100644 board/w90p1/Makefile create mode 100644 board/w90p1/config.mk create mode 100644 board/w90p1/ide.c create mode 100644 board/w90p1/led.c create mode 100644 board/w90p1/lowlevel_init.S create mode 100644 board/w90p1/nand.c create mode 100644 board/w90p1/u-boot.lds create mode 100644 board/w90p1/w90p1.c create mode 100644 drivers/net/w90p710_eth.c create mode 100644 drivers/net/w90p710_eth.h create mode 100644 include/asm-arm/arch-arm720t/W90P710.h create mode 100644 include/configs/W90P1.h diff --git a/MAKEALL b/MAKEALL index 5ce3f31..5853c49 100755 --- a/MAKEALL +++ b/MAKEALL @@ -477,6 +477,7 @@ LIST_ARM7=" \ lpc2292sodimm \ modnet50 \ SMN42 \ + w90p1 \ " ######################################################################### diff --git a/Makefile b/Makefile index 9c63643..f576f4d 100644 --- a/Makefile +++ b/Makefile @@ -2868,6 +2868,9 @@ lpc2292sodimm_config: unconfig SMN42_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292 +W90P1_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm720t w90p1 + ######################################################################### ## XScale Systems ######################################################################### diff --git a/board/w90p1/Makefile b/board/w90p1/Makefile new file mode 100644 index 0000000..6392986 --- /dev/null +++ b/board/w90p1/Makefile @@ -0,0 +1,52 @@ +# +# (C) Copyright 2000-2008 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS-y := $(BOARD).o +COBJS-$(CONFIG_CMD_NAND) += nand.o +COBJS-$(CONFIG_CMD_IDE) += ide.o +COBJS-$(CONFIG_STATUS_LED) += led.o + +SOBJS := lowlevel_init.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +######################################################################### +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend +######################################################################### diff --git a/board/w90p1/config.mk b/board/w90p1/config.mk new file mode 100644 index 0000000..3a0280e --- /dev/null +++ b/board/w90p1/config.mk @@ -0,0 +1,27 @@ +# +# Copyright (c) 2008 KSL Embedded (http://www.kslemb.com) +# Vovk Konstantin <ksl(a)kslemb.com> +# +# (C) Copyright 2000-2004 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +TEXT_BASE = 0x01FC0000 diff --git a/board/w90p1/ide.c b/board/w90p1/ide.c new file mode 100644 index 0000000..1920a70 --- /dev/null +++ b/board/w90p1/ide.c @@ -0,0 +1,108 @@ +/* + * (C) Copyright 2008 + * Vovk Konstantin, KSL Embedded, ksl(a)kslemb.com + * + * IDE interface for Winbond W90P710 ARM7 SoC + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ +#include <common.h> +#include <asm/hardware.h> + +#if defined(CONFIG_CMD_IDE) +#include <ata.h> +#include <ide.h> + +/* Define the start address of the IDE_CS0 region (0x73000000 but we wr/rd to the 0xF3000000 for disable internal cache memory MSB=1) */ +#define EXT1_BASE 0xF3000000 /* Start Address for IDE CS0 - mapped to the EBI ECS1 */ +/* Define the start address of the IDE_CS1 region (0x74000000 but we wr/rd to the 0xF4000000 for disable internal cache memory MSB=1) */ +#define EXT2_BASE 0xF4000000 /* Start Address for IDE CS1 - mapped to the EBI ECS2 */ + +/* Config bits for ECS1 and ECS2 */ + +#define SIZE_256k (0<<16) /* Memory size is 256K */ +#define SIZE_512k (1<<16) /* Memory size is 512K */ +#define SIZE_1M (2<<16) /* Memory size is 1M */ +#define SIZE_16M (6<<16) /* Memory size is 16M */ +#define SIZE_32M (7<<16) /* Memory size is 32M */ + +#define ADRS (1<<15) +#define tACC (15<<11) /* Access cycles of external I/O bank */ +#define tCOH (7<<8) /* Chip selection hold time of external I/O bank */ +#define tACS (7<<5) /* Address set-up before nECS of external I/O bank*/ +#define tCOS (7<<2) /* Chip selection setup time of external I/O bank */ + +#define BUS16 (2) /* 16-bit bus width for IDE */ +#define BUS08 (1) /* 8-bit bus width for IDE */ + +/* IDE_CS0 with 16bit data bus */ +#define ENABLE16() PUT_REG(REG_EXT1CON, ((EXT1_BASE<<1)|SIZE_256k|ADRS|tACC|tCOH|tACS|tCOS|BUS16)) +/* IDE_CS0 with 8bit data bus */ +#define DISABLE16() PUT_REG(REG_EXT1CON, ((EXT1_BASE<<1)|SIZE_256k|ADRS|tACC|tCOH|tACS|tCOS|BUS08)) + +void outb (unsigned char val, volatile unsigned char *addr) +{ + *(addr) = val; +} + +unsigned char inb (volatile unsigned char *addr) +{ + volatile unsigned char c; + + c = *(addr); + return c; +} + +/* IDE work with Data Port via 16-bit BUS that's why we must first of all + * enable 16-bit bus on ECS1, read/write data to the Data Port, and finaly + * disable 16-bit wide data bus + */ +void insw (unsigned short *addr, unsigned short *sect_buf, int words) +{ + int i; + + ENABLE16 (); + for (i = 0; i < words; i++) + *(sect_buf + i) = *(addr); + DISABLE16 (); +} + +void outsw (unsigned short *addr, unsigned short *sect_buf, int words) +{ + int i; + + ENABLE16 (); + for (i = 0; i < words; i++) + *(addr) = *(sect_buf + i); + DISABLE16 (); +} + +int ide_preinit (void) +{ + /* Init IDE_CS0 with 8bit data bus */ + PUT_REG (REG_EXT1CON, ((EXT1_BASE<<1)|SIZE_256k|ADRS|tACC|tCOH|tACS|tCOS|BUS08)); + /* Init IDE_CS1 with 8bit data bus */ + PUT_REG (REG_EXT2CON, ((EXT2_BASE<<1)|SIZE_256k|ADRS|tACC|tCOH|tACS|tCOS|BUS08)); + /* Enable nWE as a write strob for ECS1 and ECS2 */ + PUT_REG (REG_EBICON, GET_REG(REG_EBICON) | (1<<25) | (1<<26)); + + return 0; +} +#endif diff --git a/board/w90p1/led.c b/board/w90p1/led.c new file mode 100644 index 0000000..167a657 --- /dev/null +++ b/board/w90p1/led.c @@ -0,0 +1,63 @@ +/*********************************************************************** + * (C) Copyright 2008 + * Vovk Konstantin, KSL Embedded, ksl(a)kslemb.com + * + * Defines helper functions for toggeling LEDs + * + * 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/hardware.h> + +#ifdef CONFIG_STATUS_LED + +#include <status_led.h> + +void __led_init ( led_id_t mask, int state ) +{ + unsigned int *dir = (unsigned int *)STATUS_LED_DIR; + unsigned int *port = (unsigned int *)STATUS_LED_PORT; + + *dir = mask; + + if (state == STATUS_LED_ON) + *port &= ~mask; + else + *port |= mask; +} + +void __led_toggle ( led_id_t mask ) +{ + unsigned int *port = (unsigned int *)STATUS_LED_PORT; + unsigned int val; + + val = *port; + val ^= mask; + *port = val; +} + +void __led_set ( led_id_t mask, int state ) +{ + unsigned int *port = (unsigned int *)STATUS_LED_PORT; + + if (state == STATUS_LED_ON) + *port &= ~mask; + else + *port |= mask; +} + +#endif /* CONFIG_STATUS_LED */ diff --git a/board/w90p1/lowlevel_init.S b/board/w90p1/lowlevel_init.S new file mode 100644 index 0000000..d5085da --- /dev/null +++ b/board/w90p1/lowlevel_init.S @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2008 KSL Embedded Ltd (http://www.kslemb.com) + * by Vovk Konstantin <ksl(a)kslemb.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 <config.h> +#include <version.h> +#include <asm/hardware.h> + +/* + * Configure Memory Map + * + * This memory map allows us to relocate from FLASH to SRAM. After + * power-on reset the CPU only knows about the FLASH memory at address + * 0x00000000. After lowlevel_init completes the memory map will be: + * + * Memory Addr + * 0x00000000 + * to 32MB on board SDRAM via DD6 and DD7 + * 0x02000000 + * + * 0x7F000000 + * to 2MB(16Bit) on board Flash M29W320ET via DD8 + * 0x7F200000 + * + * Load all 6 memory registers with the STMIA instruction since + * memory access is disabled once these registers are written. The + * last register written re-enables memory access. + */ + +#define CKSKEW 0xFFF01F00 /* Clock Skew Control register */ + +.globl lowlevel_init +lowlevel_init: + + /* Check version number of W90P710 to set the clock skew + *The clock skew of W90P710 ver A = 0x7A + *The clock skew of W90P710 ver B = 0x39 + */ + LDR r0, =REG_PDID + LDR r0, [r0] + LDR r1, =0x0F000000 + ANDS r0,r0,r1 + BEQ ver0 + LDR r1, =0x01000000 + CMP r0, r1 + BEQ ver1 + B unknow_version +ver0: + LDR r0, =0x0FF007A + B skew_update +ver1: + LDR r0, =0x0FF0039 +skew_update: + LDR r1, =CKSKEW + STR r0,[r1] +unknow_version: + /* Nothing to do */ + + + /* preserve the temp register (r12 AKA ip) and remap it. */ + LDR r1, =SRAM_BASE+0xC + ADD r0, r12, #CONFIG_SYS_FLASH_BASE + STR r0, [r1] + + /* remap the link register for when we return */ + ADD lr, lr, #CONFIG_SYS_FLASH_BASE + + /* store a short program in the on chip SRAM, which is + * unaffected when remapping memory. Note the cache must be + * disabled for the on chip SRAM to be available. + */ + LDR r1, =SRAM_BASE + LDR r0, =0xe880007e /* stmia r0, {r1-r6} - write init values to EBICON, ROMCON, SDCONF0, SDCONF1, SDTIME0, SDTIME1*/ + STR r0, [r1] + ADD r1, r1, #4 + LDR r0, =0xe59fc000 /* ldr r12, [pc, #0] - restore remaped ip */ + STR r0, [r1] + ADD r1, r1, #4 + LDR r0, =0xe1a0f00e /* mov pc, lr - return from branch */ + STR r0, [r1] + + ADR r0, InitData /* Load start address of the Init data */ + LDMIA r0, {r1-r6} /* Load six bytes of the Init data to the registers r1...r6*/ + + LDR r0, =REG_EBICON /* Load the address of the EBICON register */ + LDR pc, =SRAM_BASE /* execute relocation programm */ + +.globl reset_cpu +reset_cpu: + + LDR r1, =REG_CLKSEL /* Set RESET bit in CLKSEL register */ + LDR r0, =0x01 + STR r0, [r1] + +wait_loop: + b wait_loop + /* never return */ + + /* + * Below are six 32-bit values for the six memory registers of + * the system manager, starting with register EBICON + */ + InitData: + /* Default configuration */ + .long 0x000530C0 /* EBICON : not need to change */ + .long 0xFE040080 /* ROMCON(Flash) - M29W320ET */ + .long 0x000090ED /* SDCONF0(SDRAM) - 32M(16Mx16x2): 0x000090ED */ + .long 0x00000000 /* SDCONF1 - The same as SDCONF0 with proper base address */ + .long 0x0000014B /* SDTIME0 - not need to change */ + .long 0x0000014B /* SDTIME1 - not need to change */ diff --git a/board/w90p1/nand.c b/board/w90p1/nand.c new file mode 100644 index 0000000..9514302 --- /dev/null +++ b/board/w90p1/nand.c @@ -0,0 +1,101 @@ +/* + * (C) Copyright 2008 + * KSL Embedded Development Team <www.kslemb.com> + * Vovk Konstantin <ksl(a)kslemb.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 + + Date Version Description + 16.01.2009 v1.1 Updated w90p710_nand_hwcontrol function. + for support new U-Boot 2009 + */ +#include <asm/io.h> +#include <common.h> +#include <asm/hardware.h> + +#if defined(CONFIG_CMD_NAND) + +#include <nand.h> + +/* W90P710 EBI Config bits */ +#define SIZE_256k (0<<16) /* Memory size is 256K */ +#define SIZE_512k (1<<16) /* Memory size is 512K */ +#define SIZE_1M (2<<16) /* Memory size is 1M */ +#define SIZE_16M (6<<16) /* Memory size is 16M */ +#define SIZE_32M (7<<16) /* Memory size is 32M */ + +#define ADRS (1<<15) /* Bus alignment to the byte address format */ +#define tACC (7<<11) /* Access cycles of external I/O bank */ +#define tCOH (7<<8) /* Chip selection hold time of external I/O bank */ +#define tACS (7<<5) /* Address set-up before nECS of external I/O bank */ +#define tCOS (7<<2) /* Chip selection setup time of external I/O bank */ +#define BUS08 (1) /* Bus is 8 bit wide */ + +/* Define the start address of the CS0 region (0x72000000 but we wr/rd to the 0xF2000000 for disable internal cache memory) */ +#define EXT0_BASE 0xF2000000 + +/* Hardware specific access to control-lines */ +void w90p710_nand_hwcontrol (struct mtd_info *mtd, int cmd, unsigned int ctrl) +{ + struct nand_chip *this = mtd->priv; + ulong base = (ulong) this->IO_ADDR_W; + + if (ctrl & NAND_CTRL_CHANGE) { + if (ctrl & NAND_CLE) + base = (base | W90P710_NAND_CLE); + else + base = (base & ~W90P710_NAND_CLE); + if (ctrl & NAND_ALE) + base = (base | W90P710_NAND_ALE); + else + base = (base & ~W90P710_NAND_ALE); + + this->IO_ADDR_W = (void __iomem *) ( base ); + } + + this->IO_ADDR_R = this->IO_ADDR_W; + + if (cmd != NAND_CMD_NONE) + writeb (cmd, this->IO_ADDR_W); +} + +/* We use nWait pin that's why we don't think abot ready */ +int w90p710_nand_ready(struct mtd_info *mtd) +{ + return 1; +} + +/* + * Board-specific NAND initialization. + */ +int board_nand_init (struct nand_chip *nand) +{ + /* Init CS0 with 8bit data bus 16M bank space (we use A21 for ALE and A20 CLE) */ + PUT_REG (REG_EXT0CON, ((EXT0_BASE<<1)|SIZE_16M|ADRS|tACC|tCOH|tACS|tCOS|BUS08)); + /* Enable nWE as a write strob for CS0 */ + PUT_REG(REG_EBICON, GET_REG(REG_EBICON) | (1<<24)); + + nand->cmd_ctrl = w90p710_nand_hwcontrol; + nand->ecc.mode = NAND_ECC_SOFT; + nand->dev_ready = w90p710_nand_ready; + nand->chip_delay = 30; + + return 0; +} +#endif diff --git a/board/w90p1/u-boot.lds b/board/w90p1/u-boot.lds new file mode 100644 index 0000000..cafe841 --- /dev/null +++ b/board/w90p1/u-boot.lds @@ -0,0 +1,69 @@ +/* + * (C) Copyright 2000-2007 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN(4); + .text : + { + cpu/arm720t/start.o (.text) + *(.text) + } + + . = ALIGN(4); + .rodata : { *(.rodata) } + + . = 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 (NOLOAD) : { *(.bss) } + _end = .; + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_info 0 : { *(.debug_info) } + .debug_line 0 : { *(.debug_line) } + .debug_pubnames 0 : { *(.debug_pubnames) } + .debug_aranges 0 : { *(.debug_aranges) } +} diff --git a/board/w90p1/w90p1.c b/board/w90p1/w90p1.c new file mode 100644 index 0000000..b4b5f52 --- /dev/null +++ b/board/w90p1/w90p1.c @@ -0,0 +1,96 @@ +/* + * (C) Copyright 2008 + * KSL Embedded Development Team <www.kslemb.com> + * Vovk Konstantin <ksl(a)kslemb.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 <asm/hardware.h> +#include <command.h> + +#ifdef CONFIG_STATUS_LED +#include <status_led.h> +#endif + +#ifdef CONFIG_DRIVER_W90P710_ETH +#include <net.h> +#include <netdev.h> +#endif + +DECLARE_GLOBAL_DATA_PTR; +#define MACH_W90X700 1861 +/* + * Miscelaneous platform dependent initialisations + */ +int board_init (void) +{ + /* arch number MACH_TYPE_W90P710 */ + gd->bd->bi_arch_number = MACH_W90X700; + + /* location of boot parameters */ + gd->bd->bi_boot_params = 0x00000800; + +#ifdef CONFIG_STATUS_LED + status_led_set (STATUS_LED_BOOT, STATUS_LED_ON); +#endif + + return 0; +} + +int dram_init (void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + +#if CONFIG_NR_DRAM_BANKS == 2 + gd->bd->bi_dram[1].start = PHYS_SDRAM_2; + gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; +#endif + + return (0); +} + +#if defined(CONFIG_DRIVER_W90P710_ETH) +int board_eth_init (bd_t *bis) +{ + return W90P710_EMC_initialize (bis); +} +#endif + +#ifdef CONFIG_RESET_PHY_R +void reset_phy(void) +{ + PHY_Reset (); +} +#endif + +#ifdef CONFIG_MISC_INIT_R +/* miscellaneous platform dependent initialisations */ +int misc_init_r (void) +{ +#ifdef CONFIG_CMD_IDE + extern int ide_preinit (void); + /* Init ECS1 and ECS2 for working with memory mapped IDE */ + ide_preinit (); +#endif + return 0; +} +#endif diff --git a/cpu/arm720t/cpu.c b/cpu/arm720t/cpu.c index 5ac8f59..f59ce2f 100644 --- a/cpu/arm720t/cpu.c +++ b/cpu/arm720t/cpu.c @@ -73,7 +73,7 @@ int cleanup_before_linux (void) /* go to high speed */ IO_SYSCON3 = (IO_SYSCON3 & ~CLKCTL) | CLKCTL_73; #endif -#elif defined(CONFIG_NETARM) || defined(CONFIG_S3C4510B) || defined(CONFIG_LPC2292) +#elif defined(CONFIG_NETARM) || defined(CONFIG_S3C4510B) || defined(CONFIG_LPC2292) || defined(CONFIG_W90P710) disable_interrupts (); /* Nothing more needed */ #elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR) @@ -253,6 +253,50 @@ int dcache_status (void) { } #elif defined(CONFIG_LPC2292) /* just to satisfy the compiler */ + +#elif defined(CONFIG_W90P710) +void icache_enable (void) +{ + PUT_REG (REG_CAHCON, 0x05); /* Flush I-cache */ + while (GET_REG (REG_CAHCON)); /* Wait for operation progress */ + + PUT_REG (REG_CAHCNF, 0x01); /* Enable I-CACHE */ +} + +void icache_disable (void) +{ + PUT_REG (REG_CAHCON, 0x05); /* Flush I-cache */ + while (GET_REG (REG_CAHCON)); /* Wait for operation progress */ + /* Disable I-cache */ + PUT_REG (REG_CAHCNF, GET_REG (REG_CAHCNF)&(~0x01)); +} + +int icache_status (void) +{ + return (GET_REG (REG_CAHCNF) & 0x01)!=0;/* Check if I-Cache enable */ +} + +void dcache_enable (void) +{ + PUT_REG (REG_CAHCON, 0x06); /* Flush D-cache */ + while (GET_REG (REG_CAHCON)); /* Wait for operation progress */ + + PUT_REG (REG_CAHCNF, GET_REG(REG_CAHCNF)|0x02); /* Enable D-CACHE */ +} + +void dcache_disable (void) +{ + PUT_REG (REG_CAHCON, 0x06); /* Flush D-cache */ + while (GET_REG (REG_CAHCON)); /* Wait for operation progress */ + + PUT_REG (REG_CAHCNF, GET_REG (REG_CAHCNF)&(~0x02));/* Disable D-cache */ +} + +int dcache_status (void) +{ + return (GET_REG (REG_CAHCNF) & 0x02)!=0; /* Check if D-Cache enable */ +} + #else #error No icache/dcache enable/disable functions defined for this CPU type #endif diff --git a/cpu/arm720t/interrupts.c b/cpu/arm720t/interrupts.c index 39ed345..675f3f6 100644 --- a/cpu/arm720t/interrupts.c +++ b/cpu/arm720t/interrupts.c @@ -50,6 +50,14 @@ #define READ_TIMER (TM2STAT & NETARM_GEN_TSTAT_CTC_MASK) #endif +#ifdef CONFIG_W90P710 +#undef TIMER_LOAD_VAL +/* We have the 24-bit timer - set maximum value*/ +#define TIMER_LOAD_VAL (0x00FFFFFF) +#undef READ_TIMER +#define READ_TIMER (GET_REG(REG_TDR0) & 0xFFFFFF) +#endif + #ifdef CONFIG_S3C4510B /* require interrupts for the S3C4510B */ # ifndef CONFIG_USE_IRQ @@ -80,6 +88,8 @@ void do_irq (struct pt_regs *pt_regs) pfnct = (void (*)(void))VICVectAddr; (*pfnct)(); +#elif defined(CONFIG_W90P710) +/* No do_irq() for W90P710 as yet */ #else #error do_irq() not defined for this CPU type #endif @@ -185,7 +195,18 @@ int interrupt_init (void) PUT32(T0MCR, 0); PUT32(T0TC, 0); PUT32(T0TCR, 1); /* enable timer0 */ - +#elif defined(CONFIG_W90P710) + /*Stop Timer0*/ + PUT_REG(REG_TCR0, 0x00000000); + /* Enable Timer clock */ + PUT_REG(REG_CLKSEL, GET_REG(REG_CLKSEL)|0x40); + /* Set Timer0 reload value*/ + PUT_REG(REG_TICR0, (TIMER_LOAD_VAL)); + /* Save to lastdec value that we load to the timer*/ + lastdec = TIMER_LOAD_VAL; + /* CEN=1 - Timer0 Start counting, MODE = 01 - Timer0 is operat in pereodic mode */ + /* IE = 0 - Disable Timer0 interrupt Prescaler=0x0E Timer clock is 15000000/(14+1)=1Mhz*/ + PUT_REG(REG_TCR0,0x4800000E); #else #error No interrupt_init() defined for this CPU type #endif @@ -305,6 +326,71 @@ void udelay (unsigned long usec) #elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR) /* No timer routines for IntegratorAP/CM720T as yet */ + +#elif defined(CONFIG_W90P710) +/*We have Timer0 decrement frequency 1MHz that's why timestamp is in uS +Some problems may arise in the program, when it works more than one hour and twenty minutes +(32bit vlue in uS).During this time, a variable 'timestamp' can be overcrowded and cleared, +but previous timestamp value can be very large. In this case wait function will be 'wait' +the next overflow. This bug will be removed in next port. Sorry for inconvenience :-) +*/ +void reset_timer (void) +{ + reset_timer_masked (); +} + +ulong get_timer (ulong base) +{ + ulong timestamp_in_us; + /* Get timestamp in uS*/ + timestamp_in_us = get_timer_masked (); + /* Convert timestamp in mS and subtract base*/ + return timestamp_in_us/1000 - base; +} + +void set_timer (ulong t) +{ + timestamp = t; +} + +void reset_timer_masked (void) +{ + /* reset time */ + lastdec = READ_TIMER; + timestamp = 0; +} + +ulong get_timer_masked (void) +{ + ulong now = READ_TIMER; + + if (lastdec >= now){ /* normal mode */ + timestamp += (lastdec - now); + } + else{ /* we have an overflow ... */ + timestamp += (lastdec + TIMER_LOAD_VAL - now); + } + lastdec = now; + return timestamp; +} + +void udelay_masked (unsigned long usec) +{ + ulong endtime; + signed long diff; + + endtime = get_timer_masked () + usec; + do { + ulong now = get_timer_masked (); + diff = endtime - now; + } while (diff >= 0); +} + +void udelay (unsigned long usec) +{ + udelay_masked (usec); +} + #else #error Timer routines not defined for this CPU type #endif diff --git a/cpu/arm720t/serial.c b/cpu/arm720t/serial.c index 54a9b31..48f8da6 100644 --- a/cpu/arm720t/serial.c +++ b/cpu/arm720t/serial.c @@ -169,13 +169,13 @@ int serial_init (void) void serial_putc (const char c) { - if (c == '\n') - { - while((GET8(U0LSR) & (1<<5)) == 0); /* Wait for empty U0THR */ + if (c == '\n') { + /* Wait for empty U0THR */ + while((GET8(U0LSR) & (1<<5)) == 0); PUT8(U0THR, '\r'); } - - while((GET8(U0LSR) & (1<<5)) == 0); /* Wait for empty U0THR */ + /* Wait for empty U0THR */ + while((GET8(U0LSR) & (1<<5)) == 0); PUT8(U0THR, c); } @@ -199,4 +199,102 @@ int serial_tstc (void) return (GET8(U0LSR) & 1); } +#elif defined(CONFIG_W90P710) + +DECLARE_GLOBAL_DATA_PTR; + +#include <asm/arch/hardware.h> + +void serial_setbrg (void) +{ + unsigned int divider = 0; + + /* use values for 15Mhz quarts */ + switch (gd->baudrate) { + case 1200: divider = 779; break; + case 2400: divider = 389; break; + case 4800: divider = 193; break; + case 9600: divider = 96; break; + case 14400: divider = 65; break; + case 19200: divider = 47; break; + case 38400: divider = 22; break; + case 57600: divider = 14; break; + case 115200: divider = 6; break; + default: hang (); break; + } + + /* Reset LCR register and disable Uart interrupt*/ + PUT_REG (REG_UART0_LCR, 0x0); + PUT_REG (REG_UART0_IER, 0x0); + + /* Set baud rate to mentioned in divider */ + PUT_REG (REG_UART0_LCR, GET_REG(REG_UART0_LCR)|(1<<7)); /* Set DLAB to '1' to access Divisor */ + PUT_REG (REG_UART0_LSB, (divider & 0xFF)); + PUT_REG (REG_UART0_MSB, ((divider>>8) & 0xFF)); + PUT_REG (REG_UART0_LCR, GET_REG(REG_UART0_LCR)&(~(1<<7)));/* Reset DLAB to '0' to access RBR, THR, IER */ + + /* Set port parameters 8 bit, 1 stop, no parity */ + PUT_REG (REG_UART0_LCR, GET_REG(REG_UART0_LCR)|((1<<0)|(1<<1))); + + /* Set the RX FIFO trigger level t0 8 bytes, reset RX, TX FIFO, Enable FIFO*/ + PUT_REG (REG_UART0_FCR, ((0x2<<6)|(1<<2)|(1<<1)|(1<<0))); + + /* Reset timeout comparator */ + PUT_REG (REG_UART0_TOR, 0x0); +} + +/* Initialise the serial port with the given baudrate. Settings are 8N1 */ +int serial_init (void) +{ + unsigned int Temp; + + serial_setbrg (); + + /* Set GPIO_CFG to use pins PORT5_0 as TXD0 and PORT5_1 as RXD0 */ + Temp = GET_REG (REG_GPIO_CFG5); + Temp|= 0X00000005; + Temp&= 0XFFFFFFF5; + PUT_REG (REG_GPIO_CFG5, Temp); + return (0); +} + +/* Check for Transmitter holding register is empty */ +void CheckForUART0TXReady (void) +{ + unsigned int Status; + + do + Status = GET_REG (REG_UART0_LSR); + while (!(Status & (1<<6))); /* Check for TE=1*/ +} + +/*Put one character to Uart0 TX FIFO. Add 'LF' after 'CR'*/ +void serial_putc (const char c) +{ + if (c == '\n') { + /* Wait for empty THR */ + CheckForUART0TXReady (); + PUT_REG (REG_UART0_TX, '\r'); + } + CheckForUART0TXReady (); + PUT_REG (REG_UART0_TX, c); +} + +int serial_getc (void) +{ + while ((GET_REG (REG_UART0_LSR) & 1) == 0); + return GET_REG(REG_UART0_RX); +} + +int serial_tstc (void) +{ + return (GET_REG(REG_UART0_LSR) & 1); +} + +void serial_puts (const char *s) +{ + while (*s) { + serial_putc (*s++); + } +} #endif diff --git a/cpu/arm720t/start.S b/cpu/arm720t/start.S index 022b873..596fe2f 100644 --- a/cpu/arm720t/start.S +++ b/cpu/arm720t/start.S @@ -1,8 +1,8 @@ /* * armboot - Startup Code for ARM720 CPU-core * - * Copyright (c) 2001 Marius Grцger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Zьpke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius GrпїЅger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex ZпїЅpke <azu(a)sysgo.de> * * See file CREDITS for list of people who contributed to this * project. @@ -224,6 +224,13 @@ PLLSTAT_ADR: .word PLLSTAT VPBDIV_ADR: .word VPBDIV MEMMAP_ADR: .word MEMMAP +#elif defined(CONFIG_W90P710) +#define CAHCON 0xFFF02004 /* W90P710 Cache control register */ +#define AIC_MDCR 0xFFF82124 /* W90P710 AIC Mask Disable Control Register */ +#define CAHCNF 0xFFF02000 /* W90P710 Cache configuration register */ +#define IDREG 0xFFF00000 /* W90P710 CHIP ID */ +#define CKSKEW 0xFFF01F00 /* Clock Skew Control register */ + #endif cpu_init_crit: @@ -368,6 +375,21 @@ lock_loop: ldr r0, VPBDIV_ADR mov r1, #0x01 /* VPB clock is same as process clock */ str r1, [r0] + +#elif defined(CONFIG_W90P710) + /* Disable Interrupt*/ + LDR r0, =AIC_MDCR + LDR r1, =0x7FFFE + STR r1, [r0] + /*Disable FIQ and IRQ*/ + MRS r0, CPSR + ORR r0, r0, #0xC0 + MSR CPSR_c, r0 + /* Disable I-Cache and D-cache entirely */ + LDR r1,=CAHCNF + MOV r0, #0x0 + STR r0, [r1] + #else #error No cpu_init_crit() defined for current CPU type #endif @@ -606,6 +628,9 @@ reset_cpu: .globl reset_cpu reset_cpu: mov pc, r0 +#elif defined(CONFIG_W90P710) +/* Nothing done here as reseting the CPU is board specific, depending on external peripherals see lowlevel_init.c*/ + #else #error No reset_cpu() defined for current CPU type #endif diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 631336a..2dff5a5 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -69,6 +69,7 @@ COBJS-$(CONFIG_VSC7385_ENET) += vsc7385.o COBJS-$(CONFIG_XILINX_EMAC) += xilinx_emac.o COBJS-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o COBJS-$(CONFIG_SH_ETHER) += sh_eth.o +COBJS-$(CONFIG_DRIVER_W90P710_ETH) += w90p710_eth.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/net/w90p710_eth.c b/drivers/net/w90p710_eth.c new file mode 100644 index 0000000..1a0951d --- /dev/null +++ b/drivers/net/w90p710_eth.c @@ -0,0 +1,451 @@ +/*********************************************************************** + * + * Copyright (c) 2008 KSL Embedded (http://www.kslemb.com) + * Vovk Konstantin <ksl(a)kslemb.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 + * + * Description: Ethernet interface for Winbond W90P710 SoC + */ + +#include <common.h> + +#ifdef CONFIG_DRIVER_W90P710_ETH + +#include <command.h> +#include <net.h> +#include <malloc.h> +#include <asm/hardware.h> +#include "w90p710_eth.h" + +#ifdef CONFIG_STATUS_LED +#include <status_led.h> +#endif + +#if 0 +#define DEBUG +#endif + +#if 1 +#define DEBUG_PHY_RESET +#endif + +#ifdef DEBUG +#define printk(fmt, args...) printf(fmt, ##args) +#else +#define printk(fmt, args...) +#endif + +#ifdef DEBUG_PHY_RESET +#define print_phy(fmt, args...) printf(fmt, ##args) +#else +#define print_phy(fmt, args...) +#endif + +static TX_FrameDescriptor txFDbase[ETH_MaxTxFrames]; +static MACFrame txFrameBase[ETH_MaxTxFrames]; +static RX_FrameDescriptor rxFDbase[PKTBUFSRX]; +static ETH m_eth; + +static s32 TxFDinit (ETH *eth) +{ + s32 i; + MACFrame *txFrmBase; + + /* use non-cacheble space for access to the TX buffers */ + txFrmBase = (MACFrame *)( (u32)txFrameBase | 0x80000000); + + /* store start of Tx descriptors and set current */ + eth->m_curTX_FD = (TX_FrameDescriptor *) ((u32)txFDbase | 0x80000000); + eth->m_baseTX_FD = eth->m_curTX_FD; + + for ( i = 0; i < ETH_MaxTxFrames; i++) { + eth->m_baseTX_FD[i].m_frameDataPtr.ui = (u32)&txFrmBase[i]; + /* Clear Owner and IntEn bits - Oner now is CPU*/ + eth->m_baseTX_FD[i].m_opt.ui = 0; + /* Enable Padding Automaticaly */ + eth->m_baseTX_FD[i].m_opt.bf.padding = 1; + /* Enable CRC Append */ + eth->m_baseTX_FD[i].m_opt.bf.crc_en = 1; + /* Clear status and transmit count*/ + eth->m_baseTX_FD[i].m_status.ui = 0; + /* Point to the next descriptor */ + eth->m_baseTX_FD[i].m_nextFD = &eth->m_baseTX_FD[i+1]; + } + + /* make the list circular */ + eth->m_baseTX_FD[i-1].m_nextFD = &eth->m_baseTX_FD[0]; + /* Write Current TX Descriptor Buffer Start Address */ + PUT_REG (REG_TXDLSA, (u32)eth->m_curTX_FD); + return 0; +} + +static s32 RxFDinit( ETH *eth) +{ + s32 i; + /* store start of Rx descriptors and set current */ + eth->m_curRX_FD = (RX_FrameDescriptor *)((u32)rxFDbase | 0x80000000); + eth->m_baseRX_FD = eth->m_curRX_FD; + + for ( i = 0; i < PKTBUFSRX; i++) { + eth->m_baseRX_FD[i].m_frameDataPtr.ui = (u32)NetRxPackets[i] | 0x80000000; + eth->m_baseRX_FD[i].m_status.ui = 0x0; + eth->m_baseRX_FD[i].m_status.bf.owner = 0x02; /* Owner is EMC */ + eth->m_baseRX_FD[i].m_reserved = 0x0; + eth->m_baseRX_FD[i].m_nextFD = &eth->m_baseRX_FD[i+1]; + } + /* make the list circular */ + eth->m_baseRX_FD[i-1].m_nextFD = &eth->m_baseRX_FD[0]; + /* Write Current RX Descriptor Buffer Start Address */ + PUT_REG (REG_RXDLSA, (u32)eth->m_curRX_FD); + return 0; +} + +#ifdef CONFIG_RESET_PHY_R +/* Write External PHY Register */ +void PHY_Write (unsigned int PHY_Reg_Addr, unsigned int PHY_Number, unsigned int Data) +{ + volatile unsigned int Check; + + PUT_REG (REG_MIID, Data); + PUT_REG (REG_MIIDA, PHY_Reg_Addr | PHY_Number | PHYBUSY | PHYWR | MDCCR); + do { + Check = GET_REG (REG_MIIDA); + } + while (Check & PHYBUSY); + PUT_REG (REG_MIID, 0x0); +} + +/* Read External PHY Register */ +unsigned int PHY_Read (unsigned int PHY_Reg_Addr, unsigned int PHY_Number) +{ + unsigned int PHY_Data; + volatile unsigned int Check; + + PUT_REG (REG_MIIDA, PHY_Reg_Addr | PHY_Number | PHYBUSY | MDCCR); + do { + Check = GET_REG (REG_MIIDA); + } + while (Check & PHYBUSY); + PHY_Data = GET_REG (REG_MIID); + return PHY_Data; +} + +/* Reset external PHY Chip */ +void PHY_Reset(void) +{ + unsigned int Read_Value; + unsigned int wait; + int i; + unsigned char Status = 0; + + /* Configure GPIO2 function as MAC pins */ + PUT_REG (REG_GPIO_CFG2, 0x00055555); + /* Configure MAC Command Register: 100M, Full Duplex, strip CRC, MDC clock generation, accept control frame */ + PUT_REG (REG_MCMDR, MCMDR_OPMOD | MCMDR_FDUP | MCMDR_SPCRC | MCMDR_EnMDC /*| MCMDR_ACP | MCMDR_AEP*/); + print_phy ("Reset KSZ8001 PHY..."); + PHY_Write (PHY_CNTL_REG, PHYAD, RESET_PHY); + + wait = 1000000; + while (1) { /* wait for auto-negotiation complete */ + Read_Value = PHY_Read (PHY_STATUS_REG, PHYAD); + + if ((Read_Value & AN_COMPLETE)!=0) { + print_phy ("OK\n"); + break; + } + + if (!(wait--)) { + print_phy ("FAILED!\n"); + break; + } + } + + PHY_Write (PHY_ANA_REG, PHYAD, DR100_TX_FULL|DR100_TX_HALF|DR10_TX_FULL|DR10_TX_HALF|IEEE_802_3_CSMA_CD); + Read_Value = PHY_Read (PHY_CNTL_REG, PHYAD); + Read_Value |= (RESTART_AN+ENABLE_AN); + PHY_Write (PHY_CNTL_REG, PHYAD, Read_Value); + + print_phy ("Wait for auto-negotiation complete..."); + wait = 1000000; i=0; + while (1) { /* wait for auto-negotiation complete */ + Read_Value = PHY_Read (PHY_STATUS_REG, PHYAD) ; + + if ((Read_Value & AN_COMPLETE) != 0) { + print_phy ("OK\n"); + Status = 1; + break; + } + + if (!(wait--)) { + print_phy ("FAILED!!\n"); + break; + } + + if(i==10000) { + i=0; + print_phy ("."); + } + else + i++; + }/* end while */ + + if ( Status == 0 ) { + print_phy ("Set default: 100M Full Duplex\n"); + /* Configure MAC Command Register: 100M, Full Duplex, strip CRC, MDC clock generation, accept control frame */ + PUT_REG (REG_MCMDR, MCMDR_OPMOD | MCMDR_FDUP | MCMDR_SPCRC | MCMDR_EnMDC); + } + else { + Read_Value = PHY_Read (0x1F, PHYAD);/* See KSZ8001 Data Sheet for details */ + Read_Value &= 0x1C; + if ((Read_Value==8) || (Read_Value==0x18)) { /* 100MB */ + print_phy ("100Mb - "); + PUT_REG (REG_MCMDR, GET_REG(REG_MCMDR) | MCMDR_OPMOD); + } + else if ((Read_Value==4) || (Read_Value==0x14)) { /* 10 MB */ + print_phy ("10MB - "); + PUT_REG (REG_MCMDR, GET_REG(REG_MCMDR) & (~MCMDR_OPMOD)); + } + else + print_phy("Still in auto-negotiation or PHY/MII isolate mode\n"); + + if ((Read_Value == 0x18) || (Read_Value == 0x14)) {/* Full Duplex */ + print_phy ("Full Duplex\n"); + PUT_REG (REG_MCMDR, GET_REG(REG_MCMDR) | MCMDR_FDUP); + } + else if ((Read_Value == 8) || (Read_Value == 4)) { /* Half Duplex */ + print_phy ("Half Duplex\n"); + PUT_REG (REG_MCMDR, GET_REG(REG_MCMDR) & (~MCMDR_FDUP)); + } + } +} +#endif + +/* Public u-boot interface functions below */ + +/* Init W90P710 Ethernet controller */ +int W90P710_eth_init (struct eth_device *dev, bd_t *bis) +{ + volatile unsigned int Check; + unsigned int cnt = 0; + ETH *eth = &m_eth; + + printk ("\nInit W90P710 EMC...\n"); + /* Configure GPIO2 function as MAC pins */ + PUT_REG (REG_GPIO_CFG2, 0x00055555); + + /* Store our MAC address */ + eth->m_mac = bis->bi_enetaddr; + /* Issue Software Reset to the MAC */ + PUT_REG (REG_MCMDR, MCMDR_SWR); + /* Wait for MAC come out from Reset */ + do { + Check = GET_REG (REG_MCMDR); + cnt++; + if (cnt == 10000) + printk ("Error reseting MAC\n"); + } + while (Check & MCMDR_SWR); + + /* Set the Max RX Frame Length */ + PUT_REG (REG_DMARFC, sizeof(MACFrame)); + /* Set thresholds: TX low to 96, RX low to 96 and DMA burst to 8 words */ + PUT_REG (REG_FFTCR, 0x100303); + + /* Init frame descriptors */ + TxFDinit (eth); + RxFDinit (eth); + + /* Init the CAM with our MAC address */ + PUT_REG (REG_CAM0M_Base, (eth->m_mac[0] << 24) | (eth->m_mac[1] << 16) | (eth->m_mac[2] << 8) | (eth->m_mac[3])); + PUT_REG (REG_CAM0L_Base, (eth->m_mac[4] << 24) | (eth->m_mac[5] << 16)); + + /* Enable CAM address 0 -- the MAC we just loaded */ + PUT_REG (REG_CAMEN, 0x1); + /* Accept broadcast packetes, enable compare mode */ + PUT_REG (REG_CAMCMR, CAM_ABP | CAM_ECMP); + + /* Configure MAC Command Register: 100M, Full Duplex, strip CRC, MDC clock generation, accept control frame */ + //#ifndef CONFIG_RESET_PHY_R /* We do this operation in the phy_reset */ + PUT_REG (REG_MCMDR, MCMDR_OPMOD | MCMDR_FDUP | MCMDR_SPCRC | MCMDR_EnMDC /*| MCMDR_ACP | MCMDR_AEP*/); + //#endif + /* Start reception process */ + PUT_REG (REG_MCMDR, GET_REG(REG_MCMDR) | MCMDR_RXON); + + /* Enable interrupts on TX and RX*/ + PUT_REG (REG_MIEN, EnRXINTR | EnTXINTR | EnTXCP | EnRXGD | MISTA_RDU | MISTA_RxBErr | MISTA_TxBErr); + + return 0; +} + +/* Send a packet */ +s32 W90P710_eth_send (struct eth_device *dev, volatile void *packet, s32 length) +{ + u32 Check; + ETH *eth = &m_eth; +#ifdef CONFIG_STATUS_LED + status_led_set (STATUS_LED_BOOT, STATUS_LED_ON); +#endif + + printk("EMC TX..."); + if( eth->m_curTX_FD->m_opt.bf.owner) { + printk("eth_send(): TX Frame. CPU not owner.\n"); +#ifdef CONFIG_STATUS_LED + status_led_set (STATUS_LED_BOOT, STATUS_LED_OFF); +#endif + return -1; + } + + /* copy user data into frame data pointer */ + memcpy ((void *)((u32)(eth->m_curTX_FD->m_frameDataPtr.ui)), (void *)packet, length); + + /* Set TX Frame flags */ + /* Tx Interrupt Enable */ + eth->m_curTX_FD->m_opt.bf.macTxIrqEnbl = 1; + /* CRC Append Enable */ + eth->m_curTX_FD->m_opt.bf.crc_en = 1; + /* Padding Enable */ + eth->m_curTX_FD->m_opt.bf.padding = 1; + + /* Set TX Frame length */ + eth->m_curTX_FD->m_status.bf.len = length; + + /* Change ownership to EMC */ + eth->m_curTX_FD->m_opt.bf.owner = 1; + + /* Enable MAC TXON if need and remove halt state writing TXDR control register */ + Check = GET_REG (REG_MCMDR); + if (!(Check & MCMDR_TXON)) + PUT_REG (REG_MCMDR, Check | MCMDR_TXON); + PUT_REG (REG_TSDR, 0); + do { + Check = GET_REG(REG_MISTA); + /* printk("MISTA=%x\n", Check); */ + } + while (!(Check & MISTA_TXINTR)); + + /* Clear all TX Bits in MISTA Register */ + PUT_REG (REG_MISTA, Check & 0xFFFF0000); + /* If transmission comlete correctly */ + if (eth->m_curTX_FD->m_status.bf.complete) { + /* Change the Tx frame descriptor for next use */ + eth->m_curTX_FD = eth->m_curTX_FD->m_nextFD; + printk ("Ok\n"); +#ifdef CONFIG_STATUS_LED + status_led_set (STATUS_LED_BOOT, STATUS_LED_OFF); +#endif + return 0; +} + /* There was an error */ + else { + printk ("EMC Transmission error. MISTA=%x\n", Check); +#ifdef CONFIG_STATUS_LED + status_led_set (STATUS_LED_BOOT, STATUS_LED_OFF); +#endif + return -1; + } +} + +/* Check for received packets */ +s32 W90P710_eth_rx (struct eth_device *dev) +{ + s32 nLen = 0; + ETH *eth = &m_eth; + u32 Check, i=0; + +#ifdef CONFIG_STATUS_LED + status_led_set (STATUS_LED_BOOT, STATUS_LED_ON); +#endif + printk("EMC RX..."); + /* Get RX Interrupt status */ + do { + Check = GET_REG(REG_MISTA); + i++; + if (i>500000) { + printk ("RX Interrupt wait timeout elapsed\n"); + break; + } + } + while (!(Check & MISTA_RXINTR)); + + /* check if packet ready */ + if( Check & MISTA_RXINTR ) { + /* Clear all RX Bits in MISTA Register */ + PUT_REG (REG_MISTA, Check & 0x0000FFFF); + + /* process all waiting packets */ + while (eth->m_curRX_FD->m_status.bf.owner==0) { + /* If receive is successfull */ + if (eth->m_curRX_FD->m_status.bf.good) { + nLen = eth->m_curRX_FD->m_status.bf.len; + /* call back u-boot Receive function --> may call eth_send() */ + NetReceive ((u8 *)eth->m_curRX_FD->m_frameDataPtr.ui, nLen); + printk (" %d bytes received\n", nLen); + } + /* clear status */ + eth->m_curRX_FD->m_status.ui = 0x0; + /* set owner back to EMC */ + eth->m_curRX_FD->m_status.bf.owner = 0x02; + /* advance to next descriptor */ + eth->m_curRX_FD = eth->m_curRX_FD->m_nextFD; + } + } + + /* Receive Descriptor Unavailable interrupt -> remove halt state from RxDMA*/ + if (Check & MISTA_RDU) { + printk ("Remove halt state from RxDMA\n"); + PUT_REG (REG_RSDR, 0x0); + } + #ifdef CONFIG_STATUS_LED + status_led_set (STATUS_LED_BOOT, STATUS_LED_OFF); + #endif + return nLen; +} + +/* Halt ethernet engine */ +void W90P710_eth_halt (struct eth_device *dev) +{ + printk ("ETH Halt...\n"); + /* disable MAC TX and RX*/ + PUT_REG (REG_MCMDR, GET_REG(REG_MCMDR) & (~(MCMDR_RXON | MCMDR_TXON))); +} + +/* Fill eth_device structure with W90P710 EMC functions */ +int W90P710_EMC_initialize (bd_t *bis) +{ + struct eth_device *dev; + dev = (struct eth_device *)malloc(sizeof(*dev)); + + if (dev == NULL) + hang(); + + memset (dev, 0, sizeof(*dev)); + sprintf (dev->name, "W90P710 EMC"); + + dev->iobase = 0; + dev->priv = 0; + dev->init = W90P710_eth_init; + dev->halt = W90P710_eth_halt; + dev->send = W90P710_eth_send; + dev->recv = W90P710_eth_rx; + + eth_register (dev); + return 1; +} +#endif diff --git a/drivers/net/w90p710_eth.h b/drivers/net/w90p710_eth.h new file mode 100644 index 0000000..b781b16 --- /dev/null +++ b/drivers/net/w90p710_eth.h @@ -0,0 +1,274 @@ +/* + * Copyright (c) 2008 KSL Embedded (http://www.kslemb.com) + * Vovk Konstantin <ksl(a)kslemb.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 + * + * MODULE: $Id:$ + * Description: Ethernet interface + * Runtime Env: W90P710 SoC + * Change History: + * 08-09-2008 Created ksl(a)kslemb.com + * + */ + +#ifndef __W90P710_ETH_H +#define __W90P710_ETH_H + +/* MAC MII Management Data Control and Address Register(MIIDA) */ +/*#define MDCCR 0x00000000 */ /* MDC clock rating */ +#define MDCCR 0x00F80000 /* MDC clock rating */ +#define PHYAD 0x00000100 /* PHY Address */ +#define PHYWR 0x00010000 /* Write Operation */ +#define PHYBUSY 0x00020000 /* Busy Bit */ +#define PHYPreSP 0x00040000 /* Preamble Suppress */ + +/* MAC Command Register(MCMDR) Bits */ +#define MCMDR_RXON 0x00000001 /* Receive ON */ +#define MCMDR_ALP 0x00000002 /* Accept Long Packet */ +#define MCMDR_ARP 0x00000004 /* Accept Runt Packet */ +#define MCMDR_ACP 0x00000008 /* Accept Control Packet */ +#define MCMDR_AEP 0x00000010 /* Accept Error Packet */ +#define MCMDR_SPCRC 0x00000020 /* Accept Strip CRC Value */ +#define MCMDR_TXON 0x00000100 /* Transmit On */ +#define MCMDR_NDEF 0x00000200 /* No defer */ +#define MCMDR_SDPZ 0x00010000 /* Send Pause */ +#define MCMDR_EnSQE 0x00020000 /* Enable SQE test */ +#define MCMDR_FDUP 0x00040000 /* Full Duplex */ +#define MCMDR_EnMDC 0x00080000 /* Enable MDC signal */ +#define MCMDR_OPMOD 0x00100000 /* Operation Mode */ +#define MCMDR_LBK 0x00200000 /* Loop Back */ +#define MCMDR_EnRMII 0x00400000 /* Enable RMII */ +#define MCMDR_LAN 0x00800000 /* LAN Port Setting Mode */ +#define MCMDR_SWR 0x01000000 /* Software Reset */ + +/* MAC Interrupt Status Register (MISTA) Bits */ +#define MISTA_RXINTR 0x00000001 /* Interrupt on Receive */ +#define MISTA_CRCE 0x00000002 /* CRC Error */ +#define MISTA_RXOV 0x00000004 /* Receive FIFO Overflow error */ +#define MISTA_PTLE 0x00000008 /* Packet Too Long Error */ +#define MISTA_RXGD 0x00000010 /* Receive Good */ +#define MISTA_ALIE 0x00000020 /* Alignment Error */ +#define MISTA_RP 0x00000040 /* Runt Packet */ +#define MISTA_MMP 0x00000080 /* More Missed Packets than miss rolling over counter flag */ +#define MISTA_DFOI 0x00000100 /* DMA receive frame over maximum size interrupt */ +#define MISTA_DENI 0x00000200 /* DMA early notification interrupt */ +#define MISTA_RDU 0x00000400 /* Receive Descriptor Unavailable interrupt */ +#define MISTA_RxBErr 0x00000800 /* Receive Bus Error interrupt */ +#define MISTA_NATOK 0x00001000 /* NAT Processing OK */ +#define MISTA_NATErr 0x00002000 /* NAT Processing Error */ +#define MISTA_CFR 0x00004000 /* Control Frame Receive */ +#define MISTA_TXINTR 0x00010000 /* Interrupt on Transmit */ +#define MISTA_TXEMP 0x00020000 /* Transmit FIFO Empty */ +#define MISTA_TXCP 0x00040000 /* Transmit Completion */ +#define MISTA_EXDEF 0x00080000 /* Defer */ +#define MISTA_NCS 0x00100000 /* No Carrier Sense */ +#define MISTA_TXABT 0x00200000 /* Transmit Abort */ +#define MISTA_LC 0x00400000 /* Late Collision */ +#define MISTA_TDU 0x00800000 /* Transmit Descriptor Unavailable interrupt */ +#define MISTA_TxBErr 0x01000000 /* Transmit Bus Error interrupt */ + +/* MAC Interrupt Enable Register(MIEN) */ +#define EnRXINTR 0x00000001 /* Enable Interrupt on Receive Interrupt */ +#define EnCRCE 0x00000002 /* Enable CRC Error Interrupt */ +#define EnRXOV 0x00000004 /* Enable Receive FIFO Overflow Interrupt */ +#define EnPTLE 0x00000008 /* Enable Packet Too Long Interrupt */ +#define EnRXGD 0x00000010 /* Enable Receive Good Interrupt */ +#define EnALIE 0x00000020 /* Enable Alignment Error Interrupt */ +#define EnRP 0x00000040 /* Enable Runt Packet on Receive Interrupt */ +#define EnMMP 0x00000080 /* Enable More Missed Packets Interrupt */ +#define EnDFO 0x00000100 /* Enable DMA receive frame over maximum size Interrupt */ +#define EnDEN 0x00000200 /* Enable DMA early notification Interrupt */ +#define EnRDU 0x00000400 /* Enable Receive Descriptor Unavailable Interrupt */ +#define EnRxBErr 0x00000800 /* Enable Receive Bus ERROR interrupt */ +#define EnNATOK 0x00001000 /* Enable NAT Processing OK Interrupt */ +#define EnNATErr 0x00002000 /* Enable NAT Processing Error Interrupt */ +#define EnCFR 0x00004000 /* Enable Control Frame Receive Interrupt */ +#define EnTXINTR 0x00010000 /* Enable Interrupt on Transmit Interrupt */ +#define EnTXEMP 0x00020000 /* Enable Transmit FIFO Empty Interrupt */ +#define EnTXCP 0x00040000 /* Enable Transmit Completion Interrupt */ +#define EnEXDEF 0x00080000 /* Enable Defer Interrupt */ +#define EnNCS 0x00100000 /* Enable No Carrier Sense Interrupt */ +#define EnTXABT 0x00200000 /* Enable Transmit Abort Interrupt */ +#define EnLC 0x00400000 /* Enable Late Collision Interrupt */ +#define EnTDU 0x00800000 /* Enable Transmit Descriptor Unavailable Interrupt */ +#define EnTxBErr 0x01000000 /* Enable Transmit Bus ERROR Interrupt */ + +/* CAM Command Register(CAMCMR) Bits */ +#define CAM_AUP 0x0001 /* Accept Packets with Unicast Address */ +#define CAM_AMP 0x0002 /* Accept Packets with Multicast Address */ +#define CAM_ABP 0x0004 /* Accept Packets with Broadcast Address */ +#define CAM_CCAM 0x0008 /* 0: Accept Packets CAM Recognizes and Reject Others */ + /* 1: Reject Packets CAM Recognizes and Accept Others */ +#define CAM_ECMP 0x0010 /* Enable CAM Compare */ + +/* PHY Register Description */ +#define PHY_CNTL_REG 0x00 +#define PHY_STATUS_REG 0x01 +#define PHY_ID1_REG 0x02 +#define PHY_ID2_REG 0x03 +#define PHY_ANA_REG 0x04 +#define PHY_ANLPA_REG 0x05 +#define PHY_ANE_REG 0x06 + +#define PHY_DSC_REG 0x10 +#define PHY_DSCS_REG 0x11 +#define PHY_10BTCS_REG 0x12 +#define PHY_SINT_REG 0x15 +#define PHY_SREC_REG 0x16 +#define PHY_DISC_REG 0x17 + +/* PHY Control Register Bits */ +#define RESET_PHY (1 << 15) +#define ENABLE_LOOPBACK (1 << 14) +#define DR_100MB (1 << 13) +#define ENABLE_AN (1 << 12) +#define PHY_POWER_DOWN (1 << 11) +#define PHY_MAC_ISOLATE (1 << 10) +#define RESTART_AN (1 << 9) +#define PHY_FULLDUPLEX (1 << 8) +#define PHY_COL_TEST (1 << 7) + +/* PHY Status Register Bits */ +#define AN_COMPLETE (1 << 5) + +/* PHY Auto-negotiation Advertisement Register Bits */ +#define DR100_TX_FULL (1 << 8) +#define DR100_TX_HALF (1 << 7) +#define DR10_TX_FULL (1 << 6) +#define DR10_TX_HALF (1 << 5) +#define IEEE_802_3_CSMA_CD 1 + +#define ETH_MAC_ADDR_SIZE (6) /* dst,src addr is 6 bytes each */ +#define ETH_MaxTxFrames (16) /* Max number of Tx Frames */ + +/* type of ethernet packets */ +#define ETH_TYPE_ARP (0x0806) +#define ETH_TYPE_IP (0x0800) + +#define ETH_HDR_SIZE (14) /* Dest[6]+Src[6]+LengthorType[2] */ + +/* W90P710 bit field for TX Descriptor Word 0 */ +typedef struct __BF_TX_Options { + unsigned int padding:1; /* PadEN - Padding Enable */ + unsigned int crc_en:1; /* CRCApp - CRC Append */ + unsigned int macTxIrqEnbl:1; /* IntEn - Transmit Interrupt Enable */ + unsigned int reserved:28; /* Reserved */ + unsigned int owner:1; /* Owner - Ownership */ +} BF_TX_Options; + +/* W90P710 TX descriptor Word 0 as a union */ +typedef union _TX_Options { + unsigned int ui; + BF_TX_Options bf; +} TX_Options; + +/* W90P710 bit field for Transmit Buffer Starting Address word */ +typedef struct __BF_FrameDataPtr { + unsigned int BO:2; + unsigned int dataPtr:30; +} BF_FrameDataPtr; + +/* W90P710 TX descriptor Word 1 as a union */ +typedef union _FrameDataPtr { + unsigned int ui; + BF_FrameDataPtr bf; +} FrameDataPtr; + +/* W90P710 Third word of the TX Buffer descriptor */ +typedef struct __BF_TX_Status { + unsigned int len:16; /* Frame length */ + unsigned int intTx:1; /* TXINTR - Transmittion interrupt */ + unsigned int txDefer:1; /* DEF - Transmission Deffered */ + unsigned int Reserverd1:1; /* Reserved */ + unsigned int complete:1; /* TXCP - Transmission Complete */ + unsigned int defer:1; /* EXDEF - Deffer Exceed */ + unsigned int noCarrier:1; /* NCS - No Carrier Sense */ + unsigned int exColl:1; /* TXABT - Transmission Abort */ + unsigned int lateColl:1; /* LC - Late Collision */ + unsigned int halted:1; /* TXHA - Transmission Halted */ + unsigned int paused:1; /* PAU - Transmission Paused */ + unsigned int SQErr:1; /* SQE - SQE Error */ + unsigned int Reserverd2:1; /* Reserved */ + unsigned int txCollCnt:4; /* CCNT - Collision Count */ +} BF_TX_Status; + +/* W90P710 Third word of the TX Buffer descriptor as a union of the WORD and Status+Byte count */ +typedef union _TX_Status { + unsigned int ui; + BF_TX_Status bf; +} TX_Status; + +/* W90P710 TX descriptor structure */ +typedef struct __TX_FrameDescriptor { + TX_Options m_opt; + volatile FrameDataPtr m_frameDataPtr; + volatile TX_Status m_status; + struct __TX_FrameDescriptor *m_nextFD; +} TX_FrameDescriptor __attribute__ ((aligned(16))); + +/* W90P710 Rx Buffer Descriptor Word 0 */ +typedef struct __BF_RX_Status { + unsigned int len:16; /* frame length */ + unsigned int intRx:1; /* RXINTR - Receive Interrupt */ + unsigned int crcErr:1; /* CRCE - CRC Error */ + unsigned int Reserved1:1; /* Reserved */ + unsigned int longErr:1; /* PTLE - Packet Too Long */ + unsigned int good:1; /* RXGD - Frame Reception Complete */ + unsigned int alignErr:1; /* ALIE - Alignment Error */ + unsigned int RuntPack:1; /* RP - Runt Packet */ + unsigned int Reserved2:7; /* Reserved */ + unsigned int owner:2; /* Owner - Ownership */ +} BF_RX_Status; + +/* W90P710 Rx Buffer Descriptor Word 0 as a union of the WORD and Status+Byte count */ +typedef union _RX_Status { + unsigned int ui; + BF_RX_Status bf; +} RX_Status; + +/* RX Buffer descriptor structure */ +typedef struct __RX_FrameDescriptor +{ + volatile RX_Status m_status; + volatile FrameDataPtr m_frameDataPtr; + volatile unsigned int m_reserved; + struct __RX_FrameDescriptor *m_nextFD; +} RX_FrameDescriptor __attribute__ ((aligned(16))); + +/* MAC Frame Structure */ +struct __MACFrame { + unsigned char m_dstAddr[6]; + unsigned char m_srcAddr[6]; + unsigned short m_lengthOrType; + unsigned char m_payload[1506]; +} __attribute__ ((packed)); + +typedef struct __MACFrame MACFrame; + +/* Ethernet Control block */ +typedef struct __ETH { + TX_FrameDescriptor *m_curTX_FD; /* pointer to current TX frame descriptor */ + TX_FrameDescriptor *m_baseTX_FD; /* pointer to base TX frame descriptor */ + RX_FrameDescriptor *m_curRX_FD; /* pointer to current RX frame descriptor */ + RX_FrameDescriptor *m_baseRX_FD; /* pointer to base RX frame descriptor */ + unsigned char *m_mac; /* pointer to our MAC address */ +} ETH; + +#endif diff --git a/examples/Makefile b/examples/Makefile index b0a8853..86636b5 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -33,7 +33,11 @@ ifeq ($(ARCH),arm) ifeq ($(BOARD),omap2420h4) LOAD_ADDR = 0x80300000 else -LOAD_ADDR = 0xc100000 + ifeq ($(BOARD),w90p1) + LOAD_ADDR = 0x00001000 + else + LOAD_ADDR = 0xc100000 +endif endif endif diff --git a/include/asm-arm/arch-arm720t/W90P710.h b/include/asm-arm/arch-arm720t/W90P710.h new file mode 100644 index 0000000..9fb8843 --- /dev/null +++ b/include/asm-arm/arch-arm720t/W90P710.h @@ -0,0 +1,239 @@ +/* + * Copyright (c) 2009 KSL Embedded (http://www.kslemb.com) + * Vovk Konstantin <ksl(a)kslemb.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 + * + * Description: Nuvoton W90P710 register layout definition + */ +#ifndef _W90P710_H +#define _W90P710_H + +/* L1 8KB on chip SRAM base address */ +#define SRAM_BASE 0xFFE00000 + +#define GET_REG(reg) (*((volatile unsigned int *)(reg))) +#define PUT_REG(reg, val) (*((volatile unsigned int *)(reg))) = (unsigned int)(val) + +/* System Address Map - Defines the register base address */ +#define GCR_BA 0xFFF00000 /* Global Control */ +#define EBI_BA 0xFFF01000 /* EBI Control */ +#define CACHE_BA 0xFFF02000 /* Cache Control */ +#define EMC_BA 0xFFF03000 /* Ethernet MAC */ +#define GDMA_BA 0xFFF04000 /* GDMA control */ +#define USBH_BA 0xFFF05000 /* USB Host Control */ +#define USBD_BA 0xFFF06000 /* USB Device Control */ +#define FMI_BA 0xFFF07000 /* Flash Memory Card Interface */ +#define LCD_BA 0xFFF08000 /* Display, LCM Interface & Bypass */ +#define ADO_BA 0xFFF09000 /* Audio Control */ + +#define UART0_BA 0xFFF80000 /* UART0 Control (console) */ +#define UART1_BA 0xFFF80100 /* UART1 Control (Bluetooth) */ +#define UART2_BA 0xFFF80200 /* UART2 Control (IrDA) */ +#define UART3_BA 0xFFF80300 /* UART3 Control (micro-printer) */ +#define TMR_BA 0xFFF81000 /* Timer */ +#define AIC_BA 0xFFF82000 /* Interrupt Controller */ +#define GPIO_BA 0xFFF83000 /* GPIO Control */ +#define RTC_BA 0xFFF84000 /* Real Time Clock Control */ +#define SCHI0_BA 0xFFF85000 /* Smart Card Host Interface 0 Control */ +#define SCHI1_BA 0xFFF85800 /* Smart Card Host Interface 1 Control */ +#define I2C0_BA 0xFFF86000 /* I2C 0 Control */ +#define I2C1_BA 0xFFF86100 /* I2C 1 Control */ +#define SSP_BA 0xFFF86200 /* Synchronous Serial Port */ +#define PWM_BA 0xFFF87000 /* Pulse Width Modulation Control */ +#define KPI_BA 0xFFF88000 /* Keypad Interface Control */ +#define PS2_BA 0xFFF89000 /* PS2 Interface Control */ + +/* System Manager Control Registers */ +#define REG_PDID (GCR_BA+0x0000) /* Product Identifier Register */ +#define REG_ARBCON (GCR_BA+0x0004) /* Arbitration Control Register */ +#define REG_PLLCON (GCR_BA+0x0008) /* PLL Control Register */ +#define REG_CLKSEL (GCR_BA+0x000C) /* Clock Select Register */ +#define REG_PLLCON2 (GCR_BA+0x0010) /* PLL Control Register 2 */ +#define REG_I2SCKCON (GCR_BA+0x0014) /* Audio IIS Clock Control Register */ +#define REG_IRQWAKECON (GCR_BA+0x0020) /* IRQ Wakeup Control Register */ +#define REG_IRQWAKEFLAG (GCR_BA+0x0024) /* IRQ Wakeup Flag Register */ +#define REG_PMCON (GCR_BA+0x0028) /* Power Manager control Register */ +#define REG_USBTXRCON (GCR_BA+0x0030) /* USB transceiver control Register */ + +/* Memory Control Registers */ +#define REG_EBICON (EBI_BA+0x000) /* EBI control register */ +#define REG_ROMCON (EBI_BA+0x004) /* ROM/FLASH control register */ +#define REG_SDCONF0 (EBI_BA+0x008) /* SDRAM bank 0 configuration register */ +#define REG_SDCONF1 (EBI_BA+0x00C) /* SDRAM bank 1 configuration register */ +#define REG_SDTIME0 (EBI_BA+0x010) /* SDRAM bank 0 timing control register */ +#define REG_SDTIME1 (EBI_BA+0x014) /* SDRAM bank 1 timing control register */ +#define REG_EXT0CON (EBI_BA+0x018) /* External I/O 0 control register */ +#define REG_EXT1CON (EBI_BA+0x01C) /* External I/O 1 control register */ +#define REG_EXT2CON (EBI_BA+0x020) /* External I/O 2 control register */ +#define REG_EXT3CON (EBI_BA+0x024) /* External I/O 3 control register */ + +/* Cache Control Registers */ +#define REG_CAHCNF (CACHE_BA+0x000)/* Cache configuration register */ +#define REG_CAHCON (CACHE_BA+0x004)/* Cache control register */ +#define REG_CAHADR (CACHE_BA+0x008)/* Cache address register */ + +/* MAC Control registers*/ +#define REG_CAMCMR (EMC_BA+0x000) /* CAM Command Register */ +#define REG_CAMEN (EMC_BA+0x004) /* CAM Enable Register */ +#define REG_CAM0M_Base (EMC_BA+0x008) +#define REG_CAM0L_Base (EMC_BA+0x00c) + +#define REG_TXDLSA (EMC_BA+0x088) /* Transmit Descriptor Link List Start Address Register */ +#define REG_RXDLSA (EMC_BA+0x08C) /* Receive Descriptor Link List Start Address Register */ +#define REG_MCMDR (EMC_BA+0x090) /* MAC Command Register */ +#define REG_MIID (EMC_BA+0x094) /* MII Management Data Register */ +#define REG_MIIDA (EMC_BA+0x098) /* MII Management Control and Address Register */ +#define REG_FFTCR (EMC_BA+0x09C) /* FIFO Threshold Control Register */ +#define REG_TSDR (EMC_BA+0x0a0) /* Transmit Start Demand Register */ +#define REG_RSDR (EMC_BA+0x0a4) /* Receive Start Demand Register */ +#define REG_DMARFC (EMC_BA+0x0a8) /* Maximum Receive Frame Control Register */ +#define REG_MIEN (EMC_BA+0x0ac) /* MAC Interrupt Enable Register */ + +/* MAC Status Registers */ +#define REG_MISTA (EMC_BA+0x0b0) /* MAC Interrupt Status Register */ +#define REG_MGSTA (EMC_BA+0x0b4) /* MAC General Status Register */ +#define REG_MPCNT (EMC_BA+0x0b8) /* Missed Packet Count Register */ +#define REG_MRPC (EMC_BA+0x0bc) /* MAC Receive Pause Count Register */ +#define REG_MRPCC (EMC_BA+0x0c0) /* MAC Receive Pause Current Count Register */ +#define REG_MREPC (EMC_BA+0x0c4) /* MAC Remote Pause Count Register */ +#define REG_DMARFS (EMC_BA+0x0c8) /* DMA Receive Frame Status Register */ +#define REG_CTXDSA (EMC_BA+0x0cc) /* Current Transmit Descriptor Start Address Register */ +#define REG_CTXBSA (EMC_BA+0x0d0) /* Current Transmit Buffer Start Address Register */ +#define REG_CRXDSA (EMC_BA+0x0d4) /* Current Receive Descriptor Start Address Register */ +#define REG_CRXBSA (EMC_BA+0x0d8) /* Current Receive Buffer Start Address Register */ + +/* MAC Diagnostic Registers */ +#define REG_RXFSM (EMC_BA+0x200) /* Receive Finite State Machine Register */ +#define REG_TXFSM (EMC_BA+0x204) /* Transmit Finite State Machine Register */ +#define REG_FSM0 (EMC_BA+0x208) /* Finite State Machine Register 0 */ +#define REG_FSM1 (EMC_BA+0x20c) /* Finite State Machine Register 1 */ +#define REG_DCR (EMC_BA+0x210) /* Debug Configuration Register */ +#define REG_DMMIR (EMC_BA+0x214) /* Debug Mode MAC Information Register */ +#define REG_BISTR (EMC_BA+0x300) /* BIST Mode Register */ + +/* USB Host Controller Registers */ +#define REG_HcRevision (USBH_BA+0x000) /* Revision Register */ +#define REG_HcControl (USBH_BA+0x004) /* Control Register */ +#define REG_HcCommandStatus (USBH_BA+0x008) /* Command Status Register */ +#define REG_HcInterruptStatus (USBH_BA+0x00C) /* Interrupt Status Register */ +#define REG_HcInterruptEnable (USBH_BA+0x010) /* Interrupt Enable Register */ +#define REG_HcInterruptDisable (USBH_BA+0x014) /* Interrupt Disable Register */ +#define REG_HcHCCA (USBH_BA+0x018) /* Communication Area Register */ +#define REG_HcPeriodCurrentED (USBH_BA+0x01C) /* Period Current ED Register */ +#define REG_HcControlHeadED (USBH_BA+0x020) /* Control Head ED Register */ +#define REG_HcControlCurrentED (USBH_BA+0x024) /* Control Current ED Register */ +#define REG_HcBulkHeadED (USBH_BA+0x028) /* Bulk Head ED Register */ +#define REG_HcBulkCurrentED (USBH_BA+0x02C) /* Bulk Current ED Register */ +#define REG_HcDoneHead (USBH_BA+0x030) /* Done Head Register */ +#define REG_HcFmInterval (USBH_BA+0x034) /* Frame Interval Register */ +#define REG_HcFrameRemaining (USBH_BA+0x038) /* Frame Remaining Register */ +#define REG_HcFmNumber (USBH_BA+0x03C) /* Frame Number Register */ +#define REG_HcPeriodicStart (USBH_BA+0x040) /* Periodic Start Register */ +#define REG_HcLSThreshold (USBH_BA+0x044) /* Low Speed Threshold Register */ +#define REG_HcRhDescriptorA (USBH_BA+0x048) /* Root Hub Descriptor A Register */ +#define REG_HcRhDescriptorB (USBH_BA+0x04C) /* Root Hub Descriptor B Register */ +#define REG_HcRhStatus (USBH_BA+0x050) /* Controller Root Hub Status Register */ +#define REG_HcRhPortStatus1 (USBH_BA+0x054) /* Controller Root Hub Port Status [1] */ +#define REG_HcRhPortStatus2 (USBH_BA+0x058) /* Controller Root Hub Port Status [2] */ + +/* USB Configuration Registers */ +#define TestModeEnable (USBH_BA+0x200) /* USB Test Mode Enable Register */ +#define OperationalModeEnable (USBH_BA+0x204) /* USB Operational Mode Enable Register */ + +/* UART0 Control Registers */ +#define REG_UART0_TX (UART0_BA+0x0) /* (W) TX buffer */ +#define REG_UART0_RX (UART0_BA+0x0) /* (R) RX buffer */ +#define REG_UART0_LSB (UART0_BA+0x0) /* Divisor latch LSB */ +#define REG_UART0_MSB (UART0_BA+0x04) /* Divisor latch MSB */ +#define REG_UART0_IER (UART0_BA+0x04) /* Interrupt enable register */ +#define REG_UART0_IIR (UART0_BA+0x08) /* Interrupt ident. register */ +#define REG_UART0_FCR (UART0_BA+0x08) /* FIFO control register */ +#define REG_UART0_LCR (UART0_BA+0x0C) /* Line control register */ +#define REG_UART0_LSR (UART0_BA+0x14) /* Line status register */ +#define REG_UART0_TOR (UART0_BA+0x1C) /* Time out register */ + +/* Timer Control Registers */ +#define REG_TCR0 (TMR_BA+0x0) /* Control Register 0 */ +#define REG_TCR1 (TMR_BA+0x04) /* Control Register 1 */ +#define REG_TICR0 (TMR_BA+0x08) /* Initial Control Register 0 */ +#define REG_TICR1 (TMR_BA+0x0C) /* Initial Control Register 1 */ +#define REG_TDR0 (TMR_BA+0x10) /* Data Register 0 */ +#define REG_TDR1 (TMR_BA+0x14) /* Data Register 1 */ +#define REG_TISR (TMR_BA+0x18) /* Interrupt Status Register */ +#define REG_WTCR (TMR_BA+0x1C) /* Watchdog Timer Control Register */ + +/* Advanced Interrupt Controller Registers */ +#define REG_AIC_IRSR (AIC_BA+0x100) /* Interrupt raw status register */ +#define REG_AIC_IASR (AIC_BA+0x104) /* Interrupt active status register */ +#define REG_AIC_ISR (AIC_BA+0x108) /* Interrupt status register */ +#define REG_AIC_IPER (AIC_BA+0x10C) /* Interrupt priority encoding register */ +#define REG_AIC_ISNR (AIC_BA+0x110) /* Interrupt source number register */ +#define REG_AIC_IMR (AIC_BA+0x114) /* Interrupt mask register */ +#define REG_AIC_OISR (AIC_BA+0x118) /* Output interrupt status register */ +#define REG_AIC_MECR (AIC_BA+0x120) /* Mask enable command register */ +#define REG_AIC_MDCR (AIC_BA+0x124) /* Mask disable command register */ +#define REG_AIC_SSCR (AIC_BA+0x128) /* Source set command register */ +#define REG_AIC_SCCR (AIC_BA+0x12C) /* Source clear command register */ +#define REG_AIC_EOSCR (AIC_BA+0x130) /* End of service command register */ +#define REG_AIC_TEST (AIC_BA+0x200) /* ICE/Debug mode register */ + +/* General-Purpose Input/Output Controller Registers */ + #define GPIO_OFFSET 0x10 +/* groups 0 */ +#define REG_GPIO_CFG0 (GPIO_BA+0x0000) /* Port0 configuration Register */ +#define REG_GPIO_DIR0 (GPIO_BA+0x0004) /* Port0 direction control Register */ +#define REG_GPIO_DATAOUT0 (GPIO_BA+0x0008) /* Port0 data out Register */ +#define REG_GPIO_DATAIN0 (GPIO_BA+0x000c) /* Port0 data input Register */ +/* groups 1 */ +#define REG_GPIO_CFG1 (GPIO_BA+0x0010) /* Port1 configuration Register */ +#define REG_GPIO_DIR1 (GPIO_BA+0x0014) /* Port1 direction control Register */ +#define REG_GPIO_DATAOUT1 (GPIO_BA+0x0018) /* Port1 data out Register */ +#define REG_GPIO_DATAIN1 (GPIO_BA+0x001c) /* Port1 data input Register */ +/* groups 2 */ +#define REG_GPIO_CFG2 (GPIO_BA+0x0020) /* Port2 configuration Register */ +#define REG_GPIO_DIR2 (GPIO_BA+0x0024) /* Port2 direction control Register */ +#define REG_GPIO_DATAOUT2 (GPIO_BA+0x0028) /* Port2 data out Register */ +#define REG_GPIO_DATAIN2 (GPIO_BA+0x002c) /* Port2 data input Register */ +/* groups 3 */ +#define REG_GPIO_CFG3 (GPIO_BA+0x0030) /* Port3 configuration Register */ +#define REG_GPIO_DIR3 (GPIO_BA+0x0034) /* Port3 direction control Register */ +#define REG_GPIO_DATAOUT3 (GPIO_BA+0x0038) /* Port3 data out Register */ +#define REG_GPIO_DATAIN3 (GPIO_BA+0x003c) /* Port3 data input Register */ +/* groups 4 */ +#define REG_GPIO_CFG4 (GPIO_BA+0x0040) /* Port4 configuration Register */ +#define REG_GPIO_DIR4 (GPIO_BA+0x0044) /* Port4 direction control Register */ +#define REG_GPIO_DATAOUT4 (GPIO_BA+0x0048) /* Port4 data out Register */ +#define REG_GPIO_DATAIN4 (GPIO_BA+0x004c) /* Port4 data input Register */ +/* groups 5 */ +#define REG_GPIO_CFG5 (GPIO_BA+0x0050) /* Port5 configuration Register */ +#define REG_GPIO_DIR5 (GPIO_BA+0x0054) /* Port5 direction control Register */ +#define REG_GPIO_DATAOUT5 (GPIO_BA+0x0058) /* Port5 data out Register */ +#define REG_GPIO_DATAIN5 (GPIO_BA+0x005c) /* Port5 data input Register */ +/* groups 6 */ +#define REG_GPIO_CFG6 (GPIO_BA+0x0060) /* Port6 configuration Register */ +#define REG_GPIO_DIR6 (GPIO_BA+0x0064) /* Port6 direction control Register */ +#define REG_GPIO_DATAOUT6 (GPIO_BA+0x0068) /* Port6 data out Register */ +#define REG_GPIO_DATAIN6 (GPIO_BA+0x006c) /* Port6 data input Register */ + +#define REG_GPIO_DBNCECON (GPIO_BA+0x0070) /* Input debounce control Register */ +#define REG_GPIO_XICFG (GPIO_BA+0x0074) /* Extend Interrupt Configure Register */ +#define REG_GPIO_XISTATUS (GPIO_BA+0x0078) /* Extend Interrupt Status Register */ + +#endif /* _W90P710_H */ diff --git a/include/asm-arm/arch-arm720t/hardware.h b/include/asm-arm/arch-arm720t/hardware.h index 3056ca7..9e6a125 100644 --- a/include/asm-arm/arch-arm720t/hardware.h +++ b/include/asm-arm/arch-arm720t/hardware.h @@ -23,8 +23,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ - -#if defined(CONFIG_S3C4510B) +#if defined(CONFIG_W90P710) +#include <asm-arm/arch-arm720t/W90P710.h> +#elif defined(CONFIG_S3C4510B) #include <asm-arm/arch-arm720t/s3c4510b.h> #elif defined(CONFIG_NETARM) #include <asm-arm/arch-arm720t/netarm_registers.h> diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index fec3a7e..5b73471 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h @@ -46,6 +46,10 @@ static inline void sync(void) static inline void * map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) { + #ifdef CONFIG_W90P710 + if(flags==MAP_NOCACHE) + paddr |= 0x80000000; + #endif return (void *)paddr; } diff --git a/include/configs/W90P1.h b/include/configs/W90P1.h new file mode 100644 index 0000000..5233144 --- /dev/null +++ b/include/configs/W90P1.h @@ -0,0 +1,237 @@ +/* + * Copyright (c) 2008 KSL Embedded (http://www.kslemb.com) + * Vovk Konstantin <ksl(a)kslemb.com> + * + * Configuation settings for W90P1 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 + +/* + * If we are developing, we might want to start u-boot from ram + * so we MUST NOT initialize critical regs like mem-timing ... + * + * #define CONFIG_SKIP_LOWLEVEL_INIT + */ + +/* + * High Level Configuration Options + * + */ +#define CONFIG_ARM7 1 /* This is a ARM7 CPU */ +#define CONFIG_ARM_THUMB 1 /* this is an ARM7TDMI */ +#define CONFIG_W90P710 1 /* it's a W90P710 chip */ +#define CONFIG_W90P1 1 /* on an W90P1 Board */ + +#define CONFIG_IDENT_STRING "\nKSL uBoot port for W90P710 SoC v1.1" + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_DRIVER_W90P710_ETH 1 +#define CONFIG_DRIVER_W90P710_UART 1 +#define CONFIG_DRIVER_W90P710_FLASH 1 + +/* + * select serial console configuration + */ +#define CONFIG_SERIAL1 1 /* UART0 */ + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +#define CONFIG_BAUDRATE 115200 + +/* + * BOOTP options + */ + +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_BOOTFILESIZE + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +/* + * Board miscellaneous initializations: Init ECS1 and ECS2 for work with IDE bus + */ +#define CONFIG_MISC_INIT_R 1 + +/* Enable NAND Flash support */ +#define CONFIG_CMD_NAND 1 + +/* Enable IDE support */ +#define CONFIG_CMD_IDE 1 + +/* Enable status LED */ +#define CONFIG_STATUS_LED 1 + +/* If board support NAND flash */ +#if defined (CONFIG_CMD_NAND) + +#define NAND_MAX_CHIPS 1 +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define W90P710_NAND_BASE 0xF2000000 +#define W90P710_NAND_CLE (1<<20) /* CLE Address line */ +#define W90P710_NAND_ALE (1<<21) /* ALE Address line */ +#define CONFIG_SYS_NAND_BASE W90P710_NAND_BASE /* Base Address of the memory mapped NAND flash interface */ + +#endif /* CONFIG_CMD_NAND */ + +/* If board support IDE interface */ +#if defined (CONFIG_CMD_IDE) + +#define CONFIG_DOS_PARTITION 1 + +/* W90P710 memory mapped IDE/ATA stuff */ +#undef CONFIG_IDE_8xx_DIRECT /* no pcmcia interface required */ +#undef CONFIG_IDE_LED /* no led for ide supported */ +#undef CONFIG_IDE_RESET /* no reset for ide supported */ + +#define CONFIG_SYS_IDE_MAXBUS 1 /* max is 1 IDE bus */ +#define CONFIG_SYS_IDE_MAXDEVICE (CONFIG_SYS_IDE_MAXBUS * 1) /* max 1 drive per IDE bus */ + +/* W90P1 board implements work with Data and registers via ECS1*/ +#define CONFIG_SYS_ATA_BASE_ADDR 0xF3000000 /* Must be identical to the EXT1_BASE defined in /board/w90p1/ide.c */ +#define CONFIG_SYS_ATA_IDE0_OFFSET 0x0000 +#define CONFIG_SYS_ATA_DATA_OFFSET 0x0000 /* Offset for data I/O */ +#define CONFIG_SYS_ATA_REG_OFFSET 0x0000 /* Offset for normal register accesses */ +/* CONFIG_SYS_ATA_ALT_OFFSET is used for work with Control Block [CBR] registers with A0...A2 = 0x6,0x7 */ +/* uBoot used only 0x6 - Alter Status/Device Control register */ +/* W90P1 board implements work with CBR via ECS2*/ +#define CONFIG_SYS_ATA_ALT_OFFSET 0x01000000 /* Offset for alternate registers Must be identical to the (EXT2_BASE-EXT1_BASE) */ + +#endif /* CONFIG_CMD_IDE */ + +/* If board support Status LED */ +#if defined (CONFIG_STATUS_LED) + +#define CONFIG_BOARD_SPECIFIC_LED 1 + +#define STATUS_LED_BIT 0x00000004 /* GPIO2 pin 60 */ +#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 4) /* 250ms */ +#define STATUS_LED_STATE STATUS_LED_BLINKING +#define STATUS_LED_ACTIVE 0 /* LED on for bit is '0' */ +#define STATUS_LED_BOOT 0 /* LED 0 used for boot status */ + +#define STATUS_LED_DIR 0xFFF83004 /* GPIO Port Direction register address*/ +#define STATUS_LED_PORT 0xFFF83008 /* GPIO Port Data output register */ + +#endif /* CONFIG_STATUS_LED */ + +/* Enable Ping command */ +#define CONFIG_CMD_PING +/* Enable one or more MAC's support */ +#define CONFIG_NET_MULTI + +#define CONFIG_ETHADDR 00:40:95:36:35:33 +#define CONFIG_NETMASK 255.255.255.0 +#define CONFIG_IPADDR 192.168.0.84 +#define CONFIG_SERVERIP 192.168.0.4 + +/* Enable PHY Reset after MAC Init */ +/*#define CONFIG_RESET_PHY_R*/ + +#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ +#define CONFIG_BOOTDELAY 2 /* delay for automatic boot */ +/*#define CONFIG_SYS_AUTOLOAD "no"*/ /*rarpb, bootp or dhcp commands will perform only*/ + +#define CONFIG_LOADADDR 0x8000 /* default load address */ +#define CONFIG_BOOTCOMMAND "bootm 0x7F090000" /* Start uClinux from NOR Flash */ +/*#define CONFIG_BOOTCOMMAND "tftp 0x8000 uImage"*/ + +#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/hda1 rw" + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "->" /* Monitor Command Prompt */ +#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ + +#define CONFIG_CMDLINE_TAG 1 /* allow passing of command line args to linux */ +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +#define CONFIG_SYS_MEMTEST_START 0x00000000 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x01F00000 /* 31 MB in DRAM */ + + +#define CONFIG_SYS_LOAD_ADDR 0x00008000 /* default Linux kernel load address */ + +#define CONFIG_SYS_CLK_FREQ 80000000 /* CPU freq: 80 MHz */ +#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 KHz */ + +/* valid baudrates */ +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +/* + * Stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128*1024) /* regular stack */ + +#if defined (CONFIG_USE_IRQ) +#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ +#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ +#endif + +/* + * Physical Memory Map after relocation + */ +#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 banks of DRAM */ +#define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */ +#define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */ + +/* U-Boot code can handle detection of the flash automatically */ +#define CONFIG_SYS_FLASH_CFI 1 /* The flash is CFI compatible */ +#define CONFIG_FLASH_CFI_DRIVER 1 /* Use common CFI driver */ +#define CONFIG_FLASH_CFI_AMD_RESET /* Reset command is F0 */ + +#define CONFIG_SYS_FLASH_BASE 0x7F000000 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* Max number of banks */ +#define CONFIG_SYS_MAX_FLASH_SECT 71 /* some have 67 sectors (M29W320DB), but newer have 71 (M29W320EB) */ + +/* environment settings */ +#define CONFIG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_NOWHERE + +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000) /* environment start address 256K used for uBoot*/ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector 64K*/ + +#define CONFIG_ENV_SIZE 0x1000 /* max size for environment 4K */ +#define CONFIG_FLASH_SHOW_PROGRESS 15 /* Show Flash write progress */ + +#endif /* __CONFIG_H */ diff --git a/include/netdev.h b/include/netdev.h index 751f0da..676638f 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -70,6 +70,7 @@ int skge_initialize(bd_t *bis); int tsi108_eth_initialize(bd_t *bis); int uec_initialize(int index); int uli526x_initialize(bd_t *bis); +int W90P710_EMC_initialize(bd_t *bis); /* Boards with PCI network controllers can call this from their board_eth_init() * function to initialize whatever's on board. -- 1.5.4.3

4 3

[U-Boot] [PATCH] ARM:OMAP3:Zoom1: Add nand unlock option
by Nishanth Menon 06 Feb '09

06 Feb '09

>From d391faf8ca68fcddc8569b03cf24d151d4d3b937 Mon Sep 17 00:00:00 2001 From: Nishanth Menon <nm(a)ti.com> Date: Mon, 2 Feb 2009 18:20:12 -0600 Subject: [PATCH] ARM:OMAP3:Zoom1: Add nand unlock option Enable NAND_UNLOCK option for unlocking nand for erase/write operations Signed-off-by: Nishanth Menon <nm(a)ti.com> --- include/configs/omap3_zoom1.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 54d2416..f8ae163 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -103,6 +103,7 @@ #define CONFIG_CMD_I2C /* I2C serial bus support */ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_NAND /* NAND support */ +#define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */ #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -- 1.5.4.3

2 1

[U-Boot] [PATCH] Blackfin: disable NetBSD by default since no port exists
by Mike Frysinger 06 Feb '09

06 Feb '09

Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- common/cmd_bootm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 9055672..c814c68 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -104,7 +104,9 @@ typedef int boot_os_fn (int flag, int argc, char *argv[], bootm_headers_t *images); /* pointers to os/initrd/fdt */ #define CONFIG_BOOTM_LINUX 1 +#if !defined(CONFIG_BLACKFIN) #define CONFIG_BOOTM_NETBSD 1 +#endif #define CONFIG_BOOTM_RTEMS 1 #ifdef CONFIG_BOOTM_LINUX -- 1.6.1.2

2 1

[U-Boot] [PATCH] at91: Factored out common serial hardware initialization
by Michael Roth 06 Feb '09

06 Feb '09

Created a new function at91_serial_hw_init() which sets up the dedicated PIO pins of several at91 SoC according to CONFIG_USARTx. Please note that the used pins for serial communication varies on different at91 SoC independently of the logic functionality equality of the serial hardware. Signed-off-by: Michael Roth <mroth(a)nessie.de> --- board/afeb9260/afeb9260.c | 30 +----- board/atmel/at91cap9adk/at91cap9adk.c | 30 +----- board/atmel/at91sam9260ek/at91sam9260ek.c | 30 +----- board/atmel/at91sam9261ek/at91sam9261ek.c | 30 +----- board/atmel/at91sam9263ek/at91sam9263ek.c | 30 +----- board/atmel/at91sam9rlek/at91sam9rlek.c | 30 +----- include/at91_serial.h | 23 ++++ lib_arm/Makefile | 1 + lib_arm/at91_serial.c | 168 +++++++++++++++++++++++++++++ 9 files changed, 204 insertions(+), 168 deletions(-) create mode 100644 include/at91_serial.h create mode 100644 lib_arm/at91_serial.c diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c index 32445ab..ea90850 100644 --- a/board/afeb9260/afeb9260.c +++ b/board/afeb9260/afeb9260.c @@ -32,6 +32,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/io.h> #include <asm/arch/hardware.h> +#include <at91_serial.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) #include <netdev.h> #include <net.h> @@ -44,33 +45,6 @@ DECLARE_GLOBAL_DATA_PTR; * Miscelaneous platform dependent initialisations */ -static void afeb9260_serial_hw_init(void) -{ -#ifdef CONFIG_USART0 - at91_set_A_periph(AT91_PIN_PB4, 1); /* TXD0 */ - at91_set_A_periph(AT91_PIN_PB5, 0); /* RXD0 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US0); -#endif - -#ifdef CONFIG_USART1 - at91_set_A_periph(AT91_PIN_PB6, 1); /* TXD1 */ - at91_set_A_periph(AT91_PIN_PB7, 0); /* RXD1 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US1); -#endif - -#ifdef CONFIG_USART2 - at91_set_A_periph(AT91_PIN_PB8, 1); /* TXD2 */ - at91_set_A_periph(AT91_PIN_PB9, 0); /* RXD2 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US2); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ - at91_set_A_periph(AT91_PIN_PB14, 0); /* DRXD */ - at91_set_A_periph(AT91_PIN_PB15, 1); /* DTXD */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); -#endif -} - static void afeb9260_nand_hw_init(void) { unsigned long csa; @@ -201,7 +175,7 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - afeb9260_serial_hw_init(); + at91_serial_hw_init(); #ifdef CONFIG_CMD_NAND afeb9260_nand_hw_init(); #endif diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c index f7d68b7..0030e8c 100644 --- a/board/atmel/at91cap9adk/at91cap9adk.c +++ b/board/atmel/at91cap9adk/at91cap9adk.c @@ -33,6 +33,7 @@ #include <asm/arch/hardware.h> #include <lcd.h> #include <atmel_lcdc.h> +#include <at91_serial.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) #include <net.h> #endif @@ -47,33 +48,6 @@ DECLARE_GLOBAL_DATA_PTR; * Miscelaneous platform dependent initialisations */ -static void at91cap9_serial_hw_init(void) -{ -#ifdef CONFIG_USART0 - at91_set_A_periph(AT91_PIN_PA22, 1); /* TXD0 */ - at91_set_A_periph(AT91_PIN_PA23, 0); /* RXD0 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_US0); -#endif - -#ifdef CONFIG_USART1 - at91_set_A_periph(AT91_PIN_PD0, 1); /* TXD1 */ - at91_set_A_periph(AT91_PIN_PD1, 0); /* RXD1 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_US1); -#endif - -#ifdef CONFIG_USART2 - at91_set_A_periph(AT91_PIN_PD2, 1); /* TXD2 */ - at91_set_A_periph(AT91_PIN_PD3, 0); /* RXD2 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_US2); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ - at91_set_A_periph(AT91_PIN_PC30, 0); /* DRXD */ - at91_set_A_periph(AT91_PIN_PC31, 1); /* DTXD */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); -#endif -} - static void at91cap9_slowclock_hw_init(void) { /* @@ -367,7 +341,7 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - at91cap9_serial_hw_init(); + at91_serial_hw_init(); at91cap9_slowclock_hw_init(); at91cap9_nor_hw_init(); #ifdef CONFIG_CMD_NAND diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index ef99b8b..6c6084d 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -31,6 +31,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/io.h> #include <asm/arch/hardware.h> +#include <at91_serial.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) #include <net.h> #endif @@ -43,33 +44,6 @@ DECLARE_GLOBAL_DATA_PTR; * Miscelaneous platform dependent initialisations */ -static void at91sam9260ek_serial_hw_init(void) -{ -#ifdef CONFIG_USART0 - at91_set_A_periph(AT91_PIN_PB4, 1); /* TXD0 */ - at91_set_A_periph(AT91_PIN_PB5, 0); /* RXD0 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US0); -#endif - -#ifdef CONFIG_USART1 - at91_set_A_periph(AT91_PIN_PB6, 1); /* TXD1 */ - at91_set_A_periph(AT91_PIN_PB7, 0); /* RXD1 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US1); -#endif - -#ifdef CONFIG_USART2 - at91_set_A_periph(AT91_PIN_PB8, 1); /* TXD2 */ - at91_set_A_periph(AT91_PIN_PB9, 0); /* RXD2 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US2); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ - at91_set_A_periph(AT91_PIN_PB14, 0); /* DRXD */ - at91_set_A_periph(AT91_PIN_PB15, 1); /* DTXD */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); -#endif -} - #ifdef CONFIG_CMD_NAND static void at91sam9260ek_nand_hw_init(void) { @@ -217,7 +191,7 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - at91sam9260ek_serial_hw_init(); + at91_serial_hw_init(); #ifdef CONFIG_CMD_NAND at91sam9260ek_nand_hw_init(); #endif diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c index 14f236d..591d8ca 100644 --- a/board/atmel/at91sam9261ek/at91sam9261ek.c +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c @@ -32,6 +32,7 @@ #include <asm/arch/io.h> #include <lcd.h> #include <atmel_lcdc.h> +#include <at91_serial.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_DRIVER_DM9000) #include <net.h> #endif @@ -43,33 +44,6 @@ DECLARE_GLOBAL_DATA_PTR; * Miscelaneous platform dependent initialisations */ -static void at91sam9261ek_serial_hw_init(void) -{ -#ifdef CONFIG_USART0 - at91_set_A_periph(AT91_PIN_PC8, 1); /* TXD0 */ - at91_set_A_periph(AT91_PIN_PC9, 0); /* RXD0 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_US0); -#endif - -#ifdef CONFIG_USART1 - at91_set_A_periph(AT91_PIN_PC12, 1); /* TXD1 */ - at91_set_A_periph(AT91_PIN_PC13, 0); /* RXD1 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_US1); -#endif - -#ifdef CONFIG_USART2 - at91_set_A_periph(AT91_PIN_PC14, 1); /* TXD2 */ - at91_set_A_periph(AT91_PIN_PC15, 0); /* RXD2 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_US2); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ - at91_set_A_periph(AT91_PIN_PA9, 0); /* DRXD */ - at91_set_A_periph(AT91_PIN_PA10, 1); /* DTXD */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); -#endif -} - #ifdef CONFIG_CMD_NAND static void at91sam9261ek_nand_hw_init(void) { @@ -250,7 +224,7 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - at91sam9261ek_serial_hw_init(); + at91_serial_hw_init(); #ifdef CONFIG_CMD_NAND at91sam9261ek_nand_hw_init(); #endif diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index ebd4649..74f608a 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -34,6 +34,7 @@ #include <asm/arch/hardware.h> #include <lcd.h> #include <atmel_lcdc.h> +#include <at91_serial.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) #include <net.h> #endif @@ -46,33 +47,6 @@ DECLARE_GLOBAL_DATA_PTR; * Miscelaneous platform dependent initialisations */ -static void at91sam9263ek_serial_hw_init(void) -{ -#ifdef CONFIG_USART0 - at91_set_A_periph(AT91_PIN_PA26, 1); /* TXD0 */ - at91_set_A_periph(AT91_PIN_PA27, 0); /* RXD0 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_US0); -#endif - -#ifdef CONFIG_USART1 - at91_set_A_periph(AT91_PIN_PD0, 1); /* TXD1 */ - at91_set_A_periph(AT91_PIN_PD1, 0); /* RXD1 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_US1); -#endif - -#ifdef CONFIG_USART2 - at91_set_A_periph(AT91_PIN_PD2, 1); /* TXD2 */ - at91_set_A_periph(AT91_PIN_PD3, 0); /* RXD2 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_US2); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ - at91_set_A_periph(AT91_PIN_PC30, 0); /* DRXD */ - at91_set_A_periph(AT91_PIN_PC31, 1); /* DTXD */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); -#endif -} - #ifdef CONFIG_CMD_NAND static void at91sam9263ek_nand_hw_init(void) { @@ -301,7 +275,7 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - at91sam9263ek_serial_hw_init(); + at91_serial_hw_init(); #ifdef CONFIG_CMD_NAND at91sam9263ek_nand_hw_init(); #endif diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c index b6fef9d..801a912 100644 --- a/board/atmel/at91sam9rlek/at91sam9rlek.c +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c @@ -32,6 +32,7 @@ #include <asm/arch/io.h> #include <lcd.h> #include <atmel_lcdc.h> +#include <at91_serial.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) #include <net.h> #endif @@ -43,33 +44,6 @@ DECLARE_GLOBAL_DATA_PTR; * Miscelaneous platform dependent initialisations */ -static void at91sam9rlek_serial_hw_init(void) -{ -#ifdef CONFIG_USART0 - at91_set_A_periph(AT91_PIN_PA6, 1); /* TXD0 */ - at91_set_A_periph(AT91_PIN_PA7, 0); /* RXD0 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_US0); -#endif - -#ifdef CONFIG_USART1 - at91_set_A_periph(AT91_PIN_PA11, 1); /* TXD1 */ - at91_set_A_periph(AT91_PIN_PA12, 0); /* RXD1 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_US1); -#endif - -#ifdef CONFIG_USART2 - at91_set_A_periph(AT91_PIN_PA13, 1); /* TXD2 */ - at91_set_A_periph(AT91_PIN_PA14, 0); /* RXD2 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_US2); -#endif - -#ifdef CONFIG_USART3 /* DBGU */ - at91_set_A_periph(AT91_PIN_PA21, 0); /* DRXD */ - at91_set_A_periph(AT91_PIN_PA22, 1); /* DTXD */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); -#endif -} - #ifdef CONFIG_CMD_NAND static void at91sam9rlek_nand_hw_init(void) { @@ -223,7 +197,7 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - at91sam9rlek_serial_hw_init(); + at91_serial_hw_init(); #ifdef CONFIG_CMD_NAND at91sam9rlek_nand_hw_init(); #endif diff --git a/include/at91_serial.h b/include/at91_serial.h new file mode 100644 index 0000000..e0d9ce3 --- /dev/null +++ b/include/at91_serial.h @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2009 Michael Roth <mroth(a)nessie.de> + * + * 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, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __AT91_SERIAL_H__ +#define __AT91_SERIAL_H__ + +extern void at91_serial_hw_init(void); + +#endif /* __AT91_SERIAL_H__ */ diff --git a/lib_arm/Makefile b/lib_arm/Makefile index c8795b2..53eba85 100644 --- a/lib_arm/Makefile +++ b/lib_arm/Makefile @@ -32,6 +32,7 @@ SOBJS-y += _modsi3.o SOBJS-y += _udivsi3.o SOBJS-y += _umodsi3.o +COBJS-y += at91_serial.o COBJS-y += board.o COBJS-y += bootm.o COBJS-y += cache.o diff --git a/lib_arm/at91_serial.c b/lib_arm/at91_serial.c new file mode 100644 index 0000000..d12e7c8 --- /dev/null +++ b/lib_arm/at91_serial.c @@ -0,0 +1,168 @@ +/* + * (C) Copyright 2009 Michael Roth <mroth(a)nessie.de> + * + * (C) Copyright 2007-2008 + * Stelian Pop <stelian.pop(a)leadtechdesign.com> + * Lead Tech Design <www.leadtechdesign.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, see <http://www.gnu.org/licenses/>. + */ + +#include <common.h> +#include <asm/arch/at91_pmc.h> +#include <asm/arch/hardware.h> +#include <asm/arch/io.h> +#include <asm/arch/gpio.h> + +#ifdef CONFIG_ATMEL_USART + +#if !defined(CONFIG_USART0) && !defined(CONFIG_USART1) && \ + !defined(CONFIG_USART2) && !defined(CONFIG_USART3) +# error CONFIG_ATMEL_USART defined without CONFIG_USARTx defined +#endif + +#ifdef CONFIG_AT91CAP9 +void at91_serial_hw_init(void) +{ +#ifdef CONFIG_USART0 + at91_set_A_periph(AT91_PIN_PA22, 1); /* TXD0 */ + at91_set_A_periph(AT91_PIN_PA23, 0); /* RXD0 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_US0); +#endif +#ifdef CONFIG_USART1 + at91_set_A_periph(AT91_PIN_PD0, 1); /* TXD1 */ + at91_set_A_periph(AT91_PIN_PD1, 0); /* RXD1 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_US1); +#endif +#ifdef CONFIG_USART2 + at91_set_A_periph(AT91_PIN_PD2, 1); /* TXD2 */ + at91_set_A_periph(AT91_PIN_PD3, 0); /* RXD2 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_US2); +#endif +#ifdef CONFIG_USART3 /* DBGU */ + at91_set_A_periph(AT91_PIN_PC30, 0); /* DRXD */ + at91_set_A_periph(AT91_PIN_PC31, 1); /* DTXD */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); +#endif +} +#endif + +#ifdef CONFIG_AT91SAM9260 +void at91_serial_hw_init(void) +{ +#ifdef CONFIG_USART0 + at91_set_A_periph(AT91_PIN_PB4, 1); /* TXD0 */ + at91_set_A_periph(AT91_PIN_PB5, 0); /* RXD0 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US0); +#endif +#ifdef CONFIG_USART1 + at91_set_A_periph(AT91_PIN_PB6, 1); /* TXD1 */ + at91_set_A_periph(AT91_PIN_PB7, 0); /* RXD1 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US1); +#endif +#ifdef CONFIG_USART2 + at91_set_A_periph(AT91_PIN_PB8, 1); /* TXD2 */ + at91_set_A_periph(AT91_PIN_PB9, 0); /* RXD2 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US2); +#endif +#ifdef CONFIG_USART3 /* DBGU */ + at91_set_A_periph(AT91_PIN_PB14, 0); /* DRXD */ + at91_set_A_periph(AT91_PIN_PB15, 1); /* DTXD */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); +#endif +} +#endif + +#ifdef CONFIG_AT91SAM9261 +void at91_serial_hw_init(void) +{ +#ifdef CONFIG_USART0 + at91_set_A_periph(AT91_PIN_PC8, 1); /* TXD0 */ + at91_set_A_periph(AT91_PIN_PC9, 0); /* RXD0 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_US0); +#endif +#ifdef CONFIG_USART1 + at91_set_A_periph(AT91_PIN_PC12, 1); /* TXD1 */ + at91_set_A_periph(AT91_PIN_PC13, 0); /* RXD1 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_US1); +#endif +#ifdef CONFIG_USART2 + at91_set_A_periph(AT91_PIN_PC14, 1); /* TXD2 */ + at91_set_A_periph(AT91_PIN_PC15, 0); /* RXD2 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_US2); +#endif +#ifdef CONFIG_USART3 /* DBGU */ + at91_set_A_periph(AT91_PIN_PA9, 0); /* DRXD */ + at91_set_A_periph(AT91_PIN_PA10, 1); /* DTXD */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); +#endif +} +#endif + +#ifdef CONFIG_AT91SAM9263 +void at91_serial_hw_init(void) +{ +#ifdef CONFIG_USART0 + at91_set_A_periph(AT91_PIN_PA26, 1); /* TXD0 */ + at91_set_A_periph(AT91_PIN_PA27, 0); /* RXD0 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_US0); +#endif +#ifdef CONFIG_USART1 + at91_set_A_periph(AT91_PIN_PD0, 1); /* TXD1 */ + at91_set_A_periph(AT91_PIN_PD1, 0); /* RXD1 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_US1); +#endif +#ifdef CONFIG_USART2 + at91_set_A_periph(AT91_PIN_PD2, 1); /* TXD2 */ + at91_set_A_periph(AT91_PIN_PD3, 0); /* RXD2 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_US2); +#endif +#ifdef CONFIG_USART3 /* DBGU */ + at91_set_A_periph(AT91_PIN_PC30, 0); /* DRXD */ + at91_set_A_periph(AT91_PIN_PC31, 1); /* DTXD */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); +#endif +} +#endif + +#ifdef CONFIG_AT91SAM9RL +void at91_serial_hw_init(void) +{ +#ifdef CONFIG_USART0 + at91_set_A_periph(AT91_PIN_PA6, 1); /* TXD0 */ + at91_set_A_periph(AT91_PIN_PA7, 0); /* RXD0 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_US0); +#endif +#ifdef CONFIG_USART1 + at91_set_A_periph(AT91_PIN_PA11, 1); /* TXD1 */ + at91_set_A_periph(AT91_PIN_PA12, 0); /* RXD1 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_US1); +#endif +#ifdef CONFIG_USART2 + at91_set_A_periph(AT91_PIN_PA13, 1); /* TXD2 */ + at91_set_A_periph(AT91_PIN_PA14, 0); /* RXD2 */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_US2); +#endif +#ifdef CONFIG_USART3 /* DBGU */ + at91_set_A_periph(AT91_PIN_PA21, 0); /* DRXD */ + at91_set_A_periph(AT91_PIN_PA22, 1); /* DTXD */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS); +#endif +} +#endif + +#endif /* CONFIG_ATMEL_USART */ -- 1.6.0.6

3 5

[U-Boot] [PATCH v2] 86xx: Update CPU info output on bootup
by Peter Tyser 06 Feb '09

06 Feb '09

- Update style of 86xx CPU information on boot to more closely match 85xx boards - Fix detection of 8641/8641D - Use strmhz() to display frequencies - Display L1 information - Display L2 cache size - Fixed CPU/SVR version output == Before == Freescale PowerPC CPU: Core: E600 Core 0, Version: 0.2, (0x80040202) System: Unknown, Version: 2.1, (0x80900121) Clocks: CPU:1066 MHz, MPX: 533 MHz, DDR: 266 MHz, LBC: 133 MHz L2: Enabled Board: X-ES XPedite5170 3U VPX SBC == After == CPU: 8641D, Version: 2.1, (0x80900121) Core: E600 Core 0, Version: 2.2, (0x80040202) Clock Configuration: CPU:1066.667 MHz, MPX:533.333 MHz DDR:266.667 MHz (533.333 MT/s data rate), LBC:133.333 MHz L1: D-cache 32 KB enabled I-cache 32 KB enabled L2: 512 KB enabled Board: X-ES XPedite5170 3U VPX SBC Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- cpu/mpc86xx/cpu.c | 82 +++++++++++++++++++++--------------------- include/asm-ppc/processor.h | 8 ++++- 2 files changed, 48 insertions(+), 42 deletions(-) diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index b2a107d..c41616d 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -50,49 +50,25 @@ checkcpu(void) uint pvr, svr; uint ver; uint major, minor; + char buf1[32], buf2[32]; volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; volatile ccsr_gur_t *gur = &immap->im_gur; - - puts("Freescale PowerPC\n"); - - pvr = get_pvr(); - ver = PVR_VER(pvr); - major = PVR_MAJ(pvr); - minor = PVR_MIN(pvr); - - puts("CPU:\n"); - puts(" Core: "); - - switch (ver) { - case PVR_VER(PVR_86xx): - { - uint msscr0 = mfspr(MSSCR0); - printf("E600 Core %d", (msscr0 & 0x20) ? 1 : 0 ); - if (gur->pordevsr & MPC86xx_PORDEVSR_CORE1TE) - puts("\n Core1Translation Enabled"); - debug(" (MSSCR0=%x, PORDEVSR=%x)", msscr0, gur->pordevsr); - } - break; - default: - puts("Unknown"); - break; - } - printf(", Version: %d.%d, (0x%08x)\n", major, minor, pvr); + uint msscr0 = mfspr(MSSCR0); svr = get_svr(); ver = SVR_SOC_VER(svr); major = SVR_MAJ(svr); minor = SVR_MIN(svr); - puts(" System: "); + puts("CPU: "); + switch (ver) { case SVR_8641: - if (SVR_SUBVER(svr) == 1) { - puts("8641D"); - } else { puts("8641"); - } - break; + break; + case SVR_8641D: + puts("8641D"); + break; case SVR_8610: puts("8610"); break; @@ -101,26 +77,50 @@ checkcpu(void) break; } printf(", Version: %d.%d, (0x%08x)\n", major, minor, svr); + puts("Core: "); + + pvr = get_pvr(); + ver = PVR_E600_VER(pvr); + major = PVR_E600_MAJ(pvr); + minor = PVR_E600_MIN(pvr); + + printf("E600 Core %d", (msscr0 & 0x20) ? 1 : 0 ); + if (gur->pordevsr & MPC86xx_PORDEVSR_CORE1TE) + puts("\n Core1Translation Enabled"); + debug(" (MSSCR0=%x, PORDEVSR=%x)", msscr0, gur->pordevsr); + + printf(", Version: %d.%d, (0x%08x)\n", major, minor, pvr); get_sys_info(&sysinfo); - puts(" Clocks: "); - printf("CPU:%4lu MHz, ", sysinfo.freqProcessor / 1000000); - printf("MPX:%4lu MHz, ", sysinfo.freqSystemBus / 1000000); - printf("DDR:%4lu MHz, ", sysinfo.freqSystemBus / 2000000); + puts("Clock Configuration:\n"); + printf(" CPU:%-4s MHz, ", strmhz(buf1, sysinfo.freqProcessor)); + printf("MPX:%-4s MHz\n", strmhz(buf1, sysinfo.freqSystemBus)); + printf(" DDR:%-4s MHz (%s MT/s data rate), ", + strmhz(buf1, sysinfo.freqSystemBus / 2), + strmhz(buf2, sysinfo.freqSystemBus)); if (sysinfo.freqLocalBus > LCRR_CLKDIV) { - printf("LBC:%4lu MHz\n", sysinfo.freqLocalBus / 1000000); + printf("LBC:%-4s MHz\n", strmhz(buf1, sysinfo.freqLocalBus)); } else { printf("LBC: unknown (LCRR[CLKDIV] = 0x%02lx)\n", sysinfo.freqLocalBus); } - puts(" L2: "); - if (get_l2cr() & 0x80000000) - puts("Enabled\n"); - else + puts("L1: D-cache 32 KB enabled\n"); + puts(" I-cache 32 KB enabled\n"); + + puts("L2: "); + if (get_l2cr() & 0x80000000) { +#if defined(CONFIG_MPC8610) + puts("256"); +#elif defined(CONFIG_MPC8641) + puts("512"); +#endif + puts(" KB enabled\n"); + } else { puts("Disabled\n"); + } return 0; } diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index e07e5d3..186cd5a 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -777,6 +777,13 @@ #define PVR_MAJ(pvr) (((pvr) >> 4) & 0xF) /* Major revision field */ #define PVR_MIN(pvr) (((pvr) >> 0) & 0xF) /* Minor revision field */ +/* e600 core PVR fields */ + +#define PVR_E600_VER(pvr) (((pvr) >> 15) & 0xFFFF) /* Version/type */ +#define PVR_E600_TECH(pvr) (((pvr) >> 12) & 0xF) /* Technology */ +#define PVR_E600_MAJ(pvr) (((pvr) >> 8) & 0xF) /* Major revision */ +#define PVR_E600_MIN(pvr) (((pvr) >> 0) & 0xFF) /* Minor revision */ + /* Processor Version Numbers */ #define PVR_403GA 0x00200000 @@ -857,7 +864,6 @@ #define PVR_85xx_REV2 (PVR_85xx | 0x0020) #define PVR_86xx 0x80040000 -#define PVR_86xx_REV1 (PVR_86xx | 0x0010) #define PVR_VIRTEX5 0x7ff21912 -- 1.6.0.2.GIT

2 3

[U-Boot] [PATCH] 86xx: Update CPU info output on bootup
by Peter Tyser 06 Feb '09

06 Feb '09

- Update style of 86xx CPU information on boot to more closely match 85xx boards - Fix detection of 8641/8641D - Use strmhz() to display frequencies - Display L1 information - Display L2 cache size == Before == Freescale PowerPC CPU: Core: E600 Core 0, Version: 0.2, (0x80040202) System: Unknown, Version: 2.1, (0x80900121) Clocks: CPU:1066 MHz, MPX: 533 MHz, DDR: 266 MHz, LBC: 133 MHz L2: Enabled Board: X-ES XPedite5170 3U VPX SBC == After == CPU: 8641D, Version: 2.1, (0x80900121) Core: E600 Core 0, Version: 0.2, (0x80040202) Clock Configuration: CPU:1066.667 MHz, MPX:533.333 MHz DDR:266.667 MHz (533.333 MT/s data rate), LBC:133.333 MHz L1: D-cache 32 KB enabled I-cache 32 KB enabled L2: 512 KB enabled Board: X-ES XPedite5170 3U VPX SBC Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- cpu/mpc86xx/cpu.c | 80 +++++++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 36 deletions(-) diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index b2a107d..42436ba 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -50,19 +50,39 @@ checkcpu(void) uint pvr, svr; uint ver; uint major, minor; + char buf1[32], buf2[32]; volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; volatile ccsr_gur_t *gur = &immap->im_gur; - puts("Freescale PowerPC\n"); + svr = get_svr(); + ver = SVR_SOC_VER(svr); + major = SVR_MAJ(svr); + minor = SVR_MIN(svr); + + puts("CPU: "); + + switch (ver) { + case SVR_8641: + puts("8641"); + break; + case SVR_8641D: + puts("8641D"); + break; + case SVR_8610: + puts("8610"); + break; + default: + puts("Unknown"); + break; + } + printf(", Version: %d.%d, (0x%08x)\n", major, minor, svr); + puts("Core: "); pvr = get_pvr(); ver = PVR_VER(pvr); major = PVR_MAJ(pvr); minor = PVR_MIN(pvr); - puts("CPU:\n"); - puts(" Core: "); - switch (ver) { case PVR_VER(PVR_86xx): { @@ -79,48 +99,36 @@ checkcpu(void) } printf(", Version: %d.%d, (0x%08x)\n", major, minor, pvr); - svr = get_svr(); - ver = SVR_SOC_VER(svr); - major = SVR_MAJ(svr); - minor = SVR_MIN(svr); - - puts(" System: "); - switch (ver) { - case SVR_8641: - if (SVR_SUBVER(svr) == 1) { - puts("8641D"); - } else { - puts("8641"); - } - break; - case SVR_8610: - puts("8610"); - break; - default: - puts("Unknown"); - break; - } - printf(", Version: %d.%d, (0x%08x)\n", major, minor, svr); - get_sys_info(&sysinfo); - puts(" Clocks: "); - printf("CPU:%4lu MHz, ", sysinfo.freqProcessor / 1000000); - printf("MPX:%4lu MHz, ", sysinfo.freqSystemBus / 1000000); - printf("DDR:%4lu MHz, ", sysinfo.freqSystemBus / 2000000); + puts("Clock Configuration:\n"); + printf(" CPU:%-4s MHz, ", strmhz(buf1, sysinfo.freqProcessor)); + printf("MPX:%-4s MHz\n", strmhz(buf1, sysinfo.freqSystemBus)); + printf(" DDR:%-4s MHz (%s MT/s data rate), ", + strmhz(buf1, sysinfo.freqSystemBus / 2), + strmhz(buf2, sysinfo.freqSystemBus)); if (sysinfo.freqLocalBus > LCRR_CLKDIV) { - printf("LBC:%4lu MHz\n", sysinfo.freqLocalBus / 1000000); + printf("LBC:%-4s MHz\n", strmhz(buf1, sysinfo.freqLocalBus)); } else { printf("LBC: unknown (LCRR[CLKDIV] = 0x%02lx)\n", sysinfo.freqLocalBus); } - puts(" L2: "); - if (get_l2cr() & 0x80000000) - puts("Enabled\n"); - else + puts("L1: D-cache 32 KB enabled\n"); + puts(" I-cache 32 KB enabled\n"); + + puts("L2: "); + if (get_l2cr() & 0x80000000) { +#if defined(CONFIG_MPC8610) + puts("256"); +#elif defined(CONFIG_MPC8641) + puts("512"); +#endif + puts(" KB enabled\n"); + } else { puts("Disabled\n"); + } return 0; } -- 1.6.0.2.GIT

2 5

[U-Boot] [PATCH 1/1] Setup extra MIMC200 chip selects
by Mark Jackson 06 Feb '09

06 Feb '09

Added code to setup the extra Flash and FRAM chip selects as used on the MIMC200 board. Signed-off-by: Mark Jackson <mpfj(a)mimc.co.uk> --- cpu/at32ap/cpu.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/cpu/at32ap/cpu.c b/cpu/at32ap/cpu.c index 1a13702..3902efe 100644 --- a/cpu/at32ap/cpu.c +++ b/cpu/at32ap/cpu.c @@ -56,6 +56,20 @@ int cpu_init(void) hsmc3_writel(PULSE0, 0x0b0a0906); hsmc3_writel(SETUP0, 0x00010002); +#ifdef CONFIG_MIMC200 + /* setup Data Flash chip select (NCS2) */ + hsmc3_writel(MODE2, 0x20121003); + hsmc3_writel(CYCLE2, 0x000a0009); + hsmc3_writel(PULSE2, 0x0a060806); + hsmc3_writel(SETUP2, 0x00030102); + + /* setup FRAM chip select (NCS3) */ + hsmc3_writel(MODE3, 0x10120001); + hsmc3_writel(CYCLE3, 0x001e001d); + hsmc3_writel(PULSE3, 0x08040704); + hsmc3_writel(SETUP3, 0x02050204); +#endif + clk_init(); /* Update the CPU speed according to the PLL configuration */

2 2

[U-Boot] CONFIG_MP affects ability to erase upper portions of flash on 8572
by Scott Coulter 06 Feb '09

06 Feb '09

Hi everyone, I just wanted to share something that I discovered with our 8572-based board. The board's 4Mbyte flash is mapped starting at address 0xFFC00000. When moving to U-boot v2008-10, I discovered that I had lost the ability to erase the entire flash (in order to update the U-boot binary). After the erase operation, the flash device would contain the erased value, 0xFF, up to the address 0xFFFFF000 with non-FF data after that point. After some investigation, it appears that defining the macro CONFIG_MP was causing the issue. With CONFIG_MP not defined, the entire upper portion of flash could be verified as erased. My guess is that it has something to do with the start page for the secondary processor. Ultimately, the solution for me was to move the flash from 0xFFC00000 to 0xEFC00000 and all was well with CONFIG_MP defined. Scott ___________________________________________________________________ Scott N. Coulter Senior Software Engineer Cyclone Microsystems 370 James Street Phone: 203.786.5536 ext. 118 New Haven, CT 06513-3051 Email: scott.coulter(a)cyclone.com U.S.A. Web: http://www.cyclone.com ___________________________________________________________________

3 3