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 branch 'sandbox' of git://git.denx.de/u-boot-blackfin
[oweals/u-boot.git]
/
include
/
configs
/
zipitz2.h
diff --git
a/include/configs/zipitz2.h
b/include/configs/zipitz2.h
index 48537e3ccb1cc43a06197ba9cfc0649de8af1b16..26204af2c29c9407eed3a79485b754b0d2534d28 100644
(file)
--- a/
include/configs/zipitz2.h
+++ b/
include/configs/zipitz2.h
@@
-25,12
+25,11
@@
/*
* 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_BOARD_LATE_INIT
#undef CONFIG_USE_IRQ
#undef CONFIG_SKIP_LOWLEVEL_INIT
#undef CONFIG_USE_IRQ
#undef CONFIG_SKIP_LOWLEVEL_INIT
@@
-43,7
+42,6
@@
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_SYS_MALLOC_LEN (128*1024)
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_SYS_MALLOC_LEN (128*1024)
-#define CONFIG_SYS_GBL_DATA_SIZE 512
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_BOOTCOMMAND \
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_BOOTCOMMAND \
@@
-76,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
@@
-178,7
+177,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 (
CONFIG_SYS
_GBL_DATA_SIZE + PHYS_SDRAM_1 + 2048)
+#define CONFIG_SYS_INIT_SP_ADDR (
GENERATED
_GBL_DATA_SIZE + PHYS_SDRAM_1 + 2048)
/*
* NOR FLASH
/*
* NOR FLASH