diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 873627f..1767f9e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -16,6 +16,7 @@ default 0x87f00000 if MACH_FREESCALE_MX35_3STACK default 0x87f00000 if MACH_PCM043 default 0xa7f00000 if MACH_PCA100 + default 0x23f00000 if MACH_MMCCPU config BOARDINFO default "Synertronixx scb9328" if MACH_SCB9328 @@ -29,6 +30,7 @@ default "Freescale MX35 3Stack" if MACH_FREESCALE_MX35_3STACK default "Phytec phyCORE-i.MX35" if MACH_PCM043 default "Phytec phyCard-i.MX27" if MACH_PCA100 + default "Bucyrus MMC-CPU" if MACH_MMCCPU config BOARD_LINKER_SCRIPT bool @@ -200,6 +202,12 @@ Say Y here if you are using Phytec's phyCard-i.MX27 (pca100) equipped with a Freescale i.MX27 Processor +config MACH_MMCCPU + bool "Bucyrus MMC-CPU" + select ARCH_AT91SAM9263 + help + Say y here if you are using the Bucyrus MMC-CPU + endchoice source arch/arm/mach-imx/Kconfig diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f0e7481..58ab93a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -21,6 +21,7 @@ board-$(CONFIG_MACH_FREESCALE_MX35_3STACK) := freescale-mx35-3-stack board-$(CONFIG_MACH_PCM043) := pcm043 board-$(CONFIG_MACH_PCA100) := phycard-i.MX27 +board-$(CONFIG_MACH_MMCCPU) := mmccpu # FIXME "cpu-y" never used on ARM! cpu-$(CONFIG_ARM920T) := arm920t diff --git a/arch/arm/configs/mmccpu_defconfig b/arch/arm/configs/mmccpu_defconfig new file mode 100644 index 0000000..44aff4c --- /dev/null +++ b/arch/arm/configs/mmccpu_defconfig @@ -0,0 +1,229 @@ +# +# Automatically generated make config: don't edit +# U-Boot version: 2.0.0-rc8 +# Tue May 19 09:44:44 2009 +# +CONFIG_ARCH_TEXT_BASE=0x23f00000 +CONFIG_BOARDINFO="Bucyrus MMC-CPU" +# CONFIG_BOARD_LINKER_SCRIPT is not set +CONFIG_GENERIC_LINKER_SCRIPT=y +CONFIG_ARM=y +CONFIG_ARM926EJS=y +CONFIG_ARCH_AT91SAM9=y +CONFIG_ARCH_AT91SAM9263=y +# CONFIG_MACH_MX1ADS is not set +# CONFIG_MACH_SCB9328 is not set +# CONFIG_MACH_PCM038 is not set +# CONFIG_MACH_IMX21ADS is not set +# CONFIG_MACH_IMX27ADS is not set +# CONFIG_MACH_PCM043 is not set +# CONFIG_MACH_FREESCALE_MX35_3STACK is not set +# CONFIG_MACH_ECO920 is not set +# CONFIG_MACH_NXDB500 is not set +# CONFIG_MACH_PCM037 is not set +# CONFIG_MACH_OMAP is not set +# CONFIG_MACH_AT91SAM9260_EK is not set +# CONFIG_MACH_PM9263 is not set +# CONFIG_MACH_PCA100 is not set +CONFIG_MACH_MMCCPU=y + +# +# Board specific settings +# + +# +# i.MX specific settings +# + +# +# Arm specific settings +# +CONFIG_CMD_ARM_CPUINFO=y +CONFIG_CMDLINE_TAG=y +CONFIG_SETUP_MEMORY_TAGS=y +# CONFIG_INITRD_TAG is not set +CONFIG_GREGORIAN_CALENDER=y +CONFIG_HAS_KALLSYMS=y +CONFIG_HAS_MODULES=y +CONFIG_CMD_MEMORY=y +CONFIG_ENV_HANDLING=y + +# +# General Settings +# +CONFIG_LOCALVERSION_AUTO=y + +# +# memory layout +# +CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y +CONFIG_TEXT_BASE=0x23f00000 +CONFIG_HAVE_CONFIGURABLE_MEMORY_LAYOUT=y +CONFIG_MEMORY_LAYOUT_DEFAULT=y +# CONFIG_MEMORY_LAYOUT_FIXED is not set +CONFIG_STACK_SIZE=0x8000 +CONFIG_MALLOC_SIZE=0x400000 +# CONFIG_BROKEN is not set +# CONFIG_EXPERIMENTAL is not set +CONFIG_MACH_HAS_LOWLEVEL_INIT=y +CONFIG_MACH_DO_LOWLEVEL_INIT=y +CONFIG_PROMPT="uboot:" +CONFIG_BAUDRATE=115200 +CONFIG_LONGHELP=y +CONFIG_CBSIZE=1024 +CONFIG_MAXARGS=16 +CONFIG_SHELL_HUSH=y +# CONFIG_SHELL_SIMPLE is not set +CONFIG_GLOB=y +CONFIG_PROMPT_HUSH_PS2="y" +CONFIG_CMDLINE_EDITING=y +CONFIG_AUTO_COMPLETE=y +CONFIG_DYNAMIC_CRC_TABLE=y +CONFIG_ERRNO_MESSAGES=y +CONFIG_TIMESTAMP=y +CONFIG_CONSOLE_FULL=y +CONFIG_CONSOLE_ACTIVATE_FIRST=y +# CONFIG_OF_FLAT_TREE is not set +CONFIG_PARTITION=y +CONFIG_DEFAULT_ENVIRONMENT=y +CONFIG_DEFAULT_ENVIRONMENT_PATH="board/mmccpu/env" + +# +# Debugging +# +# CONFIG_DEBUG_INFO is not set +# CONFIG_ENABLE_FLASH_NOISE is not set +# CONFIG_ENABLE_PARTITION_NOISE is not set +# CONFIG_ENABLE_DEVICE_NOISE is not set + +# +# Commands +# + +# +# scripting +# +CONFIG_CMD_EDIT=y +CONFIG_CMD_SLEEP=y +CONFIG_CMD_SAVEENV=y +CONFIG_CMD_LOADENV=y +CONFIG_CMD_EXPORT=y +CONFIG_CMD_PRINTENV=y +CONFIG_CMD_READLINE=y +CONFIG_CMD_TRUE=y +CONFIG_CMD_FALSE=y + +# +# file commands +# +CONFIG_CMD_LS=y +CONFIG_CMD_RM=y +CONFIG_CMD_CAT=y +CONFIG_CMD_MKDIR=y +CONFIG_CMD_RMDIR=y +CONFIG_CMD_CP=y +CONFIG_CMD_PWD=y +CONFIG_CMD_CD=y +CONFIG_CMD_MOUNT=y +CONFIG_CMD_UMOUNT=y + +# +# console +# +CONFIG_CMD_CLEAR=y +CONFIG_CMD_ECHO=y + +# +# memory +# +# CONFIG_CMD_LOADB is not set +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_CRC=y +CONFIG_CMD_MTEST=y +CONFIG_CMD_MTEST_ALTERNATIVE=y + +# +# flash +# +CONFIG_CMD_FLASH=y + +# +# i2c +# +CONFIG_CMD_I2C=y + +# +# booting +# +CONFIG_CMD_BOOTM=y +# CONFIG_CMD_BOOTM_ZLIB is not set +# CONFIG_CMD_BOOTM_BZLIB is not set +CONFIG_CMD_BOOTM_SHOW_TYPE=y +CONFIG_CMD_RESET=y +CONFIG_CMD_GO=y +CONFIG_CMD_TIMEOUT=y +CONFIG_CMD_PARTITION=y +CONFIG_CMD_TEST=y +CONFIG_CMD_VERSION=y +CONFIG_CMD_HELP=y +CONFIG_CMD_DEVINFO=y +CONFIG_NET=y +CONFIG_NET_BOOTP=y +CONFIG_NET_DHCP=y +# CONFIG_NET_RARP is not set +# CONFIG_NET_SNTP is not set +# CONFIG_NET_NFS is not set +CONFIG_NET_PING=y +CONFIG_NET_TFTP=y + +# +# Drivers +# + +# +# serial drivers +# +# CONFIG_DRIVER_SERIAL_NS16550 is not set +CONFIG_DRIVER_SERIAL_ATMEL=y +CONFIG_MIIPHY=y + +# +# Network drivers +# +# CONFIG_DRIVER_NET_SMC911X is not set +CONFIG_DRIVER_NET_MACB=y + +# +# SPI drivers +# +# CONFIG_SPI is not set + +# +# flash drivers +# +CONFIG_DRIVER_CFI=y +CONFIG_DRIVER_CFI_NEW=y +CONFIG_DRIVER_CFI_INTEL=y +CONFIG_DRIVER_CFI_AMD=y +CONFIG_DRIVER_CFI_BANK_WIDTH_1=y +CONFIG_DRIVER_CFI_BANK_WIDTH_2=y +CONFIG_DRIVER_CFI_BANK_WIDTH_4=y +# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set +CONFIG_CFI_BUFFER_WRITE=y +# CONFIG_NAND is not set +# CONFIG_USB is not set + +# +# I2C drivers +# +CONFIG_I2C=y +CONFIG_DRIVER_I2C_BITBANG=y + +# +# Filesystem support +# +# CONFIG_FS_CRAMFS is not set +CONFIG_FS_RAMFS=y +CONFIG_FS_DEVFS=y +CONFIG_CRC32=y +# CONFIG_GENERIC_FIND_NEXT_BIT is not set diff --git a/board/mmccpu/Makefile b/board/mmccpu/Makefile new file mode 100644 index 0000000..73ef72e --- /dev/null +++ b/board/mmccpu/Makefile @@ -0,0 +1,2 @@ +obj-y += lowlevel_init.o +obj-y += init.o diff --git a/board/mmccpu/config.h b/board/mmccpu/config.h new file mode 100644 index 0000000..2ff3020 --- /dev/null +++ b/board/mmccpu/config.h @@ -0,0 +1,6 @@ +#ifndef __CONFIG_H +#define __CONFIG_H + +#define AT91_MASTER_CLOCK 99532800 /* peripheral = main / 2 */ + +#endif /* __CONFIG_H */ diff --git a/board/mmccpu/env/bin/_update b/board/mmccpu/env/bin/_update new file mode 100644 index 0000000..fb7cbe8 --- /dev/null +++ b/board/mmccpu/env/bin/_update @@ -0,0 +1,36 @@ +#!/bin/sh + +if [ -z "$part" -o -z "$image" ]; then + echo "define \$part and \$image" + exit 1 +fi + +if [ \! -e "$part" ]; then + echo "Partition $part does not exist" + exit 1 +fi + +if [ $# = 1 ]; then + image=$1 +fi + +if [ x$ip = xdhcp ]; then + dhcp +fi + +ping $eth0.serverip +if [ $? -ne 0 ] ; then + echo "update aborted" + exit 1 +fi + +unprotect $part + +echo +echo "erasing partition $part" +erase $part + +echo +echo "flashing $image to $part" +echo +tftp $image $part diff --git a/board/mmccpu/env/bin/boot b/board/mmccpu/env/bin/boot new file mode 100644 index 0000000..533dea7 --- /dev/null +++ b/board/mmccpu/env/bin/boot @@ -0,0 +1,47 @@ +#!/bin/sh + +. /env/config + +if [ x$1 = xnand ]; then + root=nand + kernel=nand +fi + +if [ x$1 = xnet ]; then + root=net + kernel=net +fi + +if [ x$1 = xnor ]; then + root=nor + kernel=nor +fi + +if [ x$ip = xdhcp ]; then + bootargs="$bootargs ip=dhcp" +else + bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::" +fi + +if [ x$root = xnand ]; then + bootargs="$bootargs root=$rootpart_nand rootfstype=jffs2" +elif [ x$root = xnor ]; then + bootargs="$bootargs root=$rootpart_nor rootfstype=jffs2" +else + bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp" +fi + +bootargs="$bootargs mtdparts=physmap-flash.0:$nor_parts" + +if [ $kernel = net ]; then + if [ x$ip = xdhcp ]; then + dhcp + fi + tftp $uimage uImage || exit 1 + bootm uImage +elif [ $kernel = nor ]; then + bootm /dev/nor0.kernel +else + bootm /dev/nand0.kernel.bb +fi + diff --git a/board/mmccpu/env/bin/hush_hack b/board/mmccpu/env/bin/hush_hack new file mode 100644 index 0000000..5fffa92 --- /dev/null +++ b/board/mmccpu/env/bin/hush_hack @@ -0,0 +1 @@ +nand -a /dev/nand0.* diff --git a/board/mmccpu/env/bin/init b/board/mmccpu/env/bin/init new file mode 100644 index 0000000..ac84bd5 --- /dev/null +++ b/board/mmccpu/env/bin/init @@ -0,0 +1,37 @@ +#!/bin/sh + +PATH=/env/bin +export PATH + +. /env/config +if [ -e /dev/nor0 ]; then + addpart /dev/nor0 $nor_parts +fi + +if [ -e /dev/nand0 ]; then + addpart /dev/nand0 $nand_parts + + # Uh, oh, hush first expands wildcards and then starts executing + # commands. What a bug! + source /env/bin/hush_hack +fi + +if [ -z $eth0.ethaddr ]; then + while [ -z $eth0.ethaddr ]; do + readline "no MAC address set for eth0. please enter the one found on your board: " eth0.ethaddr + done + echo -a /env/config "eth0.ethaddr=$eth0.ethaddr" +fi + +echo +echo -n "Hit any key to stop autoboot: " +timeout -a $autoboot_timeout +if [ $? != 0 ]; then + echo + echo "type update_kernel nor [] to update kernel into flash" + echo "type update_root nor [] to update rootfs into flash" + echo + exit +fi + +boot diff --git a/board/mmccpu/env/bin/update_kernel b/board/mmccpu/env/bin/update_kernel new file mode 100644 index 0000000..05c822d --- /dev/null +++ b/board/mmccpu/env/bin/update_kernel @@ -0,0 +1,15 @@ +#!/bin/sh + +. /env/config + +image=$uimage +if [ x$1 = xnand ]; then + part=/dev/nand0.kernel.bb +elif [ x$1 = xnor ]; then + part=/dev/nor0.kernel +else + echo "usage: $0 nor|nand [imagename]" + exit 1 +fi + +. /env/bin/_update $2 diff --git a/board/mmccpu/env/bin/update_root b/board/mmccpu/env/bin/update_root new file mode 100644 index 0000000..a751372 --- /dev/null +++ b/board/mmccpu/env/bin/update_root @@ -0,0 +1,16 @@ +#!/bin/sh + +. /env/config + +image=$jffs2 +if [ x$1 = xnand ]; then + part=/dev/nand0.root.bb +elif [ x$1 = xnor ]; then + part=/dev/nor0.root +else + echo "usage: $0 nor|nand [imagename]" + exit 1 +fi + +. /env/bin/_update $2 + diff --git a/board/mmccpu/env/config b/board/mmccpu/env/config new file mode 100644 index 0000000..de92684 --- /dev/null +++ b/board/mmccpu/env/config @@ -0,0 +1,30 @@ +#!/bin/sh + +# can be either 'net', 'nor' or 'nand'' +kernel=nor +root=nor + +uimage=uImage-mmccpu +jffs2=root-mmccpu.jffs2 + +autoboot_timeout=3 + +nfsroot="/home/kschwinne/src/pengutronix/OSELAS.BSP-Bucyrus-Grabowski-trunk/platform-Bucyrus-mmccpu/root" + +bootargs="console=ttyS0,115200 mmccpu=p299" + +#nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),-(root)" +nor_parts="256k(uboot)ro,128k(ubootenv),1536k(kernel),10240k(root),10240k(rootbu),-(data)" +rootpart_nor="/dev/mtdblock3" + +#nand_parts="256k(uboot)ro,64k(ubootenv),1536k(kernel),-(root)" +#rootpart_nand="/dev/mtdblock7" + +# use 'dhcp' to do dhcp in uboot and in kernel +ip=dhcp + +# or set your networking parameters here +#eth0.ipaddr=a.b.c.d +#eth0.netmask=a.b.c.d +#eth0.gateway=a.b.c.d +#eth0.serverip=a.b.c.d diff --git a/board/mmccpu/init.c b/board/mmccpu/init.c new file mode 100644 index 0000000..d8f9a5d --- /dev/null +++ b/board/mmccpu/init.c @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2007 Sascha Hauer, Pengutronix + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static struct device_d sdram_dev = { + .name = "ram", + .id = "ram0", + + .map_base = 0x20000000, + .size = 128 * 1024 * 1024, + + .type = DEVICE_TYPE_DRAM, +}; + +static struct device_d cfi_dev = { + .name = "cfi_flash", + .id = "nor0", + + .map_base = 0x10000000, + .size = 0, /* zero means autodetect size */ +}; + +static struct at91sam_ether_platform_data macb_pdata = { + .flags = AT91SAM_ETHER_MII | AT91SAM_ETHER_FORCE_LINK, + .phy_addr = 4, +}; + +static struct device_d macb_dev = { + .name = "macb", + .id = "eth0", + .map_base = AT91C_BASE_MACB, + .size = 0x1000, + .type = DEVICE_TYPE_ETHER, + .platform_data = &macb_pdata, +}; + +static int mmccpu_devices_init(void) +{ + u32 pe = AT91C_PC25_ERXDV | + AT91C_PC22_ERX2 | + AT91C_PC23_ERX3 | + AT91C_PC20_ETX2 | + AT91C_PC21_ETX3; + + writel(pe, AT91C_BASE_PIOC + PIO_BSR(0)); + writel(pe, AT91C_BASE_PIOC + PIO_PDR(0)); + + pe = AT91C_PE21_ETXCK | + AT91C_PE23_ETX0 | + AT91C_PE24_ETX1 | + AT91C_PE25_ERX0 | + AT91C_PE26_ERX1 | + AT91C_PE27_ERXER | + AT91C_PE28_ETXEN | + AT91C_PE29_EMDC | + AT91C_PE30_EMDIO; + + writel(pe, AT91C_BASE_PIOE + PIO_ASR(0)); + writel(pe, AT91C_BASE_PIOE + PIO_PDR(0)); + + /* set PB27 to '1', enable 50MHz oscillator */ + writel(AT91C_PIO_PB27, AT91C_BASE_PIOB + PIO_PER(0)); + writel(AT91C_PIO_PB27, AT91C_BASE_PIOB + PIO_OER(0)); + writel(AT91C_PIO_PB27, AT91C_BASE_PIOB + PIO_SODR(0)); + + /* set PB4, PB5 to '1', enable 50MHz oscillator */ + writel(AT91C_PIO_PB4|AT91C_PIO_PB5, AT91C_BASE_PIOB + PIO_PER(0)); + writel(AT91C_PIO_PB4|AT91C_PIO_PB5, AT91C_BASE_PIOB + PIO_OER(0)); + writel(AT91C_PIO_PB4|AT91C_PIO_PB5, AT91C_BASE_PIOB + PIO_SODR(0)); + + writel(1 << AT91C_ID_EMAC, AT91C_PMC_PCER); + + register_device(&sdram_dev); + register_device(&macb_dev); + register_device(&cfi_dev); + + dev_add_partition(&cfi_dev, 0x00000, 256 * 1024, PARTITION_FIXED, "self"); + dev_add_partition(&cfi_dev, 0x40000, 128 * 1024, PARTITION_FIXED, "env"); + + armlinux_set_bootparams((void *)0x20000100); + armlinux_set_architecture(MACH_TYPE_MMCCPU); + + return 0; +} + +device_initcall(mmccpu_devices_init); + +static struct device_d mmccpu_serial_device = { + .name = "atmel_serial", + .id = "cs0", + .map_base = AT91C_BASE_DBGU, + .size = 4096, + .type = DEVICE_TYPE_CONSOLE, +}; + +static int mmccpu_console_init(void) +{ + writel(AT91C_PC31_DTXD | AT91C_PC30_DRXD, AT91C_PIOC_PDR); + + register_device(&mmccpu_serial_device); + return 0; +} + +console_initcall(mmccpu_console_init); diff --git a/board/mmccpu/lowlevel_init.S b/board/mmccpu/lowlevel_init.S new file mode 100644 index 0000000..4706a92 --- /dev/null +++ b/board/mmccpu/lowlevel_init.S @@ -0,0 +1,329 @@ +/* + * Board specific setup info + * + * 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 + +#define SDRAM 0x20000000 /* address of the SDRAM */ + +/* values */ +#define MASTER_PLL_MUL 54 +#define MASTER_PLL_DIV 4 + +/* clocks */ +#define MOR_VAL 0x00002001 /* CKGR_MOR - enable main osc. */ +#define PLLAR_VAL (0x2000BF00 | ((MASTER_PLL_MUL - 1)<< 16) | MASTER_PLL_DIV) +#define PLLBR_VAL 0x10483E0E /* 48.054857 MHz for USB) */ + +#define MCKR1_VAL 0x00000100 /* slowclock */ +#define MCKR2_VAL 0x00000102 /* PCK/2 = MCK Master Clock from PLLA */ + +#define WDTC_WDMR_VAL 0x3fff8fff /* disable watchdog */ +#define PIOD_PDR_VAL1 0xFFFF0000 /* define PDC[31:16] as DATA[31:16] */ +#define PIOD_PPUDR_VAL 0xFFFF0000 /* no pull-up for D[31:16] */ +#define MATRIX_EBI0CSA_VAL 0x0000010A /* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 1.8V memories */ +#define MATRIX_EBI1CSA_VAL 0x00010100 /* EBI1_CSA, 3.3v, no pull-ups */ + +/* SDRAM */ +#define SDRC_MR_VAL1 0 /* SDRAMC_MR Mode register */ +#define SDRC_TR_VAL1 0x13c /* SDRAMC_TR - Refresh Timer register */ +#define SDRC_CR_VAL 0xc533827a /* SDRAMC_CR - Configuration register */ +#define SDRC_MDR_VAL 0 /* Memory Device Register -> SDRAM */ +#define SDRC_MR_VAL2 0x00000002 /* SDRAMC_MR */ +#define SDRAM_VAL1 0 /* SDRAM_BASE */ +#define SDRC_MR_VAL3 4 /* SDRC_MR */ +#define SDRAM_VAL2 0 /* SDRAM_BASE */ +#define SDRAM_VAL3 0 /* SDRAM_BASE */ +#define SDRAM_VAL4 0 /* SDRAM_BASE */ +#define SDRAM_VAL5 0 /* SDRAM_BASE */ +#define SDRAM_VAL6 0 /* SDRAM_BASE */ +#define SDRAM_VAL7 0 /* SDRAM_BASE */ +#define SDRAM_VAL8 0 /* SDRAM_BASE */ +#define SDRAM_VAL9 0 /* SDRAM_BASE */ +#define SDRC_MR_VAL4 3 /* SDRC_MR */ +#define SDRAM_VAL10 0 /* SDRAM_BASE */ +#define SDRC_MR_VAL5 0 /* SDRC_MR */ +#define SDRAM_VAL11 0 /* SDRAM_BASE */ +#define SDRC_TR_VAL2 0x30c /* SDRAM_TR */ +#define SDRAM_VAL12 0 /* SDRAM_BASE */ + +/* setup CS0 (NOR Flash) - 16-bit */ +#if 1 +#define SMC0_SETUP0_VAL 0x00080203 /* SMC_SETUP */ +#define SMC0_PULSE0_VAL 0x0d050705 /* SMC_PULSE */ +#define SMC0_CYCLE0_VAL 0x00100010 /* SMC_CYCLE */ +#define SMC0_CTRL0_VAL 0x00161003 /* SMC_MODE */ +#elif 0 /* slow setup */ +#define SMC0_SETUP0_VAL 0x00080203 /* SMC_SETUP */ +#define SMC0_PULSE0_VAL 0x0d050705 /* SMC_PULSE */ +#define SMC0_CYCLE0_VAL 0x0d000d00 /* SMC_CYCLE */ +#define SMC0_CTRL0_VAL 0x00111003 /* SMC_MODE */ +#else /* RONETIX' original values */ +#define SMC0_SETUP0_VAL 0x0A0A0A0A /* SMC_SETUP */ +#define SMC0_PULSE0_VAL 0x0B0B0B0B /* SMC_PULSE */ +#define SMC0_CYCLE0_VAL 0x00160016 /* SMC_CYCLE */ +#define SMC0_CTRL0_VAL 0x00161003 /* SMC_MODE */ +#endif + + +#define RSTC_RMR_VAL 0xA5000301 /* user reset enable */ + + +_TEXT_BASE: + .word TEXT_BASE + +.globl board_init_lowlevel +board_init_lowlevel: + + mov r5, pc // r5 = POS1 + 4 current +POS1: + ldr r0, =POS1 // r0 = POS1 compile + ldr r2, _TEXT_BASE + sub r0, r0, r2 // r0 = POS1-_TEXT_BASE (POS1 relative) + sub r5, r5, r0 // r0 = TEXT_BASE-1 + sub r5, r5, #4 // r1 = text base - current + + /* memory control configuration 1 */ + ldr r0, =SMRDATA + ldr r2, =SMRDATA1 + ldr r1, _TEXT_BASE + sub r0, r0, r1 + sub r2, r2, r1 + add r0, r0, r5 + add r2, r2, r5 +0: + /* the address */ + ldr r1, [r0], #4 + /* the value */ + ldr r3, [r0], #4 + str r3, [r1] + cmp r2, r0 + bne 0b + +/*----------------------------------------------------------------------------- +;PMC Init Step 1. +;------------------------------------------------------------------------------ +;- Enable the Main Oscillator +;----------------------------------------------------------------------------*/ + /* Test if main oscillator is enabled */ + ldr r0,=AT91C_PMC_SR + ldr r1, [r0] + ldr r2,=AT91C_PMC_MOSCS + ands r1, r1, r2 + + ldr r1, =AT91C_CKGR_MOR + + /* Main oscillator Enable register PMC_MOR: */ + /* Enable main oscillator, OSCOUNT = 0xFF */ + ldr r0, =0x0000FF01 + str r0, [r1] + + /* Reading the PMC Status register to detect when the */ + /* Main Oscillator is enabled */ + mov r4, #AT91C_PMC_MOSCS + ldr r0,=AT91C_PMC_SR +MOSCS_Loop: + ldr r3, [r0] + and r3, r4, r3 + cmp r3, #AT91C_PMC_MOSCS + bne MOSCS_Loop + + +/*----------------------------------------------------------------------------- +;PMC Init Step 2. +;------------------------------------------------------------------------------ +;- Setup PLLA +;----------------------------------------------------------------------------*/ + ldr r1, =AT91C_CKGR_PLLAR + /* (18.432 MHz / 1) * 13 = 239 MHz */ + ldr r0, =PLLAR_VAL + str r0, [r1] + + /* Reading the PMC Status register to detect */ + /* when the PLLA is locked */ + mov r4, #AT91C_PMC_LOCKA + ldr r0,=AT91C_PMC_SR +MOSCS_Loop1: + ldr r3, [r0] + and r3, r4, r3 + cmp r3, #AT91C_PMC_LOCKA + bne MOSCS_Loop1 + + +/*----------------------------------------------------------------------------- +;PMC Init Step 3. +;------------------------------------------------------------------------------ +;- Switch on the Main Oscillator 18.432 MHz +;----------------------------------------------------------------------------*/ +Init_MCKR: + + /* -Master Clock Controller register PMC_MCKR */ + ldr r0, =MCKR1_VAL + ldr r1, =AT91C_PMC_MCKR + str r0, [r1] + + /* Reading the PMC Status register to detect */ + /* when the Master clock is ready */ + mov r4, #AT91C_PMC_MCKRDY +MCKRDY_Loop: + ldr r1, =AT91C_PMC_SR + ldr r3, [r1] + and r3, r4, r3 + cmp r3, #AT91C_PMC_MCKRDY + bne MCKRDY_Loop + + ldr r0, =MCKR2_VAL + ldr r1, =AT91C_PMC_MCKR + str r0, [r1] + + /* Reading the PMC Status register to detect */ + /* when the Master clock is ready */ + mov r4, #AT91C_PMC_MCKRDY +MCKRDY_Loop1: + ldr r1, =AT91C_PMC_SR + ldr r3, [r1] + and r3, r4, r3 + cmp r3, #AT91C_PMC_MCKRDY + bne MCKRDY_Loop1 + +/*----------------------------------------------------------------------------- +;PMC Init Step 4. +;------------------------------------------------------------------------------ +;- Setup PLLB +;----------------------------------------------------------------------------*/ + ldr r1, = AT91C_PMC_PLLBR + + /* 48.054857 MHz = 18432000 * 72 / 14 / 2 for USB) */ + ldr r0, =PLLBR_VAL + str r0, [r1] + + /* Reading the PMC Status register to detect */ + /* when the PLLB is locked */ + mov r4, #AT91C_PMC_LOCKB +MOSCS_Loop2: + ldr r1, = AT91C_PMC_SR + ldr r3, [r1] + and r3, r4, r3 + cmp r3, #AT91C_PMC_LOCKB + bne MOSCS_Loop2 + + /* memory control configuration 2 */ + ldr r0, =SMRDATA1 + ldr r2, =SMRDATA2 + ldr r1, _TEXT_BASE + sub r0, r0, r1 + sub r2, r2, r1 + add r0, r0, r5 + add r2, r2, r5 + +2: + /* the address */ + ldr r1, [r0], #4 + /* the value */ + ldr r3, [r0], #4 + str r3, [r1] + cmp r2, r0 + bne 2b + + /* everything is fine now */ + mov pc, lr + + .ltorg + +SMRDATA: + .word AT91C_WDTC_WDMR + .word WDTC_WDMR_VAL + .word AT91C_PIOD_PDR + .word PIOD_PDR_VAL1 + .word AT91C_PIOD_PPUDR + .word PIOD_PPUDR_VAL + .word AT91C_PIOD_ASR + .word PIOD_PPUDR_VAL + + .word AT91C_CCFG_EBI0CSA + .word MATRIX_EBI0CSA_VAL + .word AT91C_CCFG_EBI1CSA + .word MATRIX_EBI1CSA_VAL + + /* flash */ + .word AT91C_SMC0_CTRL0 + .word SMC0_CTRL0_VAL + + .word AT91C_SMC0_CYCLE0 + .word SMC0_CYCLE0_VAL + + .word AT91C_SMC0_PULSE0 + .word SMC0_PULSE0_VAL + + .word AT91C_SMC0_SETUP0 + .word SMC0_SETUP0_VAL + +SMRDATA1: + + .word AT91C_SDRAMC0_MR + .word SDRC_MR_VAL1 + .word AT91C_SDRAMC0_TR + .word SDRC_TR_VAL1 + .word AT91C_SDRAMC0_CR + .word SDRC_CR_VAL + .word AT91C_SDRAMC0_MDR + .word SDRC_MDR_VAL + .word AT91C_SDRAMC0_MR + .word SDRC_MR_VAL2 + .word SDRAM + .word SDRAM_VAL1 + .word AT91C_SDRAMC0_MR + .word SDRC_MR_VAL3 + .word SDRAM + .word SDRAM_VAL2 + .word SDRAM + .word SDRAM_VAL3 + .word SDRAM + .word SDRAM_VAL4 + .word SDRAM + .word SDRAM_VAL5 + .word SDRAM + .word SDRAM_VAL6 + .word SDRAM + .word SDRAM_VAL7 + .word SDRAM + .word SDRAM_VAL8 + .word SDRAM + .word SDRAM_VAL9 + .word AT91C_SDRAMC0_MR + .word SDRC_MR_VAL4 + .word SDRAM + .word SDRAM_VAL10 + .word AT91C_SDRAMC0_MR + .word SDRC_MR_VAL5 + .word SDRAM + .word SDRAM_VAL11 + .word AT91C_SDRAMC0_TR + .word SDRC_TR_VAL2 + .word SDRAM + .word SDRAM_VAL12 + /* User reset enable */ + .word AT91C_RSTC_RMR + .word RSTC_RMR_VAL + /* MATRIX_MCFG - REMAP all masters */ + +SMRDATA2: + .word 0 diff --git a/drivers/net/miiphy.c b/drivers/net/miiphy.c index 43d37f5..ccb274b 100644 --- a/drivers/net/miiphy.c +++ b/drivers/net/miiphy.c @@ -199,6 +199,7 @@ .close = dev_close_default, .read = miiphy_read, .write = miiphy_write, + .lseek = dev_lseek_default, .type = DEVICE_TYPE_MIIPHY, }; diff --git a/include/miiphy.h b/include/miiphy.h index 550b6d0..23373e9 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -22,7 +22,7 @@ #define MII_EXPANSION 0x06 /* Expansion register */ #define MII_CTRL1000 0x09 /* 1000BASE-T control */ #define MII_STAT1000 0x0a /* 1000BASE-T status */ -#define MII_ESTATUS 0x0f /* Extended Status */ +#define MII_ESTATUS 0x0f /* Extended Status */ #define MII_DCOUNTER 0x12 /* Disconnect counter */ #define MII_FCSCOUNTER 0x13 /* False carrier counter */ #define MII_NWAYTEST 0x14 /* N-way auto-neg test reg */ @@ -56,9 +56,9 @@ #define BMSR_RFAULT 0x0010 /* Remote fault detected */ #define BMSR_ANEGCOMPLETE 0x0020 /* Auto-negotiation complete */ #define BMSR_RESV 0x00c0 /* Unused... */ -#define BMSR_ESTATEN 0x0100 /* Extended Status in R15 */ -#define BMSR_100HALF2 0x0200 /* Can do 100BASE-T2 HDX */ -#define BMSR_100FULL2 0x0400 /* Can do 100BASE-T2 FDX */ +#define BMSR_ESTATEN 0x0100 /* Extended Status in R15 */ +#define BMSR_100HALF2 0x0200 /* Can do 100BASE-T2 HDX */ +#define BMSR_100FULL2 0x0400 /* Can do 100BASE-T2 FDX */ #define BMSR_10HALF 0x0800 /* Can do 10mbps, half-duplex */ #define BMSR_10FULL 0x1000 /* Can do 10mbps, full-duplex */ #define BMSR_100HALF 0x2000 /* Can do 100mbps, half-duplex */