projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'u-boot-atmel/master' into m
[oweals/u-boot.git]
/
include
/
configs
/
zipitz2.h
diff --git
a/include/configs/zipitz2.h
b/include/configs/zipitz2.h
index a8b88dae37b414fbfd997aa53a54a2cb22ee54d6..8b7e05b9e51fe7597ec7f1ce9af891d0f1f6b538 100644
(file)
--- a/
include/configs/zipitz2.h
+++ b/
include/configs/zipitz2.h
@@
-25,14
+25,13
@@
/*
* High Level Board Configuration Options
*/
/*
* High Level Board Configuration Options
*/
-#define CONFIG_
PXA27X
1 /* Marvell PXA270 CPU */
+#define CONFIG_
CPU_PXA27X
1 /* Marvell PXA270 CPU */
#define CONFIG_ZIPITZ2 1 /* Zipit Z2 board */
#define CONFIG_SYS_TEXT_BASE 0x0
#define CONFIG_ZIPITZ2 1 /* Zipit Z2 board */
#define CONFIG_SYS_TEXT_BASE 0x0
-#undef BOARD_LATE_INIT
-#undef CONFIG_SKIP_RELOCATE_UBOOT
-#undef CONFIG_USE_IRQ
+#undef CONFIG_BOARD_LATE_INIT
#undef CONFIG_SKIP_LOWLEVEL_INIT
#undef CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_PREBOOT
/*
* Environment settings
/*
* Environment settings
@@
-46,7
+45,8
@@
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_BOOTCOMMAND \
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_BOOTCOMMAND \
- "if mmc init && fatload mmc 0 0xa0000000 uboot.script ; then " \
+ "if mmc rescan && ext2load mmc 0 0xa0000000 boot/uboot.script ;"\
+ "then " \
"source 0xa0000000; " \
"else " \
"bootm 0x60000; " \
"source 0xa0000000; " \
"else " \
"bootm 0x60000; " \
@@
-67,7
+67,6
@@
#define CONFIG_PXA_SERIAL
#define CONFIG_STUART 1
#define CONFIG_BAUDRATE 115200
#define CONFIG_PXA_SERIAL
#define CONFIG_STUART 1
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
/*
* Bootloader Components Configuration
/*
* Bootloader Components Configuration
@@
-75,6
+74,7
@@
#include <config_cmd_default.h>
#undef CONFIG_CMD_NET
#include <config_cmd_default.h>
#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
#define CONFIG_CMD_ENV
#undef CONFIG_CMD_IMLS
#define CONFIG_CMD_MMC
#define CONFIG_CMD_ENV
#undef CONFIG_CMD_IMLS
#define CONFIG_CMD_MMC
@@
-85,7
+85,8
@@
*/
#ifdef CONFIG_CMD_MMC
#define CONFIG_MMC
*/
#ifdef CONFIG_CMD_MMC
#define CONFIG_MMC
-#define CONFIG_PXA_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_PXA_MMC_GENERIC
#define CONFIG_SYS_MMC_BASE 0xF0000000
#define CONFIG_CMD_FAT
#define CONFIG_CMD_EXT2
#define CONFIG_SYS_MMC_BASE 0xF0000000
#define CONFIG_CMD_FAT
#define CONFIG_CMD_EXT2
@@
-131,7
+132,6
@@
unsigned char zipitz2_spi_read(void);
* HUSH Shell Configuration
*/
#define CONFIG_SYS_HUSH_PARSER 1
* HUSH Shell Configuration
*/
#define CONFIG_SYS_HUSH_PARSER 1
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#ifdef CONFIG_SYS_HUSH_PARSER
@@
-153,13
+153,10
@@
unsigned char zipitz2_spi_read(void);
#define CONFIG_SYS_CPUSPEED 0x190 /* standard setting for 312MHz; L=16, N=1.5, A=0, SDCLK!=SystemBus */
/*
#define CONFIG_SYS_CPUSPEED 0x190 /* standard setting for 312MHz; L=16, N=1.5, A=0, SDCLK!=SystemBus */
/*
- * S
tack sizes
+ * S
RAM Map
*/
*/
-#define CONFIG_STACKSIZE (128*1024) /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
-#endif
+#define PHYS_SRAM 0x5c000000 /* SRAM Bank #1 */
+#define PHYS_SRAM_SIZE 0x00040000 /* 256k */
/*
* DRAM Map
/*
* DRAM Map
@@
-177,7
+174,7
@@
unsigned char zipitz2_spi_read(void);
#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_DRAM_BASE
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_DRAM_BASE
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_SP_ADDR (GENERATED_GBL_DATA_SIZE + PHYS_S
DRAM_1
+ 2048)
+#define CONFIG_SYS_INIT_SP_ADDR (GENERATED_GBL_DATA_SIZE + PHYS_S
RAM
+ 2048)
/*
* NOR FLASH
/*
* NOR FLASH