Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[platform/kernel/u-boot.git] / include / configs / am335x_guardian.h

diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h
index 8bde198..c34c07a 100644 (file)
--- a/include/configs/am335x_guardian.h
+++ b/include/configs/am335x_guardian.h
@@ -16,10 +16,14 @@
 #define CONFIG_TIMESTAMP
 #endif
 
+#define CONFIG_SYS_BOOTM_LEN           (16 << 20)
+
 /* Clock Defines */
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
 
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
 #ifndef CONFIG_SPL_BUILD
 
 #define MEM_LAYOUT_ENV_SETTINGS \
@@ -30,25 +34,51 @@
        "ramdisk_addr_r=0x88080000\0" \
 
 #define BOOT_TARGET_DEVICES(func) \
-       func(MMC, mmc, 0) \
-       func(UBIFS, ubifs, 0) \
-       func(PXE, pxe, na) \
-       func(DHCP, dhcp, na)
+       func(UBIFS, ubifs, 0)
 
 #define AM335XX_BOARD_FDTFILE "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0"
 
 #include <config_distro_bootcmd.h>
 
+#define GUARDIAN_DEFAULT_PROD_ENV \
+       "factory_assembly_status=0\0" \
+       "main_pcba_part_number=0\0" \
+       "main_pcba_supplier=0\0" \
+       "main_pcba_timestamp=0\0" \
+       "main_pcba_hardware_version=0\0" \
+       "main_pcba_id=0\0" \
+       "main_pcba_aux_1=0\0" \
+       "main_pcba_aux_2=0\0" \
+       "main_pcba_aux_3=0\0" \
+       "main_pcba_aux_4=0\0" \
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
        AM335XX_BOARD_FDTFILE \
        MEM_LAYOUT_ENV_SETTINGS \
        BOOTENV \
-       "bootlimit=3\0" \
+       GUARDIAN_DEFAULT_PROD_ENV \
+       "bootubivol=rootfs\0" \
+       "distro_bootcmd=" \
+               "setenv autoload no; " \
+               "setenv rootflags \"bulk_read,chk_data_crc\"; " \
+               "setenv ethact usb_ether; " \
+               "if test \"${swi_status}\" -eq 1; then " \
+                 "setenv extrabootargs \"swi_attached\"; " \
+                 "if dhcp; then " \
+                   "sleep 1; " \
+                   "if tftp \"${tftp_load_addr}\" \"bootscript.scr\"; then " \
+                     "source \"${tftp_load_addr}\"; " \
+                   "fi; " \
+                 "fi; " \
+               "fi;" \
+               "run bootcmd_ubifs0;\0" \
        "altbootcmd=" \
-               "setenv boot_config \"extlinux-rollback.conf\"; " \
-               "run distro_bootcmd\0"
+               "setenv boot_syslinux_conf \"extlinux/extlinux-rollback.conf\"; " \
+               "run distro_bootcmd; " \
+               "setenv boot_syslinux_conf \"extlinux/extlinux.conf\"; " \
+               "run bootcmd_ubifs0;\0"
 
-#endif /* CONFIG_SPL_BUILD */
+#endif /* ! CONFIG_SPL_BUILD */
 
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_COM1                0x44e09000      /* UART0 */
@@ -64,10 +94,7 @@
 /* Bootcount using the RTC block */
 #define CONFIG_SYS_BOOTCOUNT_LE
 
-#ifdef CONFIG_NAND
-#define CONFIG_ENV_OFFSET              0x300000
-#define CONFIG_ENV_OFFSET_REDUND       0x340000
-#define CONFIG_ENV_SIZE                        0x040000
+#ifdef CONFIG_MTD_RAW_NAND
 
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT      (CONFIG_SYS_NAND_BLOCK_SIZE / \
@@ -106,6 +133,11 @@
 
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS   NAND_LARGE_BADBLOCK_POS
 
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
+
+#define CONFIG_AM335X_USB0
+#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
+#define CONFIG_AM335X_USB1
+#define CONFIG_AM335X_USB1_MODE MUSB_HOST
 
 #endif /* ! __CONFIG_AM335X_GUARDIAN_H */