mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
overo: add SPL support
* implementation based on ti beagleboard/omap3evm * timing data and i2c workaround for revision 0 boards taken from x-loader * run-tested with overo revision 0 and 1 / boot from NAND and SDcard * run-tested with x-loader Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Andreas Müller
Albert ARIBAUD
parent
761ca31e47
commit
137703b811
5 changed files with 147 additions and 29 deletions
|
|
@ -123,6 +123,32 @@ enum {
|
|||
V_MCFG_BANKALLOCATION_RBC | \
|
||||
V_MCFG_B32NOT16_32 | V_MCFG_DEEPPD_EN | V_MCFG_RAMTYPE_DDR
|
||||
|
||||
/* Hynix part of Overo (165MHz optimized) 6.06ns */
|
||||
#define HYNIX_TDAL_165 6
|
||||
#define HYNIX_TDPL_165 3
|
||||
#define HYNIX_TRRD_165 2
|
||||
#define HYNIX_TRCD_165 3
|
||||
#define HYNIX_TRP_165 3
|
||||
#define HYNIX_TRAS_165 7
|
||||
#define HYNIX_TRC_165 10
|
||||
#define HYNIX_TRFC_165 21
|
||||
#define HYNIX_V_ACTIMA_165 \
|
||||
ACTIM_CTRLA(HYNIX_TRFC_165, HYNIX_TRC_165, \
|
||||
HYNIX_TRAS_165, HYNIX_TRP_165, \
|
||||
HYNIX_TRCD_165, HYNIX_TRRD_165, \
|
||||
HYNIX_TDPL_165, HYNIX_TDAL_165)
|
||||
|
||||
#define HYNIX_TWTR_165 1
|
||||
#define HYNIX_TCKE_165 1
|
||||
#define HYNIX_TXP_165 2
|
||||
#define HYNIX_XSR_165 24
|
||||
#define HYNIX_V_ACTIMB_165 \
|
||||
ACTIM_CTRLB(HYNIX_TWTR_165, HYNIX_TCKE_165, \
|
||||
HYNIX_TXP_165, HYNIX_XSR_165)
|
||||
|
||||
#define HYNIX_RASWIDTH_165 0x2
|
||||
#define HYNIX_V_MCFG_165(size) MCFG((size), HYNIX_RASWIDTH_165)
|
||||
|
||||
/* Hynix part of AM/DM37xEVM (200MHz optimized) */
|
||||
#define HYNIX_TDAL_200 6
|
||||
#define HYNIX_TDPL_200 3
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
#
|
||||
# Overo uses OMAP3 (ARM-CortexA8) cpu
|
||||
#
|
||||
# See file CREDITS for list of people who contributed to this
|
||||
# project.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation; either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
# MA 02111-1307 USA
|
||||
#
|
||||
# Physical Address:
|
||||
# 8000'0000 (bank0)
|
||||
# A000/0000 (bank1)
|
||||
# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
|
||||
# (mem base + reserved)
|
||||
|
||||
CONFIG_SYS_TEXT_BASE = 0x80008000
|
||||
|
|
@ -31,6 +31,7 @@
|
|||
#include <common.h>
|
||||
#include <netdev.h>
|
||||
#include <twl4030.h>
|
||||
#include <linux/mtd/nand.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/mmc_host_def.h>
|
||||
#include <asm/arch/mux.h>
|
||||
|
|
@ -99,6 +100,16 @@ int board_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Routine: omap_rev_string
|
||||
* Description: For SPL builds output board rev
|
||||
*/
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
void omap_rev_string(void)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Routine: get_board_revision
|
||||
* Description: Returns the board revision
|
||||
|
|
@ -107,6 +118,20 @@ int get_board_revision(void)
|
|||
{
|
||||
int revision;
|
||||
|
||||
#ifdef CONFIG_DRIVER_OMAP34XX_I2C
|
||||
unsigned char data;
|
||||
|
||||
/* board revisions <= R2410 connect 4030 irq_1 to gpio112 */
|
||||
/* these boards should return a revision number of 0 */
|
||||
/* the code below forces a 4030 RTC irq to ensure that gpio112 is low */
|
||||
i2c_set_bus_num(TWL4030_I2C_BUS);
|
||||
data = 0x01;
|
||||
i2c_write(0x4B, 0x29, 1, &data, 1);
|
||||
data = 0x0c;
|
||||
i2c_write(0x4B, 0x2b, 1, &data, 1);
|
||||
i2c_read(0x4B, 0x2a, 1, &data, 1);
|
||||
#endif
|
||||
|
||||
if (!gpio_request(112, "") &&
|
||||
!gpio_request(113, "") &&
|
||||
!gpio_request(115, "")) {
|
||||
|
|
@ -126,6 +151,44 @@ int get_board_revision(void)
|
|||
return revision;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
/*
|
||||
* Routine: get_board_mem_timings
|
||||
* Description: If we use SPL then there is no x-loader nor config header
|
||||
* so we have to setup the DDR timings ourself on both banks.
|
||||
*/
|
||||
void get_board_mem_timings(u32 *mcfg, u32 *ctrla, u32 *ctrlb, u32 *rfr_ctrl,
|
||||
u32 *mr)
|
||||
{
|
||||
*mr = MICRON_V_MR_165;
|
||||
switch (get_board_revision()) {
|
||||
case REVISION_0: /* Micron 1286MB/256MB, 1/2 banks of 128MB */
|
||||
*mcfg = MICRON_V_MCFG_165(128 << 20);
|
||||
*ctrla = MICRON_V_ACTIMA_165;
|
||||
*ctrlb = MICRON_V_ACTIMB_165;
|
||||
*rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz;
|
||||
break;
|
||||
case REVISION_1: /* Micron 256MB/512MB, 1/2 banks of 256MB */
|
||||
*mcfg = MICRON_V_MCFG_165(256 << 20);
|
||||
*ctrla = MICRON_V_ACTIMA_165;
|
||||
*ctrlb = MICRON_V_ACTIMB_165;
|
||||
*rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz;
|
||||
break;
|
||||
case REVISION_2: /* Hynix 256MB/512MB, 1/2 banks of 256MB */
|
||||
*mcfg = HYNIX_V_MCFG_165(256 << 20);
|
||||
*ctrla = HYNIX_V_ACTIMA_165;
|
||||
*ctrlb = HYNIX_V_ACTIMB_165;
|
||||
*rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz;
|
||||
break;
|
||||
default:
|
||||
*mcfg = MICRON_V_MCFG_165(128 << 20);
|
||||
*ctrla = MICRON_V_ACTIMA_165;
|
||||
*ctrlb = MICRON_V_ACTIMB_165;
|
||||
*rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Routine: get_sdio2_config
|
||||
* Description: Return information about the wifi module connection
|
||||
|
|
@ -337,7 +400,7 @@ int board_eth_init(bd_t *bis)
|
|||
return rc;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_GENERIC_MMC
|
||||
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
|
||||
int board_mmc_init(bd_t *bis)
|
||||
{
|
||||
omap_mmc_init(0);
|
||||
|
|
|
|||
|
|
@ -33,6 +33,11 @@ const omap3_sysinfo sysinfo = {
|
|||
#endif
|
||||
};
|
||||
|
||||
/* overo revisions */
|
||||
#define REVISION_0 0x0
|
||||
#define REVISION_1 0x1
|
||||
#define REVISION_2 0x2
|
||||
|
||||
/*
|
||||
* IEN - Input Enable
|
||||
* IDIS - Input Disable
|
||||
|
|
|
|||
|
|
@ -285,6 +285,11 @@
|
|||
|
||||
#endif /* (CONFIG_CMD_NET) */
|
||||
|
||||
/*
|
||||
* Leave it at 0x80008000 to allow booting new u-boot.bin with X-loader
|
||||
* and older u-boot.bin with the new U-Boot SPL.
|
||||
*/
|
||||
#define CONFIG_SYS_TEXT_BASE 0x80008000
|
||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
||||
#define CONFIG_SYS_INIT_RAM_SIZE 0x800
|
||||
|
|
@ -294,4 +299,51 @@
|
|||
|
||||
#define CONFIG_SYS_CACHELINE_SIZE 64
|
||||
|
||||
/* Defines for SPL */
|
||||
#define CONFIG_SPL
|
||||
#define CONFIG_SPL_NAND_SIMPLE
|
||||
#define CONFIG_SPL_TEXT_BASE 0x40200800
|
||||
#define CONFIG_SPL_MAX_SIZE (45 * 1024)
|
||||
#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
|
||||
|
||||
/* move malloc and bss high to prevent clashing with the main image */
|
||||
#define CONFIG_SYS_SPL_MALLOC_START 0x87000000
|
||||
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
|
||||
#define CONFIG_SPL_BSS_START_ADDR 0x87080000 /* end of minimum RAM */
|
||||
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */
|
||||
|
||||
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
|
||||
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
|
||||
#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
|
||||
#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
|
||||
|
||||
#define CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
#define CONFIG_SPL_LIBDISK_SUPPORT
|
||||
#define CONFIG_SPL_I2C_SUPPORT
|
||||
#define CONFIG_SPL_LIBGENERIC_SUPPORT
|
||||
#define CONFIG_SPL_MMC_SUPPORT
|
||||
#define CONFIG_SPL_FAT_SUPPORT
|
||||
#define CONFIG_SPL_SERIAL_SUPPORT
|
||||
#define CONFIG_SPL_NAND_SUPPORT
|
||||
#define CONFIG_SPL_POWER_SUPPORT
|
||||
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
|
||||
|
||||
/* NAND boot config */
|
||||
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
|
||||
#define CONFIG_SYS_NAND_PAGE_COUNT 64
|
||||
#define CONFIG_SYS_NAND_PAGE_SIZE 2048
|
||||
#define CONFIG_SYS_NAND_OOBSIZE 64
|
||||
#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024)
|
||||
#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS
|
||||
#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\
|
||||
10, 11, 12, 13}
|
||||
#define CONFIG_SYS_NAND_ECCSIZE 512
|
||||
#define CONFIG_SYS_NAND_ECCBYTES 3
|
||||
#define CONFIG_SYS_NAND_ECCSTEPS (CONFIG_SYS_NAND_PAGE_SIZE / \
|
||||
CONFIG_SYS_NAND_ECCSIZE)
|
||||
#define CONFIG_SYS_NAND_ECCTOTAL (CONFIG_SYS_NAND_ECCBYTES * \
|
||||
CONFIG_SYS_NAND_ECCSTEPS)
|
||||
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
|
||||
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue