projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tegra: enable NAND on Harmony
[oweals/u-boot.git]
/
include
/
configs
/
MVBC_P.h
diff --git
a/include/configs/MVBC_P.h
b/include/configs/MVBC_P.h
index cd910ea051a3f5d86bfd67734d987104a07cf4b4..eb0233bef2795a1e81a0065b0b8e7d02b503dad5 100644
(file)
--- a/
include/configs/MVBC_P.h
+++ b/
include/configs/MVBC_P.h
@@
-32,10
+32,11
@@
#define CONFIG_MPC5xxx 1
#define CONFIG_MPC5200 1
#define CONFIG_MPC5xxx 1
#define CONFIG_MPC5200 1
-#define CONFIG_SYS_MPC5XXX_CLKIN 33000000
+#ifndef CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_TEXT_BASE 0xFF800000
+#endif
-#define BOOTFLAG_COLD 0x01
-#define BOOTFLAG_WARM 0x02
+#define CONFIG_SYS_MPC5XXX_CLKIN 33000000
#define CONFIG_MISC_INIT_R 1
#define CONFIG_MISC_INIT_R 1
@@
-67,14
+68,14
@@
#define MV_CI mvBlueCOUGAR-P
#define MV_VCI mvBlueCOUGAR-P
#define MV_FPGA_DATA 0xff860000
#define MV_CI mvBlueCOUGAR-P
#define MV_VCI mvBlueCOUGAR-P
#define MV_FPGA_DATA 0xff860000
-#define MV_FPGA_SIZE 0
x0003c886
-#define MV_KERNEL_ADDR 0xff
c
00000
+#define MV_FPGA_SIZE 0
+#define MV_KERNEL_ADDR 0xff
d
00000
#define MV_INITRD_ADDR 0xff900000
#define MV_INITRD_ADDR 0xff900000
-#define MV_INITRD_LENGTH 0x00
3
00000
+#define MV_INITRD_LENGTH 0x00
4
00000
#define MV_SCRATCH_ADDR 0x00000000
#define MV_SCRATCH_LENGTH MV_INITRD_LENGTH
#define MV_SCRATCH_ADDR 0x00000000
#define MV_SCRATCH_LENGTH MV_INITRD_LENGTH
-#define MV_
AUTOSCR_ADDR
0xff840000
-#define MV_
AUTOSCR_ADDR2
0xff850000
+#define MV_
SCRIPT_ADDR
0xff840000
+#define MV_
SCRIPT_ADDR2
0xff850000
#define MV_DTB_ADDR 0xfffc0000
#define CONFIG_SHOW_BOOT_PROGRESS 1
#define MV_DTB_ADDR 0xfffc0000
#define CONFIG_SHOW_BOOT_PROGRESS 1
@@
-105,6
+106,7
@@
#define CONFIG_CMD_SDRAM
#define CONFIG_CMD_PCI
#define CONFIG_CMD_FPGA
#define CONFIG_CMD_SDRAM
#define CONFIG_CMD_PCI
#define CONFIG_CMD_FPGA
+#define CONFIG_CMD_I2C
#undef CONFIG_WATCHDOG
#undef CONFIG_WATCHDOG
@@
-129,9
+131,9
@@
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_RESET_TO_RETRY 1000
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_RESET_TO_RETRY 1000
-#define CONFIG_BOOTCOMMAND "if imi ${
autoscr
_addr}; \
- then
autoscr ${autoscr_addr};
\
- else
autoscr ${autoscr_addr2};
\
+#define CONFIG_BOOTCOMMAND "if imi ${
script
_addr}; \
+ then
source ${script_addr};
\
+ else
source ${script_addr2};
\
fi;"
#define CONFIG_BOOTARGS "root=/dev/ram ro rootfstype=squashfs"
fi;"
#define CONFIG_BOOTARGS "root=/dev/ram ro rootfstype=squashfs"
@@
-149,8
+151,8
@@
"fpga=0\0" \
"fpgadata=" MK_STR(MV_FPGA_DATA) "\0" \
"fpgadatasize=" MK_STR(MV_FPGA_SIZE) "\0" \
"fpga=0\0" \
"fpgadata=" MK_STR(MV_FPGA_DATA) "\0" \
"fpgadatasize=" MK_STR(MV_FPGA_SIZE) "\0" \
- "
autoscr_addr=" MK_STR(MV_AUTOSCR_ADDR) "\0"
\
- "
autoscr_addr2=" MK_STR(MV_AUTOSCR_ADDR2) "\0"
\
+ "
script_addr=" MK_STR(MV_SCRIPT_ADDR) "\0"
\
+ "
script_addr2=" MK_STR(MV_SCRIPT_ADDR2) "\0"
\
"mv_kernel_addr=" MK_STR(MV_KERNEL_ADDR) "\0" \
"mv_kernel_addr_ram=" MK_STR(MV_KERNEL_ADDR_RAM) "\0" \
"mv_initrd_addr=" MK_STR(MV_INITRD_ADDR) "\0" \
"mv_kernel_addr=" MK_STR(MV_KERNEL_ADDR) "\0" \
"mv_kernel_addr_ram=" MK_STR(MV_KERNEL_ADDR_RAM) "\0" \
"mv_initrd_addr=" MK_STR(MV_INITRD_ADDR) "\0" \
@@
-182,6
+184,7
@@
"propdev_debug=0\0" \
"gevss_debug=0\0" \
"watchdog=1\0" \
"propdev_debug=0\0" \
"gevss_debug=0\0" \
"watchdog=1\0" \
+ "sensor_cnt=1\0" \
""
#undef XMK_STR
""
#undef XMK_STR
@@
-209,7
+212,7
@@
#define CONFIG_SYS_MAX_FLASH_SECT 256
#define CONFIG_SYS_LOWBOOT
#define CONFIG_SYS_MAX_FLASH_SECT 256
#define CONFIG_SYS_LOWBOOT
-#define CONFIG_SYS_FLASH_BASE TEXT_BASE
+#define CONFIG_SYS_FLASH_BASE
CONFIG_SYS_
TEXT_BASE
#define CONFIG_SYS_FLASH_SIZE 0x00800000
/*
#define CONFIG_SYS_FLASH_SIZE 0x00800000
/*
@@
-232,13
+235,12
@@
#define CONFIG_SYS_DEFAULT_MBAR 0x80000000
#define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM
#define CONFIG_SYS_DEFAULT_MBAR 0x80000000
#define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM
-#define CONFIG_SYS_INIT_RAM_
END
MPC5XXX_SRAM_SIZE
+#define CONFIG_SYS_INIT_RAM_
SIZE
MPC5XXX_SRAM_SIZE
-#define CONFIG_SYS_GBL_DATA_SIZE 128
-#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-#define CONFIG_SYS_MONITOR_BASE TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE
CONFIG_SYS_
TEXT_BASE
#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
#define CONFIG_SYS_RAMBOOT 1
#endif
#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
#define CONFIG_SYS_RAMBOOT 1
#endif
@@
-248,10
+250,17
@@
#define CONFIG_SYS_MALLOC_LEN (512 << 10)
#define CONFIG_SYS_BOOTMAPSZ (8 << 20)
#define CONFIG_SYS_MALLOC_LEN (512 << 10)
#define CONFIG_SYS_BOOTMAPSZ (8 << 20)
+/*
+ * I2C configuration
+ */
+#define CONFIG_HARD_I2C 1
+#define CONFIG_SYS_I2C_MODULE 1
+#define CONFIG_SYS_I2C_SPEED 86000
+#define CONFIG_SYS_I2C_SLAVE 0x7F
+
/*
* Ethernet configuration
*/
/*
* Ethernet configuration
*/
-#define CONFIG_NET_MULTI
#define CONFIG_NET_RETRY_COUNT 5
#define CONFIG_E1000
#define CONFIG_NET_RETRY_COUNT 5
#define CONFIG_E1000
@@
-265,7
+274,6
@@
*/
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_CMDLINE_EDITING
*/
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#undef CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PROMPT "=> "
#ifdef CONFIG_CMD_KGDB
#undef CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PROMPT "=> "
#ifdef CONFIG_CMD_KGDB