75 lines
2.6 KiB
Diff
75 lines
2.6 KiB
Diff
diff --git a/include/configs/zero-sugar.h.orig b/include/configs/zero-sugar.h
|
|
index 6b5450a..dd6da5c 100644
|
|
--- a/include/configs/zero-sugar.h.orig
|
|
+++ b/include/configs/zero-sugar.h
|
|
@@ -122,12 +122,10 @@
|
|
"panel=EPD\0" \
|
|
"mmcdev=0\0" \
|
|
"active_partition=2\0" \
|
|
- "fallback_partition=3\0 " \
|
|
"bootlimit=1\0 " \
|
|
"mmcautodetect=yes\0" \
|
|
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
|
- "root=/dev/mmcblk2p${active_partition} rootwait rootfstype=ext4 rw " \
|
|
- "quiet panic=20 systemd.crash_reboot\0" \
|
|
+ "root=/dev/mmcblk2p2 rootwait rootfstype=ext4 rw " \
|
|
"loadimage=ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
|
|
"loadfdt=ext4load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
|
|
"mmcboot=echo Booting from mmc ...; " \
|
|
@@ -140,41 +138,13 @@
|
|
"echo WARN: Cannot load the DT; " \
|
|
"fi; " \
|
|
"fi; " \
|
|
- "fi;\0" \
|
|
- "memboot=echo Booting from memory...; " \
|
|
- "setenv bootargs console=${console},${baudrate} " \
|
|
- "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
|
|
- "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
|
|
- "g_mass_storage.iSerialNumber=\"\" rdinit=/linuxrc; "\
|
|
- "bootz ${loadaddr} ${initrd} ${fdt_addr};\0" \
|
|
- "altbootcmd=echo Running from fallback root...; " \
|
|
- "run memboot; " \
|
|
- "if test ${bootcount} -gt 10; then " \
|
|
- "echo WARN: Failed too much, resetting bootcount and turning off; " \
|
|
- "setenv bootcount 0; " \
|
|
- "saveenv; " \
|
|
- "poweroff; " \
|
|
- "fi; " \
|
|
- "setenv mmcpart ${fallback_partition}; " \
|
|
- "setenv bootargs console=${console},${baudrate} " \
|
|
- "root=/dev/mmcblk2p${fallback_partition} rootwait rootfstype=ext4 quiet rw " \
|
|
- "systemd.log_level=debug systemd.log_target=kmsg memtest " \
|
|
- "log_buf_len=1M printk.devkmsg systemd.journald.forward_to_console=1; " \
|
|
- "run mmcboot;\0" \
|
|
+ "fi;\0"
|
|
|
|
/* Always try to boot from memory first, in case of USB download mode */
|
|
#define CONFIG_BOOTCOMMAND \
|
|
- "if test ! -e mmc 0:1 uboot.env; then " \
|
|
- "saveenv; " \
|
|
- "fi; " \
|
|
- "run memboot; " \
|
|
"run mmcargs; " \
|
|
"setenv mmcpart ${active_partition}; " \
|
|
- "run mmcboot; " \
|
|
- "echo WARN: unable to boot from either RAM or eMMC; " \
|
|
- "setenv upgrade_available 1; " \
|
|
- "saveenv; " \
|
|
- "reset; "
|
|
+ "run mmcboot; "
|
|
|
|
#define CONFIG_SYS_MEMTEST_START 0x80000000
|
|
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x20000000)
|
|
@@ -198,10 +168,8 @@
|
|
/* Environment organization */
|
|
#define CONFIG_ENV_SIZE SZ_8K
|
|
|
|
-#ifdef CONFIG_ENV_IS_IN_FAT
|
|
-#define CONFIG_BOOTCOUNT_LIMIT
|
|
-#define CONFIG_BOOTCOUNT_ENV
|
|
-#endif
|
|
+/*#define CONFIG_ENV_IS_IN_FAT*/
|
|
+#define CONFIG_ENV_IS_NOWHERE
|
|
|
|
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
|
|