[Feature][task-view-1126]merge ZXW nand flash patch
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: No
Doc Update: No
Change-Id: Iaeb60fdc93b8ccc6ebd3f150fa047ddbee6c0d8c
diff --git a/boot/prj/zx297520v3/bootrom/dl_on/z-load2.map b/boot/prj/zx297520v3/bootrom/dl_on/z-load2.map
index c906aa5..c01b65c 100755
--- a/boot/prj/zx297520v3/bootrom/dl_on/z-load2.map
+++ b/boot/prj/zx297520v3/bootrom/dl_on/z-load2.map
@@ -161,95 +161,95 @@
.iplt 0x0000000000000000 0x0 cpu/m0/start.o
0x0000000020304ea4 . = ALIGN (0x4)
-.rodata 0x0000000020304ea4 0x3f0
+.rodata 0x0000000020304ea4 0x408
*(.rodata)
- .rodata 0x0000000020304ea4 0x270 drivers/libdrivers.a(spifc_loader2.o)
- .rodata 0x0000000020305114 0x13 drivers/libdrivers.a(sha256.o)
- 0x0000000020305114 sha256_der_prefix
- *fill* 0x0000000020305127 0x1
- .rodata 0x0000000020305128 0x16c drivers/libdrivers.a(nor.o)
+ .rodata 0x0000000020304ea4 0x288 drivers/libdrivers.a(spifc_loader2.o)
+ .rodata 0x000000002030512c 0x13 drivers/libdrivers.a(sha256.o)
+ 0x000000002030512c sha256_der_prefix
+ *fill* 0x000000002030513f 0x1
+ .rodata 0x0000000020305140 0x16c drivers/libdrivers.a(nor.o)
-.rodata.str1.1 0x0000000020305294 0x516
+.rodata.str1.1 0x00000000203052ac 0x516
.rodata.str1.1
- 0x0000000020305294 0x213 lib/libarm.a(board.o)
+ 0x00000000203052ac 0x213 lib/libarm.a(board.o)
0x24e (松开之前的大小)
.rodata.str1.1
- 0x00000000203054a7 0xef drivers/libdrivers.a(image.o)
+ 0x00000000203054bf 0xef drivers/libdrivers.a(image.o)
0x115 (松开之前的大小)
.rodata.str1.1
- 0x0000000020305596 0x5b drivers/libdrivers.a(secure_verify.o)
+ 0x00000000203055ae 0x5b drivers/libdrivers.a(secure_verify.o)
0x5d (松开之前的大小)
.rodata.str1.1
- 0x00000000203055f1 0x3d drivers/libdrivers.a(spifc_loader2.o)
+ 0x0000000020305609 0x3d drivers/libdrivers.a(spifc_loader2.o)
0x4a (松开之前的大小)
.rodata.str1.1
- 0x000000002030562e 0x9 drivers/libdrivers.a(bbt.o)
+ 0x0000000020305646 0x9 drivers/libdrivers.a(bbt.o)
.rodata.str1.1
- 0x0000000020305637 0x15c drivers/libdrivers.a(nor.o)
+ 0x000000002030564f 0x15c drivers/libdrivers.a(nor.o)
.rodata.str1.1
- 0x0000000020305793 0x17 drivers/libdrivers.a(efuse.o)
+ 0x00000000203057ab 0x17 drivers/libdrivers.a(efuse.o)
-.rel.dyn 0x00000000203057ac 0x0
+.rel.dyn 0x00000000203057c4 0x0
.rel.iplt 0x0000000000000000 0x0 cpu/m0/start.o
- 0x00000000203057ac . = ALIGN (0x4)
+ 0x00000000203057c4 . = ALIGN (0x4)
-.data 0x00000000203057ac 0xd0
+.data 0x00000000203057c4 0xd0
*(.data)
- .data 0x00000000203057ac 0x0 cpu/m0/start.o
- .data 0x00000000203057ac 0x0 lib/libarm.a(board.o)
- .data 0x00000000203057ac 0x0 lib/libarm.a(string.o)
- .data 0x00000000203057ac 0x0 drivers/libdrivers.a(ddr.o)
- .data 0x00000000203057ac 0x0 drivers/libdrivers.a(uart.o)
- .data 0x00000000203057ac 0x0 drivers/libdrivers.a(image.o)
- .data 0x00000000203057ac 0x0 drivers/libdrivers.a(secure_verify.o)
- .data 0x00000000203057ac 0x0 drivers/libdrivers.a(spifc_loader2.o)
- .data 0x00000000203057ac 0x40 drivers/libdrivers.a(bbt.o)
- .data 0x00000000203057ec 0x40 drivers/libdrivers.a(sha256.o)
- .data 0x000000002030582c 0x50 drivers/libdrivers.a(nor.o)
- 0x000000002030582c nor_cmd_table
- .data 0x000000002030587c 0x0 drivers/libdrivers.a(drv_hash.o)
- .data 0x000000002030587c 0x0 drivers/libdrivers.a(drv_rsa.o)
- .data 0x000000002030587c 0x0 drivers/libdrivers.a(flash.o)
- .data 0x000000002030587c 0x0 drivers/libdrivers.a(efuse.o)
- .data 0x000000002030587c 0x0 cpu/m0/libm0.a(cpu.o)
+ .data 0x00000000203057c4 0x0 cpu/m0/start.o
+ .data 0x00000000203057c4 0x0 lib/libarm.a(board.o)
+ .data 0x00000000203057c4 0x0 lib/libarm.a(string.o)
+ .data 0x00000000203057c4 0x0 drivers/libdrivers.a(ddr.o)
+ .data 0x00000000203057c4 0x0 drivers/libdrivers.a(uart.o)
+ .data 0x00000000203057c4 0x0 drivers/libdrivers.a(image.o)
+ .data 0x00000000203057c4 0x0 drivers/libdrivers.a(secure_verify.o)
+ .data 0x00000000203057c4 0x0 drivers/libdrivers.a(spifc_loader2.o)
+ .data 0x00000000203057c4 0x40 drivers/libdrivers.a(bbt.o)
+ .data 0x0000000020305804 0x40 drivers/libdrivers.a(sha256.o)
+ .data 0x0000000020305844 0x50 drivers/libdrivers.a(nor.o)
+ 0x0000000020305844 nor_cmd_table
+ .data 0x0000000020305894 0x0 drivers/libdrivers.a(drv_hash.o)
+ .data 0x0000000020305894 0x0 drivers/libdrivers.a(drv_rsa.o)
+ .data 0x0000000020305894 0x0 drivers/libdrivers.a(flash.o)
+ .data 0x0000000020305894 0x0 drivers/libdrivers.a(efuse.o)
+ .data 0x0000000020305894 0x0 cpu/m0/libm0.a(cpu.o)
-.igot.plt 0x000000002030587c 0x0
+.igot.plt 0x0000000020305894 0x0
.igot.plt 0x0000000000000000 0x0 cpu/m0/start.o
- 0x000000002030587c . = ALIGN (0x4)
+ 0x0000000020305894 . = ALIGN (0x4)
.got
*(.got)
- 0x000000002030587c . = ALIGN (0x4)
- 0x000000002030587c __bss_start = .
+ 0x0000000020305894 . = ALIGN (0x4)
+ 0x0000000020305894 __bss_start = .
-.bss 0x000000002030587c 0x1e8
+.bss 0x0000000020305894 0x1e8
*(.bss)
- .bss 0x000000002030587c 0x0 cpu/m0/start.o
- .bss 0x000000002030587c 0x4 lib/libarm.a(board.o)
- 0x000000002030587c zloader_entry_point
- .bss 0x0000000020305880 0x0 lib/libarm.a(string.o)
- .bss 0x0000000020305880 0x0 drivers/libdrivers.a(ddr.o)
- .bss 0x0000000020305880 0x0 drivers/libdrivers.a(uart.o)
- .bss 0x0000000020305880 0x0 drivers/libdrivers.a(image.o)
- .bss 0x0000000020305880 0x104 drivers/libdrivers.a(secure_verify.o)
- 0x0000000020305880 result
- .bss 0x0000000020305984 0x4 drivers/libdrivers.a(spifc_loader2.o)
- .bss 0x0000000020305988 0x80 drivers/libdrivers.a(bbt.o)
- .bss 0x0000000020305a08 0x0 drivers/libdrivers.a(sha256.o)
- .bss 0x0000000020305a08 0x28 drivers/libdrivers.a(nor.o)
- 0x0000000020305a08 spi_nor_flash
- 0x0000000020305a0c otp_data
- .bss 0x0000000020305a30 0x0 drivers/libdrivers.a(drv_hash.o)
- .bss 0x0000000020305a30 0x0 drivers/libdrivers.a(drv_rsa.o)
- .bss 0x0000000020305a30 0x24 drivers/libdrivers.a(flash.o)
- 0x0000000020305a30 flash
- .bss 0x0000000020305a54 0x0 drivers/libdrivers.a(efuse.o)
- .bss 0x0000000020305a54 0x10 cpu/m0/libm0.a(cpu.o)
- 0x0000000020305a54 g_tick
- 0x0000000020305a64 __bss_end = .
- 0x0000000020305a64 . = ALIGN (0x4)
+ .bss 0x0000000020305894 0x0 cpu/m0/start.o
+ .bss 0x0000000020305894 0x4 lib/libarm.a(board.o)
+ 0x0000000020305894 zloader_entry_point
+ .bss 0x0000000020305898 0x0 lib/libarm.a(string.o)
+ .bss 0x0000000020305898 0x0 drivers/libdrivers.a(ddr.o)
+ .bss 0x0000000020305898 0x0 drivers/libdrivers.a(uart.o)
+ .bss 0x0000000020305898 0x0 drivers/libdrivers.a(image.o)
+ .bss 0x0000000020305898 0x104 drivers/libdrivers.a(secure_verify.o)
+ 0x0000000020305898 result
+ .bss 0x000000002030599c 0x4 drivers/libdrivers.a(spifc_loader2.o)
+ .bss 0x00000000203059a0 0x80 drivers/libdrivers.a(bbt.o)
+ .bss 0x0000000020305a20 0x0 drivers/libdrivers.a(sha256.o)
+ .bss 0x0000000020305a20 0x28 drivers/libdrivers.a(nor.o)
+ 0x0000000020305a20 spi_nor_flash
+ 0x0000000020305a24 otp_data
+ .bss 0x0000000020305a48 0x0 drivers/libdrivers.a(drv_hash.o)
+ .bss 0x0000000020305a48 0x0 drivers/libdrivers.a(drv_rsa.o)
+ .bss 0x0000000020305a48 0x24 drivers/libdrivers.a(flash.o)
+ 0x0000000020305a48 flash
+ .bss 0x0000000020305a6c 0x0 drivers/libdrivers.a(efuse.o)
+ .bss 0x0000000020305a6c 0x10 cpu/m0/libm0.a(cpu.o)
+ 0x0000000020305a6c g_tick
+ 0x0000000020305a7c __bss_end = .
+ 0x0000000020305a7c . = ALIGN (0x4)
-.para 0x0000000082000000 0x0 加载地址 0x0000000020305a64
+.para 0x0000000082000000 0x0 加载地址 0x0000000020305a7c
0x0000000082000000 __para_start = .
*(.para)
0x0000000082000000 __para_end = .