APM82xxx: Add bluestone board support
PATCH v2 2/2 APM82xxx: Add bluestone board support
From: Tirumala Marri <[email protected]>
Add support code for bluestone board wth APM82XXX processor based. This patch includes early board init, misc init, configure EBC, initializes UIC, MAKEALL, board.cfg and MAINTAINERS file.
---
V1:
* Remove "All rights reserved" phrase from headers.
* Add empty line which was removed.
* Move EBC definititions to bluestone_config.h file
* Remove reconfigure_EBC() function.
* Remove unused CONFIG_SDRAM16BIT_OFFSET.
* Remove unused CONFIG_SDRAM_INFO_EEPROM_ADDR.
* Add empty lines in bluestone.c file.
* Replacing AC_R | AC_W | AC_X with AC_RWX.
* Remove changes to main Makefile
* Remove NAND references from config file.
* Squash some of the patches.
V2:
* Missing space before "<".
* SDR_AHB_CFG not used, remove.
* boot device dfinitions are board specific ? removed.
* APM82161_MASK not used, remove
* set_mcsr() is already called in ddr init, no need to call here.
* removed finding bootdevice function which is not used.
* Add spaces in tlbentry() function.
* Board early init function is empty remove.
* Remove CONFIG_SYS_EXTSRAM_BASE.
* Set CONFIG_SYS_FLASH_SIZE to 4MB
* Remove CONFIG_SIZE_REDUCE & CONFIG_SECTOR_REDUCE.
* Spaces around " >> " .
* Correct the phy name CONFIG_M88E1111_PHY to CONFIG_RTL8211CL_PHY.
--- MAINTAINERS | 3 + MAKEALL | 1 + board/amcc/bluestone/Makefile | 52 ++++++++++++ board/amcc/bluestone/bluestone.c | 111 ++++++++++++++++++++++++ board/amcc/bluestone/config.mk | 40 +++++++++ board/amcc/bluestone/init.S | 55 ++++++++++++ boards.cfg | 1 + include/configs/bluestone.h | 171 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 434 insertions(+), 0 deletions(-)
MAINTAINERS +3 -0
@@ -253,6 +253,9 @@ Feng Kan <[email protected]> redwood PPC4xx +Tirumala Marri <[email protected]> + bluestone APM82XXX + Brad Kemp <[email protected]> ppmc8260 MPC8260
MAKEALL +1 -0
@@ -191,6 +191,7 @@ LIST_4xx=" \ ASH405 \ bamboo \ bamboo_nand \ + bluestone \ bubinga \ CANBT \ canyonlands \
board/amcc/bluestone/Makefile new file +52 -0
52 lines not on this page · raw message
board/amcc/bluestone/bluestone.c new file +111 -0
111 lines not on this page · raw message
board/amcc/bluestone/config.mk new file +40 -0
@@ -0,0 +1,40 @@ +# +# Copyright (c) 2010, Applied Micro Circuits Corporation +# Author: Tirumala R Marri <[email protected]> +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +# Applied Micro APM82XXX Evaluation board. +# + +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp + +ifndef TEXT_BASE +TEXT_BASE = 0xFFFA0000 +endif + +PLATFORM_CPPFLAGS += -DCONFIG_440=1 + +ifeq ($(debug),1) +PLATFORM_CPPFLAGS += -DDEBUG +endif + +ifeq ($(dbcr),1) +PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000 +endif
board/amcc/bluestone/init.S new file +55 -0
55 lines not on this page · raw message
boards.cfg +1 -0
@@ -196,6 +196,7 @@ redwood powerpc ppc4xx - amcc taihu powerpc ppc4xx - amcc taishan powerpc ppc4xx - amcc yucca powerpc ppc4xx - amcc +bluestone powerpc ppc4xx - amcc AP1000 powerpc ppc4xx ap1000 amirix CRAYL1 powerpc ppc4xx L1 cray ADCIOP powerpc ppc4xx adciop esd
include/configs/bluestone.h new file +171 -0
171 lines not on this page · raw message
Signature · 1 line
1.6.1.rc3
PATCH v2 2/2 APM82xxx: Add bluestone board support
Hi Marri,
Quoted 5 lines · On Thursday 02 September 2010 03:17:03 tmarri at apm.com wrote:
From: Tirumala Marri <[email protected]>
Add support code for bluestone board wth APM82XXX processor based. This patch includes early board init, misc init, configure EBC, initializes UIC, MAKEALL, board.cfg and
MAINTAINERSfile.
Look quite good. Still a few comments remaining below though.
<snip>
Quoted 49 lines
include/configs/bluestone.h new file +43
-0@@ -0,0 +1,171 @@ +/* +* bluestone.h - configuration for Blouestone (APM82XXX) +* +* Copyright (c) 2010, Applied Micro Circuits Corporation +* Author: Tirumala R Marri <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* +* High Level Configuration Options +*/ +#define CONFIG_APM82181 1/* Specific APM82XXX */ +#define CONFIG_APM82XXX 1/* APM82XXX series */ +#define CONFIG_HOSTNAME bluestone + +#define CONFIG_440 1 +#define CONFIG_4xx 1/* ... PPC4xx family */ + +/* +* Include common defines/options for all AMCC eval boards +*/ +#include "amcc-common.h" +#define CONFIG_SYS_CLK_FREQ 50000000 + +#define CONFIG_BOARD_TYPES 1/* support board types */ +#define CONFIG_BOARD_EARLY_INIT_F 1/* Call board_early_init_f */
include/configs/bluestone.h line 53
Quoted 10 lines
include/configs/bluestone.h new file +10
-0+#define CONFIG_MISC_INIT_R 1/* Call misc_init_r */ + +/* +* Base addresses -- Note these are effective addresses where the +* actual resources get mapped (not physical addresses) +*/ +/* EBC stuff */ +/* later mapped to this addr */ +#define CONFIG_SYS_FLASH_BASE 0xFFF00000 +#define CONFIG_SYS_FLASH_SIZE (4 << 20)/* 1MB usable
*/
include/configs/bluestone.h line 56
Quoted 3 lines
include/configs/bluestone.h new file +3
-0+ +/* EBC Boot Space: 0xFF000000 */ +#define CONFIG_SYS_BOOT_BASE_ADDR 0xFF000000
Hmm. This is not used anywhere in this port. I just noticed that you don't have a TLB entry for the boot-space (NOR?) in your init.S. Is this correct? Please explain how this works.
include/configs/bluestone.h
Quoted 4 lines
include/configs/bluestone.h new file +4
-0+#define CONFIG_SYS_OCM_BASE 0xE3000000/* OCM: 32k */ +#define CONFIG_SYS_SRAM_BASE 0xE8000000/* SRAM: 256k */ +#define CONFIG_SYS_PERIPHERAL_BASE 0xEF600000/* internal peripherals */ +#define CONFIG_SYS_AHB_BASE 0xE2000000/* internal AHB
peripherals*/
Quoted 8 lines
include/configs/bluestone.h new file +8
-0+ +/* +* Initial RAM & stack pointer (placed in OCM) +*/ +#define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_OCM_BASE/* OCM */ +#define CONFIG_SYS_INIT_RAM_END (4 << 10) +#define CONFIG_SYS_GBL_DATA_SIZE 256/* num bytes initial data */ +#define CONFIG_SYS_GBL_DATA_OFFSET \
include/configs/bluestone.h
Quoted 10 lines
include/configs/bluestone.h new file +10
-0+ (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET + +/* +* Environment +*/ +/* +* Define here the location of the environment variables (FLASH). +*/ +#define CONFIG_ENV_IS_IN_FLASH 1/* use FLASH for environment
vars */
Quoted 14 lines
include/configs/bluestone.h new file +14
-0+#define CONFIG_SYS_NOR_CS 0/* NOR chip connected to CSx */ + +/* +* FLASH related +*/ +#define CONFIG_SYS_FLASH_CFI /* The flash is CFI compatible */ +#define CONFIG_FLASH_CFI_DRIVER /* Use common CFI driver */ +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_8BIT +#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE} +/* max number of memory banks */ +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +/* max number of sectors on one chip */ +#define CONFIG_SYS_MAX_FLASH_SECT 80 +/* Timeout for Flash Erase (in ms) */
include/configs/bluestone.h
Quoted 10 lines
include/configs/bluestone.h new file +10
-0+#define CONFIG_SYS_FLASH_ERASE_TOUT 120000 +/* Timeout for Flash Write (in ms) */ +#define CONFIG_SYS_FLASH_WRITE_TOUT 500 +/* use buffered writes (20x faster) */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 +/* print 'E' for empty sector on flinfo */ +#define CONFIG_SYS_FLASH_EMPTY_INFO +#ifdef CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_SECT_SIZE 0x10000/* size of one complete sector */ +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE -
CONFIG_ENV_SECT_SIZE)
include/configs/bluestone.h line 103
Quoted 1 line
include/configs/bluestone.h new file +1
-0+#define CONFIG_ENV_SIZE 0x4000/* Total Size of Environment
Sector */
include/configs/bluestone.h line 105
Quoted 2 lines
include/configs/bluestone.h new file +2
-0+/* Address and size of Redundant Environment Sector */ +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR -
CONFIG_ENV_SECT_SIZE)
Quoted 12 lines
include/configs/bluestone.h new file +12
-0+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) +#endif /* CONFIG_ENV_IS_IN_FLASH */ + +/* NOR Flash */ +#define CONFIG_SYS_EBC_PB0AP (EBC_BXAP_BME_DISABLED | \ + EBC_BXAP_TWT_ENCODE(64) | \ + EBC_BXAP_BCE_DISABLE | \ + EBC_BXAP_BCT_2TRANS | \ + EBC_BXAP_CSN_ENCODE(1) | \ + EBC_BXAP_OEN_ENCODE(2) | \ + EBC_BXAP_WBN_ENCODE(2) | \ + EBC_BXAP_WBF_ENCODE(2) | \
include/configs/bluestone.h line 127
Quoted 10 lines
include/configs/bluestone.h new file +10
-0+ EBC_BXAP_TH_ENCODE(7) | \ + EBC_BXAP_SOR_DELAYED | \ + EBC_BXAP_BEM_WRITEONLY | \ + EBC_BXAP_PEN_DISABLED) +/* Peripheral Bank Configuration Register - EBC_BxCR */ +#define CONFIG_SYS_EBC_PB0CR \ + (EBC_BXCR_BAS_ENCODE(CONFIG_SYS_FLASH_BASE) | \ + EBC_BXCR_BS_1MB | \ + EBC_BXCR_BU_RW | \ + EBC_BXCR_BW_8BIT)
Move this down to the EBC section of this file.
Quoted 6 lines
include/configs/bluestone.h new file +4
-0+/* SDRAM */ +#define CONFIG_SPD_EEPROM 1/* Use SPD EEPROM for setup */ +#define SPD_EEPROM_ADDRESS {0x53, 0x51}/* SPD i2c spd addresses */ +#define CONFIG_PPC4xx_DDR_AUTOCALIBRATION/* IBM DDR autocalibration */ +#define
CONFIG_AUTOCALIB"silent\0" /* default is non-verbose
*/ +#defineCONFIG_DDR_ECC1 /* with ECC support
*/
include/configs/bluestone.h
Quoted 10 lines
include/configs/bluestone.h new file +10
-0+ +/* +* I2C +*/ +#define CONFIG_SYS_I2C_SPEED 400000/* I2C speed */ +#define CONFIG_SYS_I2C_MULTI_EEPROMS +#define CONFIG_SYS_I2C_EEPROM_ADDR (0xa8 >> 1) +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5/* Data sheet
*/
include/configs/bluestone.h line 157
Quoted 13 lines
include/configs/bluestone.h new file +13
-0+ +/* I2C bootstrap EEPROM */ +#define CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR 0x52 +#define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 +#define CONFIG_4xx_CONFIG_BLOCKSIZE 16 + +/* +* Ethernet +*/ +#define CONFIG_IBM_EMAC4_V4 1 +#define CONFIG_EMAC_PHY_MODE EMAC_PHY_MODE_NONE_RGMII +#define CONFIG_HAS_ETH0 +#define CONFIG_RTL8211CL_PHY
Not used, please remove.
include/configs/bluestone.h line 162
Quoted 5 lines
include/configs/bluestone.h new file +5
-0+/* PHY address, See schematics */ +#define CONFIG_PHY_ADDR 0x1f +/* reset phy upon startup */ +#define CONFIG_PHY_RESET 1 +#define CONFIG_PHY_RESET_R
Not used, please remove.
include/configs/bluestone.h line 169
Quoted 7 lines
include/configs/bluestone.h new file +7
-0+/* Include GbE speed/duplex detection */ +#define CONFIG_PHY_GIGE 1 +#define CONFIG_PHY_DYNAMIC_ANEG 1 +/* +* External Bus Controller (EBC) Setup +**/ +#define CONFIG_SYS_EBC_CFG 0xB8400000/* EBC0_CFG */
Move the other EBC register settings here please. And use macros to define CONFIG_SYS_EBC_CFG instead of this hard-coded value (see icon.h for example).
Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de
PATCH v2 2/2 APM82xxx: Add bluestone board support
In reply to tmarri at apm.comDear tmarri at apm.com,
Quoted 7 lines · In message <[email protected]> you wrote:
From: Tirumala Marri <[email protected]>
Add support code for bluestone board wth APM82XXX processor based. This patch includes early board init, misc init, configure EBC, initializes UIC, MAKEALL, board.cfg and
MAINTAINERSfile.Signed-off-by Tirumala R Marri <[email protected]>
...
MAINTAINERS Feng Kan <[email protected]> · line 259
Quoted 10 lines
MAINTAINERS +3
-0@@ -253,6 +253,9 @@ Feng Kan <[email protected]> redwood PPC4xx +Tirumala Marri <[email protected]> + bluestone APM82XXX + Brad Kemp <[email protected]>
Please keep list sorted.
MAINTAINERS Feng Kan <[email protected]>
Quoted 5 lines
MAINTAINERS +5
-0+int checkboard(void) +{ + char *s = getenv("serial#"); + + printf("Board: Bluestone Evaluation Board");
Use puts() if no formatting is needed.
Quoted 6 lines
MAINTAINERS +5
-0+ if (s != NULL) { + puts(", serial# "); + puts(s); + } + putc('\n');
MAINTAINERS
Quoted 10 lines
MAINTAINERS +10
-0+/************************************************************************** + * TLB TABLE + * + * This table is used by the cpu boot code to setup the initial tlb + * entries. Rather than make broad assumptions in the cpu source tree, + * this table lets each board set things up however they like. + * + * Pointer to the table is returned in r1 + * + *************************************************************************/
Incorrect multiline comment style.
...
Quoted 1 line
+#define
SPD_EEPROM_ADDRESS{0x53,0x51} /* SPD i2c spd addresses */
...
Quoted 1 line
+#define
CONFIG_SYS_I2C_EEPROM_ADDR(0xa8>> 1)
...
Quoted 1 line
+#define
CONFIG_4xx_CONFIG_I2C_EEPROM_ADDR0x52
For consistency with the other settings, please convert the "0xa8 >> 1" into 0x54.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de When all is said and done, more is said than done.