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 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
include
/
configs
/
ca9x4_ct_vxp.h
diff --git
a/include/configs/ca9x4_ct_vxp.h
b/include/configs/ca9x4_ct_vxp.h
index 5547d55eecd25c24d53b69ce6fc3f5d9e44e8aff..8c57eabb8caa87dcc60bfce02b8e197a7d301bfa 100644
(file)
--- a/
include/configs/ca9x4_ct_vxp.h
+++ b/
include/configs/ca9x4_ct_vxp.h
@@
-30,9
+30,7
@@
/* Board info register */
#define SYS_ID 0x10000000
#define CONFIG_REVISION_TAG 1
/* Board info register */
#define SYS_ID 0x10000000
#define CONFIG_REVISION_TAG 1
-
-/* High Level Configuration Options */
-#define CONFIG_ARMV7 1
+#define CONFIG_SYS_TEXT_BASE 0x60800000
#define CONFIG_SYS_MEMTEST_START 0x60000000
#define CONFIG_SYS_MEMTEST_END 0x20000000
#define CONFIG_SYS_MEMTEST_START 0x60000000
#define CONFIG_SYS_MEMTEST_END 0x20000000
@@
-40,12
+38,13
@@
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS 1
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_
L2_OFF
1
+#define CONFIG_
SYS_L2CACHE_OFF
1
#define CONFIG_INITRD_TAG 1
#define CONFIG_INITRD_TAG 1
+#define CONFIG_OF_LIBFDT 1
+
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
-#define CONFIG_SYS_GBL_DATA_SIZE 128
#define SCTL_BASE 0x10001000
#define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0)
#define SCTL_BASE 0x10001000
#define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0)
@@
-87,6
+86,10
@@
#define CONFIG_MMC 1
#define CONFIG_CMD_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC 1
#define CONFIG_CMD_MMC
#define CONFIG_GENERIC_MMC
+#define CONFIG_ARM_PL180_MMCI
+#define CONFIG_ARM_PL180_MMCI_BASE 0x10005000
+#define CONFIG_SYS_MMC_MAX_BLK_COUNT 127
+#define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 6250000
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
@@
-116,10
+119,10
@@
/* additions for new relocation code */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
/* additions for new relocation code */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_RAM_
END
0x1000
+#define CONFIG_SYS_INIT_RAM_
SIZE
0x1000
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \
- CONFIG_SYS_INIT_RAM_
END
- \
-
CONFIG_SYS
_GBL_DATA_SIZE)
+ CONFIG_SYS_INIT_RAM_
SIZE
- \
+
GENERATED
_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET
/* Basic environment settings */
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET
/* Basic environment settings */