mtd: rename CONFIG_NAND -> CONFIG_MTD_RAW_NAND

[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..0e20d6c 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,7 +34,6 @@
        "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)
@@ -44,11 +47,12 @@
        MEM_LAYOUT_ENV_SETTINGS \
        BOOTENV \
        "bootlimit=3\0" \
+       "bootubivol=rootfs\0" \
        "altbootcmd=" \
                "setenv boot_config \"extlinux-rollback.conf\"; " \
                "run distro_bootcmd\0"
 
-#endif /* CONFIG_SPL_BUILD */
+#endif /* ! CONFIG_SPL_BUILD */
 
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_COM1                0x44e09000      /* UART0 */
@@ -64,10 +68,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 +107,6 @@
 
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS   NAND_LARGE_BADBLOCK_POS
 
-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */
 
 #endif /* ! __CONFIG_AM335X_GUARDIAN_H */