|
@@ -14,10 +14,6 @@
|
|
|
|
|
|
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
|
|
|
#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
|
|
|
-#define CONFIG_SPL_OS_BOOT
|
|
|
-#define CONFIG_SYS_OS_BASE (CONFIG_SYS_FLASH_BASE + 0x180000)
|
|
|
-#define CONFIG_SYS_FDT_BASE (CONFIG_SYS_FLASH_BASE + 0x1980000)
|
|
|
-#define CONFIG_SYS_FDT_SIZE (48 * SZ_1K)
|
|
|
#define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
|
|
|
|
|
|
/*
|
|
@@ -28,8 +24,7 @@
|
|
|
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR (0x800)
|
|
|
#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (0x80)
|
|
|
#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR (0x1000)
|
|
|
-#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
|
|
|
-#define CONFIG_SPL_FS_LOAD_ARGS_NAME "imx6q-mccmon.dtb"
|
|
|
+#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "fitImage"
|
|
|
|
|
|
/* Size of malloc() pool */
|
|
|
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
|
|
@@ -61,14 +56,13 @@
|
|
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
|
"console=ttymxc0,115200 quiet\0" \
|
|
|
- "fdtfile=imx6q-mccmon6.dtb\0" \
|
|
|
"fdt_high=0xffffffff\0" \
|
|
|
"initrd_high=0xffffffff\0" \
|
|
|
"boot_os=yes\0" \
|
|
|
+ "kernelsize=0x300000\0" \
|
|
|
"disable_giga=yes\0" \
|
|
|
"download_kernel=" \
|
|
|
- "tftpboot ${kernel_addr} ${kernel_file};" \
|
|
|
- "tftpboot ${fdt_addr} ${fdtfile};\0" \
|
|
|
+ "tftpboot ${loadaddr} ${kernel_file};\0" \
|
|
|
"get_boot_medium=" \
|
|
|
"setenv boot_medium nor;" \
|
|
|
"setexpr.l _src_sbmr1 *0x020d8004;" \
|
|
@@ -76,10 +70,7 @@
|
|
|
"if test ${_b_medium} = 40; then " \
|
|
|
"setenv boot_medium sdcard;" \
|
|
|
"fi\0" \
|
|
|
- "kernel_file=uImage\0" \
|
|
|
- "load_kernel=" \
|
|
|
- "load mmc ${bootdev}:${bootpart} ${kernel_addr} uImage;" \
|
|
|
- "load mmc ${bootdev}:${bootpart} ${fdt_addr} ${fdtfile};\0" \
|
|
|
+ "kernel_file=fitImage\0" \
|
|
|
"boot_sd=" \
|
|
|
"echo '#######################';" \
|
|
|
"echo '# Factory SDcard Boot #';" \
|
|
@@ -90,12 +81,11 @@
|
|
|
"run factory_flash_img;\0" \
|
|
|
"boot_nor=" \
|
|
|
"setenv kernelnor 0x08180000;" \
|
|
|
- "setenv dtbnor 0x09980000;" \
|
|
|
"setenv bootargs console=${console} " \
|
|
|
CONFIG_MTDPARTS_DEFAULT " " \
|
|
|
"root=/dev/mmcblk1 rootfstype=ext4 rw rootwait noinitrd;" \
|
|
|
- "cp.l ${dtbnor} ${dtbloadaddr} 0x8000;" \
|
|
|
- "bootm ${kernelnor} - ${dtbloadaddr};\0" \
|
|
|
+ "cp.l ${kernelnor} ${loadaddr} ${kernelsize};" \
|
|
|
+ "bootm ${loadaddr};reset;\0" \
|
|
|
"boot_recovery=" \
|
|
|
"echo '#######################';" \
|
|
|
"echo '# RECOVERY SWU Boot #';" \
|
|
@@ -103,14 +93,13 @@
|
|
|
"setenv rootfsloadaddr 0x13000000;" \
|
|
|
"setenv swukernelnor 0x08980000;" \
|
|
|
"setenv swurootfsnor 0x09180000;" \
|
|
|
- "setenv swudtbnor 0x099A0000;" \
|
|
|
"setenv bootargs console=${console} " \
|
|
|
CONFIG_MTDPARTS_DEFAULT " " \
|
|
|
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
|
|
|
":${hostname}::off root=/dev/ram rw;" \
|
|
|
"cp.l ${swurootfsnor} ${rootfsloadaddr} 0x200000;" \
|
|
|
- "cp.l ${swudtbnor} ${dtbloadaddr} 0x8000;" \
|
|
|
- "bootm ${swukernelnor} ${rootfsloadaddr} ${dtbloadaddr};\0" \
|
|
|
+ "cp.l ${swukernelnor} ${loadaddr} ${kernelsize};" \
|
|
|
+ "bootm ${loadaddr} ${rootfsloadaddr};reset;\0" \
|
|
|
"boot_tftp=" \
|
|
|
"echo '#######################';" \
|
|
|
"echo '# TFTP Boot #';" \
|
|
@@ -118,7 +107,7 @@
|
|
|
"if run download_kernel; then " \
|
|
|
"setenv bootargs console=${console} " \
|
|
|
"root=/dev/mmcblk0p2 rootwait;" \
|
|
|
- "bootm ${kernel_addr} - ${fdt_addr};" \
|
|
|
+ "bootm $loadaddr};reset;" \
|
|
|
"fi\0" \
|
|
|
"bootcmd=" \
|
|
|
"if test -n ${recovery_status}; then " \
|
|
@@ -138,13 +127,10 @@
|
|
|
"fi;" \
|
|
|
"fi\0" \
|
|
|
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
|
|
|
- "fdt_addr=0x18000000\0" \
|
|
|
"bootdev=1\0" \
|
|
|
"bootpart=1\0" \
|
|
|
- "kernel_addr=" __stringify(CONFIG_LOADADDR) "\0" \
|
|
|
"netdev=eth0\0" \
|
|
|
"load_addr=0x11000000\0" \
|
|
|
- "dtbloadaddr=0x12000000\0" \
|
|
|
"uboot_file=u-boot.img\0" \
|
|
|
"SPL_file=SPL\0" \
|
|
|
"load_uboot=tftp ${load_addr} ${uboot_file}\0" \
|
|
@@ -171,6 +157,7 @@
|
|
|
"device ${mmcdev};" \
|
|
|
"run factory_nor_img;" \
|
|
|
"run factory_eMMC_img;" \
|
|
|
+ "run factory_SPL_falcon_setup;" \
|
|
|
"fi\0" \
|
|
|
"factory_eMMC_img="\
|
|
|
"echo 'Update mccmon6 eMMC image'; " \
|
|
@@ -192,6 +179,16 @@
|
|
|
"erase ${nor_bank_start} +${nor_img_size};" \
|
|
|
"setexpr nor_img_size ${nor_img_size} / 4; " \
|
|
|
"cp.l ${nor_img_addr} ${nor_bank_start} ${nor_img_size}\0" \
|
|
|
+ "factory_SPL_falcon_setup="\
|
|
|
+ "echo 'Write Falcon boot data'; " \
|
|
|
+ "setenv kernelnor 0x08180000;" \
|
|
|
+ "cp.l ${kernelnor} ${loadaddr} ${kernelsize};" \
|
|
|
+ "spl export fdt ${loadaddr};" \
|
|
|
+ "setenv nor_img_addr ${fdtargsaddr};" \
|
|
|
+ "setenv nor_img_size 0x20000;" \
|
|
|
+ "setenv nor_bank_start " \
|
|
|
+ __stringify(CONFIG_CMD_SPL_NOR_OFS)";" \
|
|
|
+ "run nor_update\0" \
|
|
|
"tftp_nor_uboot="\
|
|
|
"echo 'Update mccmon6 NOR U-BOOT via TFTP'; " \
|
|
|
"setenv nor_img_file u-boot.img; " \
|
|
@@ -200,22 +197,14 @@
|
|
|
"if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
|
|
|
"run nor_update;" \
|
|
|
"fi\0" \
|
|
|
- "tftp_nor_uImg="\
|
|
|
- "echo 'Update mccmon6 NOR uImage via TFTP'; " \
|
|
|
- "setenv nor_img_file uImage; " \
|
|
|
+ "tftp_nor_fitImg="\
|
|
|
+ "echo 'Update mccmon6 NOR fitImage via TFTP'; " \
|
|
|
+ "setenv nor_img_file fitImage; " \
|
|
|
"setenv nor_img_size 0x500000; " \
|
|
|
"setenv nor_bank_start 0x08180000; " \
|
|
|
"if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
|
|
|
"run nor_update;" \
|
|
|
"fi\0" \
|
|
|
- "tftp_nor_dtb="\
|
|
|
- "echo 'Update mccmon6 NOR DTB via TFTP'; " \
|
|
|
- "setenv nor_img_file imx6q-mccmon6.dtb; " \
|
|
|
- "setenv nor_img_size 0x20000; " \
|
|
|
- "setenv nor_bank_start 0x09980000; " \
|
|
|
- "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
|
|
|
- "run nor_update;" \
|
|
|
- "fi\0" \
|
|
|
"tftp_nor_img="\
|
|
|
"echo 'Update mccmon6 NOR image via TFTP'; " \
|
|
|
"if tftpboot ${nor_img_addr} ${nor_img_file}; then " \
|