Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
|
||||
/* Default to a width of 8 characters for help message command width */
|
||||
#ifndef CONFIG_SYS_HELP_CMD_WIDTH
|
||||
#define CONFIG_SYS_HELP_CMD_WIDTH 8
|
||||
#define CONFIG_SYS_HELP_CMD_WIDTH 10
|
||||
#endif
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
@@ -99,10 +99,6 @@
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
@@ -506,8 +502,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* MAPLE
|
||||
|
||||
@@ -226,10 +226,6 @@ extern unsigned long get_sdram_size(void);
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
|
||||
|
||||
/* eSPI - Enhanced SPI */
|
||||
#ifdef CONFIG_FSL_ESPI
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_TSEC_ENET)
|
||||
|
||||
@@ -257,10 +253,6 @@ extern unsigned long get_sdram_size(void);
|
||||
* Environment
|
||||
*/
|
||||
#if defined(CONFIG_RAMBOOT_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -406,10 +406,6 @@ combinations. this should be removed later
|
||||
* used for SLIC
|
||||
*/
|
||||
/* eSPI - Enhanced SPI */
|
||||
#ifdef CONFIG_FSL_ESPI
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_TSEC_ENET)
|
||||
|
||||
@@ -458,10 +454,6 @@ combinations. this should be removed later
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#elif defined(CONFIG_RAMBOOT_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -357,8 +357,6 @@
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
|
||||
|
||||
/* eSPI - Enhanced SPI */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
|
||||
#ifdef CONFIG_TSEC_ENET
|
||||
#define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */
|
||||
@@ -382,10 +380,6 @@
|
||||
*/
|
||||
#if defined(CONFIG_SYS_RAMBOOT)
|
||||
#if defined(CONFIG_RAMBOOT_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -177,9 +177,6 @@
|
||||
* Environment is not embedded in u-boot. First time runing may have env
|
||||
* crc error warning if there is no correct environment on the flash.
|
||||
*/
|
||||
#ifdef CONFIG_CF_SBF
|
||||
# define CONFIG_ENV_SPI_CS 2
|
||||
#endif
|
||||
#define CONFIG_ENV_OVERWRITE 1
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
|
||||
@@ -238,7 +238,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CF_SBF)
|
||||
#define CONFIG_ENV_SPI_CS 1
|
||||
#define CONFIG_ENV_OFFSET 0x40000
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
|
||||
@@ -198,7 +198,6 @@
|
||||
* crc error warning if there is no correct environment on the flash.
|
||||
*/
|
||||
#if defined(CONFIG_SYS_STMICRO_BOOT)
|
||||
# define CONFIG_ENV_SPI_CS 1
|
||||
# define CONFIG_ENV_OFFSET 0x20000
|
||||
# define CONFIG_ENV_SIZE 0x2000
|
||||
# define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
|
||||
@@ -248,9 +248,6 @@
|
||||
* Environment is not embedded in u-boot. First time runing may have env
|
||||
* crc error warning if there is no correct environment on the flash.
|
||||
*/
|
||||
#ifdef CONFIG_CF_SBF
|
||||
# define CONFIG_ENV_SPI_CS 1
|
||||
#endif
|
||||
#undef CONFIG_ENV_OVERWRITE
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
|
||||
@@ -369,11 +369,6 @@
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
||||
#define CONFIG_SYS_EEPROM_BUS_NUM 1
|
||||
|
||||
#if defined(CONFIG_SPI_FLASH)
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* General PCI
|
||||
* Memory space is mapped 1-1, but I/O space must start from 0.
|
||||
@@ -529,10 +524,6 @@
|
||||
|
||||
#if defined(CONFIG_SYS_RAMBOOT)
|
||||
#if defined(CONFIG_RAMBOOT_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0xF0000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
|
||||
@@ -573,8 +573,6 @@ extern unsigned long get_sdram_size(void);
|
||||
*/
|
||||
#if !defined(CONFIG_NAND) || !defined(CONFIG_NAND_SECBOOT)
|
||||
/* eSPI - Enhanced SPI */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_TSEC_ENET)
|
||||
@@ -646,10 +644,6 @@ extern unsigned long get_sdram_size(void);
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
#elif defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
#define CONFIG_ENV_SIZE 0x2000
|
||||
|
||||
@@ -388,9 +388,6 @@
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
||||
#define CONFIG_SYS_EEPROM_BUS_NUM 1
|
||||
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* General PCI
|
||||
* Memory space is mapped 1-1, but I/O space must start from 0.
|
||||
@@ -506,10 +503,6 @@
|
||||
* Environment
|
||||
*/
|
||||
#ifdef CONFIG_SPIFLASH
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
|
||||
@@ -49,10 +49,6 @@
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
@@ -350,8 +346,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* General PCI
|
||||
|
||||
@@ -56,10 +56,6 @@
|
||||
/*
|
||||
* Environment variables configurations
|
||||
*/
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K */
|
||||
#define CONFIG_ENV_SIZE 0x02000
|
||||
#define CONFIG_ENV_OFFSET 0xc0000 /* env starts here - 768K */
|
||||
|
||||
@@ -56,10 +56,6 @@
|
||||
/*
|
||||
* Environment variables configurations
|
||||
*/
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K */
|
||||
#define CONFIG_ENV_SIZE 0x02000
|
||||
#define CONFIG_ENV_OFFSET 0xc0000 /* env starts here - 768K */
|
||||
|
||||
@@ -129,10 +129,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
@@ -501,8 +497,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* General PCIe
|
||||
|
||||
@@ -144,10 +144,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#if defined(CONFIG_TARGET_T1024RDB)
|
||||
@@ -497,8 +493,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* General PCIe
|
||||
|
||||
@@ -59,10 +59,6 @@
|
||||
|
||||
#ifdef CONFIG_MTD_NOR_FLASH
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
@@ -415,8 +411,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* General PCI
|
||||
|
||||
@@ -521,12 +521,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
|
||||
/*
|
||||
* General PCI
|
||||
|
||||
@@ -125,10 +125,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
@@ -493,11 +489,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#ifdef CONFIG_SPI_FLASH
|
||||
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* General PCI
|
||||
|
||||
@@ -110,10 +110,6 @@
|
||||
#define CONFIG_SYS_MEMTEST_END 0x00400000
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
@@ -435,10 +431,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#ifdef CONFIG_SPI_FLASH
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* General PCI
|
||||
|
||||
@@ -74,10 +74,6 @@
|
||||
#include "t4qds.h"
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
@@ -362,8 +358,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/* Qman/Bman */
|
||||
#ifndef CONFIG_NOBQFMAN
|
||||
|
||||
@@ -280,10 +280,6 @@
|
||||
"bootm 0x01000000 - 0x00f00000"
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
@@ -507,8 +503,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/* Qman/Bman */
|
||||
#ifndef CONFIG_NOBQFMAN
|
||||
|
||||
@@ -286,9 +286,6 @@
|
||||
#define CONFIG_SYS_I2C_NCT72_ADDR 0x4C
|
||||
#define CONFIG_SYS_I2C_IDT6V49205B 0x69
|
||||
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
|
||||
#if defined(CONFIG_PCI)
|
||||
/*
|
||||
* General PCI
|
||||
@@ -331,10 +328,6 @@
|
||||
|
||||
#else
|
||||
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
|
||||
#ifdef CONFIG_RAMBOOT_SPIFLASH
|
||||
|
||||
|
||||
@@ -201,10 +201,6 @@
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT 512
|
||||
|
||||
/* environments */
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 50000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SECT_SIZE 0x1000
|
||||
#define CONFIG_ENV_OFFSET 0x140000
|
||||
#define CONFIG_ENV_SIZE 8192
|
||||
@@ -212,10 +208,6 @@
|
||||
|
||||
|
||||
/* SPI FLASH */
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 1000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* For booting Linux, the board info and command line data
|
||||
|
||||
@@ -63,12 +63,6 @@
|
||||
#define CONFIG_PHY_ATHEROS
|
||||
|
||||
/* Serial Flash */
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 20000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#endif
|
||||
|
||||
/* allow to overwrite serial and ethaddr */
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
@@ -218,10 +212,6 @@
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 3
|
||||
|
||||
|
||||
@@ -284,7 +284,6 @@
|
||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
||||
|
||||
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */
|
||||
#define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */
|
||||
#define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */
|
||||
@@ -306,7 +305,6 @@
|
||||
#endif
|
||||
|
||||
/* SPI flash. */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 24000000
|
||||
|
||||
/* Network. */
|
||||
#define CONFIG_PHY_SMSC
|
||||
|
||||
@@ -115,7 +115,6 @@
|
||||
|
||||
#ifdef CONFIG_QSPI_BOOT
|
||||
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */
|
||||
#define CONFIG_ENV_OFFSET 0x110000
|
||||
#define CONFIG_ENV_OFFSET_REDUND 0x120000
|
||||
@@ -124,8 +123,6 @@
|
||||
/* SPI */
|
||||
#define CONFIG_TI_SPI_MMAP
|
||||
#define CONFIG_QSPI_SEL_GPIO 48
|
||||
#define CONFIG_SF_DEFAULT_SPEED 48000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
|
||||
#define CONFIG_QSPI_QUAD_SUPPORT
|
||||
#define CONFIG_TI_EDMA3
|
||||
|
||||
|
||||
@@ -97,8 +97,6 @@
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_TI_SPI_MMAP
|
||||
#define CONFIG_SF_DEFAULT_SPEED 76800000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_QSPI_QUAD_SUPPORT
|
||||
|
||||
#endif /* __CONFIG_AM57XX_EVM_H */
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
"mtdparts default;" \
|
||||
"bootm 0x9f650000"
|
||||
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 25000000
|
||||
#define CONFIG_ENV_OFFSET 0x40000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
#define CONFIG_ENV_SIZE 0x10000
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
"mtdparts default;" \
|
||||
"bootm 0x9f680000"
|
||||
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 25000000
|
||||
#define CONFIG_ENV_OFFSET 0x40000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
#define CONFIG_ENV_SIZE 0x10000
|
||||
|
||||
@@ -31,8 +31,6 @@
|
||||
#define CONFIG_FEC_MXC_PHYADDR 0
|
||||
|
||||
#define CONFIG_SPI_FLASH_MTD
|
||||
#define CONFIG_SF_DEFAULT_SPEED 20000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
@@ -151,10 +149,6 @@
|
||||
/* Environment organization */
|
||||
#define CONFIG_ENV_SIZE (12 * 1024)
|
||||
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SECT_SIZE (0x010000)
|
||||
#define CONFIG_ENV_OFFSET (0x0d0000)
|
||||
#define CONFIG_ENV_OFFSET_REDUND (0x0e0000)
|
||||
|
||||
@@ -21,9 +21,6 @@
|
||||
|
||||
#define CONFIG_FEC_XCV_TYPE RMII
|
||||
|
||||
#define CONFIG_SF_DEFAULT_BUS 3
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
|
||||
#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
|
||||
"board_type=aristainetos7@1\0" \
|
||||
"mtdids=nand0=gpmi-nand,nor0=spi3.0\0" \
|
||||
|
||||
@@ -20,9 +20,6 @@
|
||||
|
||||
#define CONFIG_FEC_XCV_TYPE RGMII
|
||||
|
||||
#define CONFIG_SF_DEFAULT_BUS 3
|
||||
#define CONFIG_SF_DEFAULT_CS 1
|
||||
|
||||
#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
|
||||
"board_type=aristainetos2_7@1\0" \
|
||||
"nor_bootdelay=-2\0" \
|
||||
|
||||
@@ -20,9 +20,6 @@
|
||||
|
||||
#define CONFIG_FEC_XCV_TYPE RGMII
|
||||
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
|
||||
#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
|
||||
"board_type=aristainetos2_7@1\0" \
|
||||
"nor_bootdelay=-2\0" \
|
||||
|
||||
@@ -118,7 +118,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_SIZE 0x4200
|
||||
#define CONFIG_ENV_SECT_SIZE 0x210
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 15000000
|
||||
#define CONFIG_BOOTCOMMAND "sf probe 0:0; " \
|
||||
"sf read 0x22000000 0x84000 0x294000; " \
|
||||
"bootm 0x22000000"
|
||||
@@ -128,7 +127,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_SIZE 0x4200
|
||||
#define CONFIG_ENV_SECT_SIZE 0x210
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 15000000
|
||||
#define CONFIG_BOOTCOMMAND "sf probe 0:1; " \
|
||||
"sf read 0x22000000 0x84000 0x294000; " \
|
||||
"bootm 0x22000000"
|
||||
|
||||
@@ -104,7 +104,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_SIZE 0x4200
|
||||
#define CONFIG_ENV_SECT_SIZE 0x210
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 15000000
|
||||
#define CONFIG_BOOTCOMMAND "sf probe 0; " \
|
||||
"sf read 0x22000000 0x84000 0x294000; " \
|
||||
"bootm 0x22000000"
|
||||
@@ -115,7 +114,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_SIZE 0x4200
|
||||
#define CONFIG_ENV_SECT_SIZE 0x210
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 15000000
|
||||
#define CONFIG_BOOTCOMMAND "sf probe 0:3; " \
|
||||
"sf read 0x22000000 0x84000 0x294000; " \
|
||||
"bootm 0x22000000"
|
||||
|
||||
@@ -222,7 +222,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_SIZE 0x4200
|
||||
#define CONFIG_ENV_SECT_SIZE 0x210
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 15000000
|
||||
#define CONFIG_BOOTCOMMAND "sf probe 0; " \
|
||||
"sf read 0x22000000 0x84000 0x294000; " \
|
||||
"bootm 0x22000000"
|
||||
|
||||
@@ -45,9 +45,6 @@
|
||||
(0x00300000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
|
||||
|
||||
/* DataFlash */
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_SF_DEFAULT_SPEED 30000000
|
||||
#endif
|
||||
|
||||
/* NAND flash */
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_SIZE 0x4200
|
||||
#define CONFIG_ENV_SECT_SIZE 0x210
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 15000000
|
||||
#define CONFIG_BOOTCOMMAND "sf probe 0; " \
|
||||
"sf read 0x22000000 0x84000 0x294000; " \
|
||||
"bootm 0x22000000"
|
||||
|
||||
@@ -38,9 +38,6 @@
|
||||
(CONFIG_SYS_SDRAM_BASE + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
|
||||
|
||||
/* DataFlash */
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_SF_DEFAULT_SPEED 30000000
|
||||
#endif
|
||||
|
||||
/* NAND flash */
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
@@ -87,7 +84,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x5000
|
||||
#define CONFIG_ENV_SIZE 0x3000
|
||||
#define CONFIG_ENV_SECT_SIZE 0x1000
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 30000000
|
||||
#define CONFIG_BOOTCOMMAND "sf probe 0; " \
|
||||
"sf read 0x22000000 0x100000 0x300000; " \
|
||||
"bootm 0x22000000"
|
||||
@@ -96,7 +92,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x4200
|
||||
#define CONFIG_ENV_SIZE 0x4200
|
||||
#define CONFIG_ENV_SECT_SIZE 0x210
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 30000000
|
||||
#define CONFIG_BOOTCOMMAND "sf probe 0; " \
|
||||
"sf read 0x22000000 0x84000 0x294000; " \
|
||||
"bootm 0x22000000"
|
||||
|
||||
@@ -113,18 +113,10 @@
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT 512
|
||||
|
||||
/* environments */
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 50000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SECT_SIZE 0x1000
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
/* SPI FLASH */
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 1000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* For booting Linux, the board info and command line data
|
||||
|
||||
@@ -31,12 +31,6 @@
|
||||
#define CONFIG_SYS_BOOTM_LEN SZ_128M
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x82000000
|
||||
|
||||
/*
|
||||
* NAND Flash configuration
|
||||
*/
|
||||
#define CONFIG_SYS_NAND_BASE (ARC_FPGA_PERIPHERAL_BASE + 0x16000)
|
||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||
|
||||
/*
|
||||
* UART configuration
|
||||
*/
|
||||
|
||||
@@ -453,7 +453,6 @@ DEFAULT_LINUX_BOOT_ENV \
|
||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
||||
|
||||
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */
|
||||
#define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */
|
||||
#define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */
|
||||
@@ -466,7 +465,6 @@ DEFAULT_LINUX_BOOT_ENV \
|
||||
#endif
|
||||
|
||||
/* SPI flash. */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 24000000
|
||||
|
||||
/* Network. */
|
||||
#define CONFIG_PHY_SMSC
|
||||
|
||||
@@ -34,10 +34,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x1e0000
|
||||
#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
|
||||
|
||||
#define CONFIG_DM_SPI 1
|
||||
#define CONFIG_SYS_MAX_FLASH_BANKS 1
|
||||
#define CONFIG_CMD_SF
|
||||
#define CONFIG_CMD_SPI
|
||||
#define CONFIG_CMD_SF_TEST
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@@ -29,8 +29,6 @@
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_TEGRA_SLINK_CTRLS 6
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 24000000
|
||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||
|
||||
#include "tegra-common-usb-gadget.h"
|
||||
|
||||
@@ -19,24 +19,8 @@
|
||||
#define CONFIG_FEC_MXC
|
||||
#endif
|
||||
|
||||
/* SPI */
|
||||
#ifdef CONFIG_CMD_SPI
|
||||
#define CONFIG_DEFAULT_SPI_BUS 2
|
||||
#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
|
||||
|
||||
/* SPI FLASH */
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_SF_DEFAULT_BUS 2
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 40000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
|
||||
#define CONFIG_ENV_SPI_BUS 2
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 40000000
|
||||
#define CONFIG_ENV_SPI_MODE SPI_MODE_0
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/* Boot Linux */
|
||||
|
||||
@@ -187,11 +187,9 @@ NANDTGTS \
|
||||
|
||||
#if defined(CONFIG_SPI)
|
||||
/* SPI Flash */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 24000000
|
||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
|
||||
/* Environment */
|
||||
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
|
||||
#define CONFIG_ENV_OFFSET 0x20000
|
||||
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
|
||||
|
||||
@@ -33,8 +33,6 @@
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_TEGRA_SLINK_CTRLS 6
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 24000000
|
||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||
|
||||
#include "tegra-common-post.h"
|
||||
|
||||
@@ -28,8 +28,6 @@
|
||||
#define CONFIG_SYS_MMC_ENV_PART 2
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 24000000
|
||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||
|
||||
#include "tegra-common-usb-gadget.h"
|
||||
|
||||
@@ -33,9 +33,6 @@
|
||||
/* SPI NOR */
|
||||
#define CONFIG_SPI_FLASH_STMICRO
|
||||
#define CONFIG_SPI_FLASH_SST
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 20000000
|
||||
#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
|
||||
|
||||
/* Thermal support */
|
||||
#define CONFIG_IMX_THERMAL
|
||||
@@ -220,10 +217,6 @@
|
||||
#if defined(CONFIG_ENV_IS_IN_SPI_FLASH)
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#endif
|
||||
|
||||
#endif /* __CONFIG_CGTQMX6EVAL_H */
|
||||
|
||||
@@ -27,8 +27,6 @@
|
||||
|
||||
/* SPI Flash support */
|
||||
#define CONFIG_TI_SPI_MMAP
|
||||
#define CONFIG_SF_DEFAULT_SPEED 48000000
|
||||
#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3
|
||||
|
||||
/* SPI SPL defines */
|
||||
/* Offsets: 0K - SPL1, 64K - SPL2, 128K - SPL3, 192K - SPL4, 256K - U-Boot */
|
||||
@@ -44,7 +42,6 @@
|
||||
|
||||
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 48000000
|
||||
|
||||
/* EEPROM */
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
|
||||
|
||||
@@ -140,19 +140,11 @@
|
||||
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
||||
|
||||
/* SPI Flash support */
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 20000000
|
||||
#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_ENV_SIZE SZ_8K
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
|
||||
/* MMC Config*/
|
||||
#define CONFIG_FSL_USDHC
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
*/
|
||||
|
||||
/* SPI NOR flash default params, used by sf commands */
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
|
||||
/*
|
||||
* SDIO/MMC Card Configuration
|
||||
|
||||
@@ -39,10 +39,6 @@
|
||||
#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200}
|
||||
|
||||
/* SPI flash */
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 25000000
|
||||
#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
|
||||
|
||||
/* MTD support */
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
@@ -50,10 +46,6 @@
|
||||
#endif
|
||||
|
||||
/* Environment */
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
|
||||
@@ -55,8 +55,6 @@
|
||||
|
||||
/* SPI Flash support */
|
||||
#define CONFIG_TI_SPI_MMAP
|
||||
#define CONFIG_SF_DEFAULT_SPEED 48000000
|
||||
#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3
|
||||
|
||||
/* Power */
|
||||
#define CONFIG_POWER
|
||||
@@ -87,7 +85,6 @@
|
||||
|
||||
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 48000000
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"loadaddr=0x80200000\0" \
|
||||
|
||||
@@ -181,12 +181,6 @@
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x52
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
|
||||
|
||||
#ifndef CONFIG_TRAILBLAZER
|
||||
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* MMC
|
||||
*/
|
||||
@@ -281,10 +275,6 @@
|
||||
#if defined(CONFIG_TRAILBLAZER)
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#elif defined(CONFIG_RAMBOOT_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
|
||||
@@ -25,17 +25,6 @@
|
||||
|
||||
#define CONFIG_LOADADDR 1000000
|
||||
|
||||
/*
|
||||
* Commands configuration
|
||||
*/
|
||||
#define CONFIG_CMD_I2C
|
||||
#define CONFIG_CMD_SPI
|
||||
|
||||
/* SPI NOR flash default params, used by sf commands */
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_SPEED 1000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
|
||||
|
||||
/*
|
||||
* SDIO/MMC Card Configuration
|
||||
*/
|
||||
@@ -54,7 +43,6 @@
|
||||
#define CONFIG_EHCI_IS_TDI
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
#define CONFIG_ENV_SPI_BUS 1
|
||||
#define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
|
||||
#define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
|
||||
#define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */
|
||||
|
||||
@@ -60,10 +60,6 @@
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
#if defined(CONFIG_SPIFLASH)
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 10000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x10000
|
||||
@@ -358,8 +354,6 @@
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* General PCI
|
||||
|
||||
@@ -123,10 +123,7 @@
|
||||
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
|
||||
#ifdef CONFIG_SPL_BUILD
|
||||
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE
|
||||
#define CONFIG_SF_DEFAULT_SPEED 30000000
|
||||
#endif
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 0
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
|
||||
#ifdef CONFIG_USE_SPIFLASH
|
||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 24000000
|
||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||
|
||||
#include "tegra-common-usb-gadget.h"
|
||||
|
||||
@@ -33,8 +33,6 @@
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
|
||||
|
||||
/* SPI NOR flash default params, used by sf commands */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 1000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
#define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
|
||||
|
||||
@@ -17,15 +17,11 @@
|
||||
*/
|
||||
|
||||
/* SPI NOR flash default params, used by sf commands */
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_SPEED 1000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
|
||||
|
||||
/* USB/EHCI configuration */
|
||||
#define CONFIG_EHCI_IS_TDI
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
#define CONFIG_ENV_SPI_BUS 1
|
||||
#define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
|
||||
#define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
|
||||
#define CONFIG_ENV_SECT_SIZE (256 << 10) /* 256KiB sectors */
|
||||
|
||||
@@ -26,12 +26,8 @@
|
||||
/*
|
||||
* SPI Flash configuration for the environemnt access
|
||||
*/
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
|
||||
/* SPI NOR flash default params, used by sf commands */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 1000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
|
||||
|
||||
/*
|
||||
* SDIO/MMC Card Configuration
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
|
||||
|
||||
/* SPI NOR flash default params, used by sf commands */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 1000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
#define CONFIG_ENV_OFFSET (1 << 20) /* 1MiB in */
|
||||
|
||||
@@ -76,12 +76,6 @@
|
||||
#endif
|
||||
|
||||
/* SPI Flash Configs */
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 25000000
|
||||
#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
|
||||
#endif
|
||||
|
||||
/* UART */
|
||||
#define CONFIG_MXC_UART
|
||||
@@ -169,10 +163,6 @@
|
||||
#define CONFIG_ENV_OFFSET_REDUND \
|
||||
(CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
|
||||
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#endif
|
||||
|
||||
#endif /* __DH_IMX6_CONFIG_H */
|
||||
|
||||
@@ -59,12 +59,6 @@
|
||||
#define CONFIG_MXC_UART_BASE UART5_BASE
|
||||
|
||||
/* SPI NOR Flash */
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_CS (0 | (IMX_GPIO_NR(5, 29) << 8))
|
||||
#define CONFIG_SF_DEFAULT_SPEED 50000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#endif
|
||||
|
||||
/* I2C Configs */
|
||||
#define CONFIG_SYS_I2C
|
||||
@@ -380,11 +374,6 @@
|
||||
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
|
||||
CONFIG_ENV_SECT_SIZE)
|
||||
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
|
||||
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#endif
|
||||
|
||||
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
|
||||
|
||||
@@ -74,8 +74,6 @@
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_TI_SPI_MMAP
|
||||
#define CONFIG_SF_DEFAULT_SPEED 76800000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_QSPI_QUAD_SUPPORT
|
||||
|
||||
/*
|
||||
@@ -93,7 +91,6 @@
|
||||
#define CONFIG_SYS_SPI_ARGS_SIZE 0x80000
|
||||
#if defined(CONFIG_QSPI_BOOT)
|
||||
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#define CONFIG_ENV_SIZE (64 << 10)
|
||||
#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */
|
||||
#define CONFIG_ENV_OFFSET 0x1C0000
|
||||
|
||||
@@ -35,9 +35,6 @@
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 50000000 /* 50 MHz */
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@@ -38,9 +38,6 @@
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 50000000 /* 50 MHz */
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@@ -29,8 +29,6 @@
|
||||
#define CONFIG_SYS_I2C_SPEED 100000
|
||||
|
||||
/* SPI NOR flash default params, used by sf commands */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 1000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
#define CONFIG_ENV_OFFSET 0x7E0000 /* RedBoot config partition in DTS */
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 24000000
|
||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||
|
||||
#include "tegra-common-usb-gadget.h"
|
||||
|
||||
@@ -52,8 +52,6 @@
|
||||
|
||||
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE
|
||||
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
|
||||
#define CONFIG_SF_DEFAULT_SPEED 30000000
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
|
||||
/*
|
||||
* I2C Configuration
|
||||
|
||||
@@ -43,10 +43,6 @@
|
||||
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
|
||||
|
||||
/* Commands */
|
||||
#define CONFIG_SF_DEFAULT_BUS 3
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 20000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
|
||||
/* allow to overwrite serial and ethaddr */
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
@@ -49,13 +49,6 @@
|
||||
|
||||
#define CONFIG_PHY_ATHEROS
|
||||
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 20000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#endif
|
||||
|
||||
#define CONFIG_ARP_TIMEOUT 200UL
|
||||
|
||||
#define CONFIG_SYS_MEMTEST_START 0x10000000
|
||||
@@ -90,10 +83,6 @@
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
#define CONFIG_ENV_SECT_SIZE (8 * 1024)
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#endif
|
||||
|
||||
/* Framebuffer */
|
||||
|
||||
@@ -21,8 +21,6 @@
|
||||
/* select serial console configuration */
|
||||
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
|
||||
|
||||
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
|
||||
|
||||
/* DRAM Memory Banks */
|
||||
#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */
|
||||
|
||||
|
||||
@@ -54,7 +54,6 @@
|
||||
#define CONFIG_ENV_OFFSET 0x3DE000
|
||||
#define CONFIG_ENV_SIZE (132 << 10)
|
||||
#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 15000000
|
||||
|
||||
/* NAND flash */
|
||||
#ifdef CONFIG_CMD_NAND
|
||||
|
||||
@@ -108,16 +108,9 @@
|
||||
#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0x0
|
||||
|
||||
/* SPI */
|
||||
#ifdef CONFIG_SPI_FLASH
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 50000000
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
|
||||
#define CONFIG_ENV_SPI_MODE SPI_MODE_0
|
||||
#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
|
||||
#define CONFIG_ENV_SPI_BUS 1
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 50000000
|
||||
#endif
|
||||
|
||||
/* Ethernet Controllor Driver */
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
#define CONFIG_EXYNOS5_DT
|
||||
|
||||
#define CONFIG_ENV_SPI_BASE 0x12D30000
|
||||
#define CONFIG_SYS_SPI_BASE 0x12D30000
|
||||
#define FLASH_SIZE (4 << 20)
|
||||
#define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_ENV_SECT_SIZE)
|
||||
#define CONFIG_SPI_BOOTING
|
||||
|
||||
@@ -71,12 +71,6 @@
|
||||
#endif
|
||||
|
||||
/* Serial Flash */
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 20000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#endif
|
||||
|
||||
/* allow to overwrite serial and ethaddr */
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
@@ -178,10 +172,6 @@
|
||||
#define CONFIG_ENV_SIZE (8 * 1024)
|
||||
#define CONFIG_ENV_OFFSET (768 * 1024)
|
||||
#define CONFIG_ENV_SECT_SIZE (64 * 1024)
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 3
|
||||
|
||||
|
||||
@@ -52,11 +52,7 @@
|
||||
/* SPI */
|
||||
#ifdef CONFIG_CMD_SF
|
||||
#define CONFIG_SPI_FLASH_MTD
|
||||
#define CONFIG_SF_DEFAULT_BUS 0
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
/* GPIO 3-19 (21248) */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 30000000
|
||||
#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
|
||||
#endif
|
||||
|
||||
#elif defined(CONFIG_SPL_NAND_SUPPORT)
|
||||
@@ -185,10 +181,6 @@
|
||||
#define CONFIG_ENV_OFFSET (512 * SZ_1K)
|
||||
#define CONFIG_ENV_SECT_SIZE (64 * SZ_1K)
|
||||
#define CONFIG_ENV_SIZE (8 * SZ_1K)
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
#endif
|
||||
|
||||
/* Environment */
|
||||
|
||||
@@ -24,10 +24,6 @@
|
||||
*/
|
||||
|
||||
/* SPI NOR flash default params, used by sf commands */
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 104000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
|
||||
|
||||
/*
|
||||
* SDIO/MMC Card Configuration
|
||||
@@ -49,13 +45,6 @@
|
||||
CONFIG_SYS_SCSI_MAX_LUN)
|
||||
|
||||
#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
|
||||
/*
|
||||
* SPI Flash configuration for the environment access
|
||||
*/
|
||||
#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
|
||||
#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
#define CONFIG_ENV_SECT_SIZE SZ_64K
|
||||
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
|
||||
|
||||
@@ -24,8 +24,6 @@
|
||||
#define CONFIG_SYS_MMC_ENV_PART 2
|
||||
|
||||
/* SPI */
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_SF_DEFAULT_SPEED 24000000
|
||||
#define CONFIG_SPI_FLASH_SIZE (4 << 20)
|
||||
|
||||
#include "tegra-common-usb-gadget.h"
|
||||
|
||||
@@ -86,9 +86,6 @@
|
||||
|
||||
#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
|
||||
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_CADENCE_QSPI
|
||||
#define CONFIG_CQSPI_REF_CLK 384000000
|
||||
|
||||
@@ -33,14 +33,8 @@
|
||||
#include "keymile-common.h"
|
||||
|
||||
/* SPI NOR Flash default params, used by sf commands */
|
||||
#define CONFIG_SF_DEFAULT_SPEED 8100000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
|
||||
|
||||
#if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 8100000
|
||||
#define CONFIG_ENV_SPI_MODE SPI_MODE_3
|
||||
#endif
|
||||
|
||||
/* Reserve 4 MB for malloc */
|
||||
|
||||
@@ -39,10 +39,6 @@
|
||||
#define CONFIG_SYS_DPAA_RMAN /* RMan */
|
||||
|
||||
/* Environment in SPI Flash */
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 20000000
|
||||
#define CONFIG_ENV_SPI_MODE 0
|
||||
#define CONFIG_ENV_OFFSET 0x100000 /* 1MB for u-boot */
|
||||
#define CONFIG_ENV_SIZE 0x004000 /* 16K env */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x010000
|
||||
@@ -252,8 +248,6 @@ int get_scl(void);
|
||||
/*
|
||||
* eSPI - Enhanced SPI
|
||||
*/
|
||||
#define CONFIG_SF_DEFAULT_SPEED 20000000
|
||||
#define CONFIG_SF_DEFAULT_MODE 0
|
||||
|
||||
/*
|
||||
* General PCI
|
||||
|
||||
@@ -65,10 +65,8 @@
|
||||
#include "mv-common.h"
|
||||
|
||||
/* Remove or override few declarations from mv-common.h */
|
||||
#undef CONFIG_ENV_SPI_MAX_HZ
|
||||
#undef CONFIG_SYS_IDE_MAXBUS
|
||||
#undef CONFIG_SYS_IDE_MAXDEVICE
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */
|
||||
|
||||
/*
|
||||
* Enable platform initialisation via misc_init_r() function
|
||||
|
||||
@@ -47,8 +47,6 @@
|
||||
|
||||
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE
|
||||
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID)
|
||||
#define CONFIG_SF_DEFAULT_SPEED 50000000
|
||||
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
|
||||
|
||||
/*
|
||||
* I2C Configuration
|
||||
|
||||
@@ -40,10 +40,6 @@
|
||||
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_TFABOOT)
|
||||
#define CONFIG_SYS_QE_FW_IN_SPIFLASH
|
||||
#define CONFIG_SYS_FMAN_FW_ADDR 0x400d0000
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 1000000
|
||||
#define CONFIG_ENV_SPI_MODE 0x03
|
||||
#define CONFIG_SPI_FLASH_SPANSION
|
||||
#define CONFIG_FSL_SPI_INTERFACE
|
||||
#define CONFIG_SF_DATAFLASH
|
||||
|
||||
@@ -74,9 +74,7 @@
|
||||
|
||||
/* DSPI */
|
||||
#define CONFIG_FSL_DSPI1
|
||||
#define CONFIG_DEFAULT_SPI_BUS 1
|
||||
|
||||
#define CONFIG_CMD_SPI
|
||||
#define MMAP_DSPI DSPI1_BASE_ADDR
|
||||
|
||||
#define CONFIG_SYS_DSPI_CTAR0 1
|
||||
@@ -99,11 +97,6 @@
|
||||
DSPI_CTAR_DT(0))
|
||||
#define CONFIG_SPI_FLASH_EON /* cs3 */
|
||||
|
||||
#define CONFIG_SF_DEFAULT_SPEED 10000000
|
||||
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
|
||||
/* MMC */
|
||||
#ifdef CONFIG_MMC
|
||||
#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
|
||||
|
||||
@@ -85,6 +85,8 @@
|
||||
#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL
|
||||
#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
|
||||
|
||||
#define CONFIG_CHIP_SELECTS_PER_CTRL 4
|
||||
|
||||
/*
|
||||
* Serial Port
|
||||
*/
|
||||
|
||||
@@ -104,6 +104,8 @@
|
||||
#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL
|
||||
#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
|
||||
|
||||
#define CONFIG_CHIP_SELECTS_PER_CTRL 4
|
||||
|
||||
#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \
|
||||
!defined(CONFIG_QSPI_BOOT)
|
||||
#define CONFIG_SYS_QE_FMAN_FW_IN_NOR
|
||||
|
||||
@@ -173,10 +173,6 @@
|
||||
#define CONFIG_SPI_FLASH_STMICRO /* cs0 */
|
||||
#define CONFIG_SPI_FLASH_SST /* cs1 */
|
||||
#define CONFIG_SPI_FLASH_EON /* cs2 */
|
||||
#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -190,10 +186,6 @@
|
||||
#define CONFIG_SYS_FMAN_FW_ADDR 0x900000
|
||||
#define CONFIG_SYS_QE_FW_ADDR 0x940000
|
||||
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 1000000
|
||||
#define CONFIG_ENV_SPI_MODE 0x03
|
||||
|
||||
#else
|
||||
#ifdef CONFIG_NAND_BOOT
|
||||
@@ -212,10 +204,6 @@
|
||||
#elif defined(CONFIG_QSPI_BOOT)
|
||||
#define CONFIG_SYS_QE_FW_IN_SPIFLASH
|
||||
#define CONFIG_SYS_FMAN_FW_ADDR 0x40900000
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 1000000
|
||||
#define CONFIG_ENV_SPI_MODE 0x03
|
||||
#else
|
||||
#define CONFIG_SYS_QE_FMAN_FW_IN_NOR
|
||||
/* FMan fireware Pre-load address */
|
||||
|
||||
@@ -170,10 +170,6 @@
|
||||
|
||||
#ifdef CONFIG_TFABOOT
|
||||
#define CONFIG_SYS_FMAN_FW_ADDR 0x900000
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 1000000
|
||||
#define CONFIG_ENV_SPI_MODE 0x03
|
||||
#else
|
||||
#ifdef CONFIG_SD_BOOT
|
||||
/*
|
||||
@@ -186,10 +182,6 @@
|
||||
#elif defined(CONFIG_QSPI_BOOT)
|
||||
#define CONFIG_SYS_QE_FW_IN_SPIFLASH
|
||||
#define CONFIG_SYS_FMAN_FW_ADDR 0x40900000
|
||||
#define CONFIG_ENV_SPI_BUS 0
|
||||
#define CONFIG_ENV_SPI_CS 0
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 1000000
|
||||
#define CONFIG_ENV_SPI_MODE 0x03
|
||||
#elif defined(CONFIG_NAND_BOOT)
|
||||
#define CONFIG_SYS_QE_FMAN_FW_IN_NAND
|
||||
#define CONFIG_SYS_FMAN_FW_ADDR (36 * CONFIG_SYS_NAND_BLOCK_SIZE)
|
||||
|
||||
@@ -39,10 +39,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
#define CONFIG_SPI_FLASH_STMICRO /* cs0 */
|
||||
#define CONFIG_SPI_FLASH_SST /* cs1 */
|
||||
#define CONFIG_SPI_FLASH_EON /* cs2 */
|
||||
#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* QSPI */
|
||||
|
||||
@@ -147,7 +147,7 @@ unsigned long long get_qixis_addr(void);
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_FSL_MC_ENET)
|
||||
#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (512UL * 1024 * 1024)
|
||||
#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (128UL * 1024 * 1024)
|
||||
#endif
|
||||
/* Command line configuration */
|
||||
#define CONFIG_CMD_CACHE
|
||||
|
||||
@@ -384,8 +384,6 @@ unsigned long get_board_ddr_clk(void);
|
||||
#define CONFIG_SPI_FLASH_EON
|
||||
#if !defined(CONFIG_TFABOOT) && \
|
||||
!defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI)
|
||||
#define CONFIG_SF_DEFAULT_BUS 1
|
||||
#define CONFIG_SF_DEFAULT_CS 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ unsigned long long get_qixis_addr(void);
|
||||
* 512MB aligned, so the min size to hide is 512MB.
|
||||
*/
|
||||
#ifdef CONFIG_FSL_MC_ENET
|
||||
#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (512UL * 1024 * 1024)
|
||||
#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (128UL * 1024 * 1024)
|
||||
#endif
|
||||
|
||||
/* Command line configuration */
|
||||
|
||||
@@ -45,12 +45,6 @@
|
||||
|
||||
/* loading initramfs images without uimage header */
|
||||
|
||||
/* ST M25P40 */
|
||||
#undef CONFIG_ENV_SPI_MAX_HZ
|
||||
#define CONFIG_ENV_SPI_MAX_HZ 25000000
|
||||
#undef CONFIG_SF_DEFAULT_SPEED
|
||||
#define CONFIG_SF_DEFAULT_SPEED 25000000
|
||||
|
||||
/*
|
||||
* Environment variables configurations
|
||||
*/
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
* 512MB aligned, so the min size to hide is 512MB.
|
||||
*/
|
||||
#ifdef CONFIG_FSL_MC_ENET
|
||||
#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (512UL * 1024 * 1024)
|
||||
#define CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE (256UL * 1024 * 1024)
|
||||
#endif
|
||||
|
||||
/* I2C bus multiplexer */
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user