TX48 config: use SZ_* where appropriate

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index a2ff7f17e809ee354be785b2f997fa5a8334d405..cc05ef1185cefad982700b655cd910e462125f08 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -62,10 +62,8 @@
 #define CONFIG_STACKSIZE               SZ_64K
 #define CONFIG_SYS_MALLOC_LEN          SZ_4M
 
-#define CONFIG_SYS_MEMTEST_START       (PHYS_SDRAM_1 + (64 * 1024 * 1024))
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \
-                                       (8 * 1024 * 1024))
-
+#define CONFIG_SYS_MEMTEST_START       (PHYS_SDRAM_1 + SZ_64M)
+#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + SZ_8M)
 
 /*
  * U-Boot general configurations
@@ -302,7 +300,7 @@
 #define CONFIG_SPL
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_TEXT_BASE           0x402F0400
-#define CONFIG_SPL_MAX_SIZE            (46 * 1024)
+#define CONFIG_SPL_MAX_SIZE            (46 * SZ_1K)
 #define CONFIG_SPL_GPIO_SUPPORT
 #ifdef CONFIG_NAND_AM33XX
 #define CONFIG_SPL_NAND_SUPPORT
@@ -321,11 +319,11 @@
                                         50, 51, 52, 53, 54, 55, 56, 57, }
 #endif
 
-#define CONFIG_SPL_BSS_START_ADDR      0x80000000
-#define CONFIG_SPL_BSS_MAX_SIZE                0x80000         /* 512 KB */
+#define CONFIG_SPL_BSS_START_ADDR      PHYS_SDRAM_1
+#define CONFIG_SPL_BSS_MAX_SIZE                SZ_512K
 
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300 /* address 0x60000 */
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x200 /* 256 KB */
+#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     (SZ_512K / 512)
 #define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION   1
 #define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME       "u-boot-tx48.img"
 #define CONFIG_SPL_MMC_SUPPORT
@@ -346,8 +344,8 @@
  * other needs.
  */
 #define CONFIG_SYS_TEXT_BASE           0x80800000
-#define CONFIG_SYS_SPL_MALLOC_START    0x80208000
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000
+#define CONFIG_SYS_SPL_MALLOC_START    (PHYS_SDRAM_1 + SZ_2M + SZ_32K)
+#define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_1M
 
 /* Since SPL did pll and ddr initialization for us,
  * we don't need to do it twice.