V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

PXA: fix environment sector size, kernel and environment location for vpac270 

Define ENV_ADDR as MONITOR_BASE + MONITOR_LEN. Fix environment sector
size (NOR: 32Kb for first four sectors and 128Kb for other; OneNAND: 128Kb).

Last but not least: we have MONITOR_LEN = 0x40000 and one sector for
environment (size = 0x20000), so the kernel may start from 0x00060000 only.

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
This commit is contained in:
Mikhail Kshevetskiy 2010-08-26 23:24:19 +04:00 committed by Wolfgang Denk
parent b2b67baca3
commit 11934fbf52
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/configs/vpac270.h
View File

@ -45,7 +45,7 @@
"if ide reset && fatload ide 0 0xa4000000 uImage; then " \ "if ide reset && fatload ide 0 0xa4000000 uImage; then " \
"bootm 0xa4000000; " \ "bootm 0xa4000000; " \
"fi; " \ "fi; " \
"bootm 0x40000;" "bootm 0x60000;"
#define CONFIG_BOOTARGS "console=tty0 console=ttyS0,115200" #define CONFIG_BOOTARGS "console=tty0 console=ttyS0,115200"
#define CONFIG_TIMESTAMP #define CONFIG_TIMESTAMP
#define CONFIG_BOOTDELAY 2 /* Autoboot delay */ #define CONFIG_BOOTDELAY 2 /* Autoboot delay */
@ -185,6 +185,12 @@
/* /*
* NOR FLASH * NOR FLASH
*/ */
#define CONFIG_SYS_MONITOR_BASE 0x0
#define CONFIG_SYS_MONITOR_LEN 0x40000
#define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SIZE 0x4000
#if defined(CONFIG_CMD_FLASH) /* NOR */ #if defined(CONFIG_CMD_FLASH) /* NOR */
#define PHYS_FLASH_1 0x00000000 /* Flash Bank #1 */ #define PHYS_FLASH_1 0x00000000 /* Flash Bank #1 */
@ -211,7 +217,16 @@
#define CONFIG_SYS_FLASH_PROTECTION 1 #define CONFIG_SYS_FLASH_PROTECTION 1
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x4000
/*
* The first four sectors of the NOR flash are 0x8000 bytes big, the rest of the
* flash consists of 0x20000 bytes big sectors.
*/
#if (CONFIG_ENV_ADDR <= 0x18000)
#define CONFIG_ENV_SECT_SIZE 0x8000
#else
#define CONFIG_ENV_SECT_SIZE 0x20000
#endif
#elif defined(CONFIG_CMD_ONENAND) /* OneNAND */ #elif defined(CONFIG_CMD_ONENAND) /* OneNAND */
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH
@ -225,12 +240,6 @@
#define CONFIG_SYS_ENV_IS_NOWHERE #define CONFIG_SYS_ENV_IS_NOWHERE
#endif #endif
#define CONFIG_SYS_MONITOR_BASE 0x0
#define CONFIG_SYS_MONITOR_LEN 0x40000
#define CONFIG_ENV_ADDR 0x40000
#define CONFIG_ENV_SIZE 0x4000
/* /*
* IDE * IDE
*/ */