#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
#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 \
"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" \
/* SPL */
#ifndef CONFIG_NOR_BOOT
/* Bootcount using the RTC block */
-#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTCOUNT_AM33XX
#define CONFIG_SYS_BOOTCOUNT_BE
/* USB gadget RNDIS */
* For NOR boot, we must set this to the start of where NOR is mapped
* in memory.
*/
-#ifdef CONFIG_NOR_BOOT
-#define CONFIG_SYS_TEXT_BASE 0x08000000
-#endif
/*
* USB configuration. We enable MUSB support, both for host and for
#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