74 lines
2.7 KiB
Diff
74 lines
2.7 KiB
Diff
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
|
|
index 5a2fef79..0df9d538 100644
|
|
--- a/include/configs/mx7dsabresd.h
|
|
+++ b/include/configs/mx7dsabresd.h
|
|
@@ -110,8 +110,8 @@
|
|
CONFIG_MFG_ENV_SETTINGS \
|
|
TEE_ENV \
|
|
CONFIG_DFU_ENV_SETTINGS \
|
|
- "script=boot.scr\0" \
|
|
- "image=zImage\0" \
|
|
+ "script=/boot/boot.scr\0" \
|
|
+ "image=/boot/zImage\0" \
|
|
"console=ttymxc0\0" \
|
|
"fdt_high=0xffffffff\0" \
|
|
"initrd_high=0xffffffff\0" \
|
|
@@ -124,17 +124,17 @@
|
|
"splashimage=0x8c000000\0" \
|
|
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
|
|
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
|
|
- "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
|
|
+ "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
|
|
"mmcautodetect=yes\0" \
|
|
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
|
"root=${mmcroot}\0" \
|
|
"loadbootscript=" \
|
|
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
|
+ "ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
|
"bootscript=echo Running bootscript from mmc ...; " \
|
|
"source\0" \
|
|
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
|
|
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
|
|
- "loadtee=fatload mmc ${mmcdev}:${mmcpart} ${tee_addr} ${tee_file}\0" \
|
|
+ "loadimage=ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
|
|
+ "loadfdt=ext4load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
|
|
+ "loadtee=ext4load mmc ${mmcdev}:${mmcpart} ${tee_addr} ${tee_file}\0" \
|
|
"mmcboot=echo Booting from mmc ...; " \
|
|
"run mmcargs; " \
|
|
"if test ${tee} = yes; then " \
|
|
@@ -186,13 +186,18 @@
|
|
"fi;\0" \
|
|
"findfdt="\
|
|
"if test $fdt_file = undefined; then " \
|
|
- "setenv fdt_file imx7d-sdb.dtb; " \
|
|
+ "setenv fdt_file /boot/dtb/imx7d-sdb.dtb; " \
|
|
+ "fi;\0" \
|
|
+ "loadenv="\
|
|
+ "if ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/armbianEnv.txt; then " \
|
|
+ "env import -t ${loadaddr} ${filesize};" \
|
|
"fi;\0" \
|
|
|
|
#define CONFIG_BOOTCOMMAND \
|
|
"run findfdt;" \
|
|
"mmc dev ${mmcdev};" \
|
|
"mmc dev ${mmcdev}; if mmc rescan; then " \
|
|
+ "run loadenv;"\
|
|
"if run loadbootscript; then " \
|
|
"run bootscript; " \
|
|
"else " \
|
|
@@ -258,11 +263,13 @@
|
|
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
|
#endif
|
|
|
|
+#define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
|
|
+
|
|
/* MMC Config*/
|
|
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
|
#define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 */
|
|
#define CONFIG_SYS_MMC_ENV_PART 0 /* user area */
|
|
-#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
|
|
+#define CONFIG_MMCROOT "/dev/mmcblk0p1" /* USDHC1 */
|
|
|
|
/* USB Configs */
|
|
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
|