summaryrefslogtreecommitdiff
path: root/include/configs/am335x_evm.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs/am335x_evm.h')
-rw-r--r--include/configs/am335x_evm.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 7295b73c61..28a3d9758a 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -17,12 +17,13 @@
#define __CONFIG_AM335X_EVM_H
#include <configs/ti_am335x_common.h>
+#include <linux/sizes.h>
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
#endif
-#define CONFIG_SYS_BOOTM_LEN (16 << 20)
+#define CONFIG_SYS_BOOTM_LEN SZ_16M
#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM
@@ -34,7 +35,7 @@
#define CONFIG_SYS_LDSCRIPT "board/ti/am335x/u-boot.lds"
/* Always 128 KiB env size */
-#define CONFIG_ENV_SIZE (128 << 10)
+#define CONFIG_ENV_SIZE SZ_128K
#ifdef CONFIG_NAND
#define NANDARGS \
@@ -99,7 +100,9 @@
"console=ttyO0,115200n8\0" \
"partitions=" \
"uuid_disk=${uuid_gpt_disk};" \
- "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
+ "name=bootloader,start=384K,size=1792K," \
+ "uuid=${uuid_gpt_bootloader};" \
+ "name=rootfs,start=2688K,size=-,uuid=${uuid_gpt_rootfs}\0" \
"optargs=\0" \
"ramroot=/dev/ram0 rw\0" \
"ramrootfstype=ext2\0" \
@@ -277,8 +280,8 @@
#define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */
#elif defined(CONFIG_EMMC_BOOT)
#define CONFIG_SYS_MMC_ENV_DEV 1
-#define CONFIG_SYS_MMC_ENV_PART 2
-#define CONFIG_ENV_OFFSET 0x0
+#define CONFIG_SYS_MMC_ENV_PART 0
+#define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_SYS_MMC_MAX_DEVICE 2